re-add live_message function, fix https, add local_settings,

diff --git a/app/settings.py b/app/settings.py
index 0bde0828db97693fdfaee816b7b58a6dce165cf1..a606179b74d7981dd42664dfb4407153df8d8f0d 100644 (file)
--- a/app/settings.py
+++ b/app/settings.py
@@ -503,3 +503,18 @@ if DEBUG_TOOLBAR:
 
 USE_WEBPACK_DEV_SERVER = False
 WEBPACK_DEV_SERVER_URL = "http://172.24.104.152:3000/"
+
+
+##################
+# LOCAL SETTINGS #
+##################
+
+# Allow any settings to be defined in local_settings.py which should be
+# ignored in your version control system allowing for settings to be
+# defined per machine.
+try:
+    from local_settings import *
+except ImportError as e:
+    if "local_settings" not in str(e):
+        raise e
+

diff --git a/teleforma/models/chat.py b/teleforma/models/chat.py
index 29df013a0b58d37f7dddf62af7db06c081d5c8de..53c804b451dfaaf5afcc28116a0e89bb1b0459b9 100644 (file)
--- a/teleforma/models/chat.py
+++ b/teleforma/models/chat.py
@@ -50,7 +50,7 @@ class ChatMessage(models.Model):
         room_name = ChatMessage.get_room_name(
             conference.period, conference.course)
         text = _("A new live conference has started : ")
-        text += f"http://{Site.objects.all()[0].domain}{reverse('teleforma-conference-detail', kwargs={'period_id': conference.period.id, 'pk': conference.id})}"
+        text += f"https://{Site.objects.all()[0].domain}{reverse('teleforma-conference-detail', kwargs={'period_id': conference.period.id, 'pk': conference.id})}"
         message = ChatMessage.add_message(
             None, room_name, text, system=True)
         channel_layer = get_channel_layer()

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index acb22b079b382b8b5278ccc3e852641074b8d265..1e088ac184e33f081b0d246c3775474fe53452f8 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -33,6 +33,7 @@
 # Authors: Guillaume Pellerin <yomguy@parisson.com>
 import datetime
 import os
+import requests
 from html import escape
 from io import BytesIO
 
@@ -45,6 +46,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.http import Http404, HttpResponse, HttpResponseRedirect
 from django.http.response import StreamingHttpResponse
 from django.shortcuts import redirect
+from django.contrib.sites.shortcuts import get_current_site
 from django.template import loader
 from django.urls import reverse
 from django.utils.decorators import method_decorator
@@ -243,6 +245,14 @@ def nginx_media_accel(media_path, content_type="", buffering=True, streaming=Fal
     return response
 
 
+def live_message(conference):
+    site = get_current_site()
+    token = settings.ADMIN_TOKEN
+    requests.post('https://' + site.domain + '/chat/messages',
+        headers={'Authorization': token},
+        data={'conference_id': conference.id})
+
+
 class HomeRedirectView(View):
 
     def get(self, request):