Enrich the data of created events

outlook/indico_outlook/calendar.py

@@ -7,6 +7,7 @@
 
 from pprint import pformat
 
+from lxml import html
 import requests
 from requests.exceptions import RequestException, Timeout
 from sqlalchemy.orm import joinedload
@@ -106,17 +107,35 @@
         if event.is_deleted:
             logger.debug('Ignoring %s for deleted event %s', entry.action.name, entry.event_id)
             return True
-        location = strip_control_chars(event.room_name)
-        description = strip_control_chars(event.description)
-        event_url = event.external_url
+
+        location = (f'{event.room_name} ({event.venue_name})'
+                if event.venue_name and event.room_name
+                else (event.venue_name or event.room_name))
+
+        cal_description = []
+        if event.person_links:
+            speakers = [f'{x.full_name} ({x.affiliation})' if x.affiliation else x.full_name
+                    for x in event.person_links]
+            cal_description.append(f'<p>Speakers: {', '.join(speakers)}</p>')
+        cal_description.append(event.description)
+        if event.external_url:
+            cal_description.append(f'<p><a href="{event.external_url}">{event.external_url}</a></p>')
+
+        # Try to add the VC room URL to the description, if there is one
+        for vc_room in event.vc_room_associations:
+            try:
+                cal_description.append(f'<p><a href="{vc_room.data.url}">{vc_room.data.url}</a></p>')
+            except AttributeError:
+                pass
+
         data = {
             'status': _get_status(user, event, settings),
             'start': int(event.start_dt.timestamp()),
             'end': int(event.end_dt.timestamp()),
             'subject': strip_control_chars(event.title),
             # XXX: the API expects 'body', we convert it below
-            'description': f'<a href="{event_url}">{event_url}</a><br><br>{description}',
-            'location': location,
+            'description': strip_control_chars('\n'.join(cal_description)),
+            'location': strip_control_chars(location),
             'reminder_on': settings['reminder'],
             'reminder_minutes': settings['reminder_minutes']
         }

outlook/indico_outlook/plugin.py

@@ -176,7 +176,7 @@ def event_registration_form_deleted(self, registration_form, **kwargs):
             self.logger.info('Registration removed (form deleted): removing %s in %s', registration.user, event)
 
     def event_updated(self, event, changes, **kwargs):
-        if not changes.keys() & {'title', 'description', 'location_data'}:
+        if not changes.keys() & {'title', 'description', 'location_data', 'person_links'}:
             return
         for user in get_participating_users(event):
             self.logger.info('Event data change: updating %s in %r', user, event)