Merge branch 'development' into starred-google-calander-fix

Author: Saksham-Sirohi

src/pretalx/agenda/management/commands/notify-video-about-schedule-update.py

@@ -0,0 +1,66 @@
+import logging
+from argparse import ArgumentParser
+from urllib.parse import urljoin, urlparse
+
+import requests
+from django.conf import settings
+from django.core.management.base import BaseCommand, CommandError
+
+from pretalx.event.models import Event
+
+
+# The name of the Video container
+VIDEO_CONTAINER_NAME = 'eventyay-video'
+logger = logging.getLogger(__name__)
+
+
+def replace_hostname(url: str) -> str:
+    '''
+    Replace the hostname of the URL with the name of the Video container.
+    '''
+    parsed_url = urlparse(url)
+    parsed_url = parsed_url._replace(netloc=VIDEO_CONTAINER_NAME, scheme='http')
+    return parsed_url.geturl()
+
+
+def push_to_video_site(event: Event):
+    url = urljoin(event.venueless_settings.url, 'schedule_update')
+    logger.info('Saved video API URL: %s', url)
+    # In development with Docker, we use fake domain, so the URL can not reach the video site,
+    # we need to replace the hostname.
+    url = replace_hostname(url)
+    # I haven't found the page to retrieve this token.
+    # In development, I get it from ShortToken model in Video container.
+    token = event.venueless_settings.token
+    logger.info('To push schedule to rewritten video API URL instead: %s', url)
+    post_data = {
+        'domain': event.custom_domain or settings.SITE_URL,
+        'event': event.slug,
+    }
+    logger.info('With post data: %s', post_data)
+    logger.info('Authenticated with token: %s', token)
+    response = requests.post(
+        url,
+        json=post_data,
+        headers={
+            'Authorization': f'Bearer {token}',
+        },
+    )
+    if not response.ok:
+        logger.error('Failed to push schedule to video site: %s', response.text)
+        raise CommandError(f'Failed to push schedule to video site: {response.text}')
+    logger.info('Response: %s', response.content)
+    logger.info('Schedule pushed to video site successfully.')
+
+
+class Command(BaseCommand):
+    '''
+    Inform the video site that the schedule has been updated.
+    '''
+    def add_arguments(self, parser: ArgumentParser):
+        parser.add_argument('event_slug', type=str)
+
+    def handle(self, event_slug: str, **options):
+        event = Event.objects.get(slug=event_slug)
+        push_to_video_site(event)
+

src/pretalx/agenda/templates/agenda/schedule.html

@@ -24,7 +24,7 @@
             </a>
             <hr>
             {% for exporter in exporters %}
-                <a class="dropdown-item" href="{{ exporter.urls.base }}" role="menuitem" tabindex="-1">
+                <a class="dropdown-item" href="{{ exporter.urls.base }}" role="menuitem" tabindex="-1" target="_blank">
                     {% if exporter.icon|slice:":3" == "fa-" %}
                         <span class="fa {{ exporter.icon }} export-icon"></span>
                     {% else %}

src/pretalx/agenda/views/schedule.py

@@ -126,14 +126,10 @@ def get_context_data(self, **kwargs):
 
     def get_exporter(self, public=True):
         url = resolve(self.request.path_info)
-
-        calendar_exports = ["export.google-calendar", "export.my-google-calendar", "export.other-calendar", "export.my-other-calendar"]
         if url.url_name in ["export", "export-tokenized"]:
             exporter = url.kwargs.get("name") or unquote(
                 self.request.GET.get("exporter")
             )
-        elif url.url_name in calendar_exports:
-            exporter = url.url_name.replace("export.", "")
         else:
             exporter = url.url_name
 
@@ -387,7 +383,7 @@ def get(self, request, *args, **kwargs):
                 if token_status is True:
                     token = existing_token
                     generate_new_token = False
-            
+                    
             # Generate new token if needed
             if generate_new_token:
                 token = self.generate_ics_token(request.user.id)

src/pretalx/schedule/signals.py

@@ -81,22 +81,31 @@ def register_my_json_exporter(sender, **kwargs):
 
     return MyFrabJsonExporter
 
+
 @receiver(register_data_exporters, dispatch_uid="exporter_builtin_google_calendar")
 def register_google_calendar_exporter(sender, **kwargs):
     from .exporters import GoogleCalendarExporter
+
     return GoogleCalendarExporter
 
-@receiver(register_my_data_exporters, dispatch_uid="exporter_builtin_my_google_calendar")
-def register_my_google_calendar_exporter(sender, **kwargs):
-    from .exporters import MyGoogleCalendarExporter
-    return MyGoogleCalendarExporter
 
 @receiver(register_data_exporters, dispatch_uid="exporter_builtin_webcal")
 def register_webcal_exporter(sender, **kwargs):
     from .exporters import WebcalExporter
+
     return WebcalExporter
 
+
+@receiver(register_my_data_exporters, dispatch_uid="exporter_builtin_my_google_calendar")
+def register_my_google_calendar_exporter(sender, **kwargs):
+    from .exporters import MyGoogleCalendarExporter
+
+    return MyGoogleCalendarExporter
+
+
 @receiver(register_my_data_exporters, dispatch_uid="exporter_builtin_my_webcal")
 def register_my_webcal_exporter(sender, **kwargs):
     from .exporters import MyWebcalExporter
-    return MyWebcalExporter
+    
+    return MyWebcalExporter
+

src/pretalx/settings.py

@@ -229,7 +229,7 @@ def merge_csp(*options, config=None):
     "disable_existing_loggers": False,
     "formatters": {
         "default": {
-            "format": "%(levelname)s %(asctime)s %(name)s %(module)s %(message)s"
+            "format": "%(levelname)s %(asctime)s %(module)s %(message)s"
         }
     },
     "handlers": {
@@ -279,7 +279,7 @@ def merge_csp(*options, config=None):
             # We deliberately want to collect DEBUG logs for our app from production,
             # because some bugs are only exposed in production environment.
             "level": "DEBUG",
-            "propagate": True,
+            "propagate": False,
         },
     },
 }