Merge branch 'dev'

modules/rmeets/mod.ts

@@ -507,44 +507,48 @@ routes.get("/:room", (c) => {
 <div id="jitsi-container">
   <div class="loading"><div class="spinner"></div><span>Connecting to meeting...</span></div>
 </div>
-<script src="${escapeHtml(JITSI_URL)}/external_api.js"></script>
+<script src="${escapeHtml(JITSI_URL)}/external_api.min.js"></script>
 <script>
-  const api = new JitsiMeetExternalAPI("${escapeHtml(JITSI_URL.replace(/^https?:\/\//, ""))}", {
+  try {
-    roomName: "${jitsiRoom}",
+    var api = new JitsiMeetExternalAPI("${escapeHtml(JITSI_URL.replace(/^https?:\/\//, ""))}", {
-    parentNode: document.getElementById("jitsi-container"),
+      roomName: decodeURIComponent("${jitsiRoom}"),
-    width: "100%",
+      parentNode: document.getElementById("jitsi-container"),
-    height: "100%",
+      width: "100%",
-    configOverrides: {
+      height: "100%",
-      startWithAudioMuted: false,
+      configOverwrite: {
-      startWithVideoMuted: false,
+        startWithAudioMuted: false,
-      prejoinPageEnabled: true,
+        startWithVideoMuted: false,
-      disableDeepLinking: true,
+        prejoinConfig: { enabled: false },
-      disableThirdPartyRequests: true,
+        prejoinPageEnabled: false,
-      enableClosePage: false,
+        disableDeepLinking: true,
-      disableInviteFunctions: false,
+        disableThirdPartyRequests: true,
-      toolbarButtons: [
+        enableClosePage: false,
-        "microphone","camera","desktop","hangup",
+        toolbarButtons: [
-        "raisehand","tileview","toggle-camera",
+          "microphone","camera","desktop","hangup",
-        "fullscreen","chat","settings",
+          "raisehand","tileview","toggle-camera",
-        "participants-pane","select-background",
+          "fullscreen","chat","settings",
-      ],
+          "participants-pane","select-background",
-    },
+        ],
-    interfaceConfigOverrides: {
+      },
-      SHOW_JITSI_WATERMARK: false,
+      interfaceConfigOverwrite: {
-      SHOW_BRAND_WATERMARK: false,
+        SHOW_JITSI_WATERMARK: false,
-      SHOW_POWERED_BY: false,
+        SHOW_BRAND_WATERMARK: false,
-      MOBILE_APP_PROMO: false,
+        SHOW_POWERED_BY: false,
-      HIDE_DEEP_LINKING_LOGO: true,
+        MOBILE_APP_PROMO: false,
-      DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
+        HIDE_DEEP_LINKING_LOGO: true,
-    },
+        DISABLE_JOIN_LEAVE_NOTIFICATIONS: false,
-  });
+      },
-  api.addEventListener("readyToClose", function() {
+    });
-    try { window.close(); } catch(e) {}
+    api.addEventListener("readyToClose", function() {
-    // window.close() fails if the tab wasn't opened by JS (common on mobile)
+      try { window.close(); } catch(e) {}
+      document.getElementById("jitsi-container").innerHTML =
+        '<div class="ended"><span>Meeting ended</span>'
+        + '<a href="${escapeHtml(`/${space}/rmeets`)}">Back to rMeets</a></div>';
+    });
+  } catch(e) {
     document.getElementById("jitsi-container").innerHTML =
-      '<div class="ended"><span>Meeting ended</span>'
+      '<div class="loading" style="color:#ef4444">Failed to connect: ' + e.message + '</div>';
-      + '<a href="${escapeHtml(`/${space}/rmeets`)}">Back to rMeets</a></div>';
+  }
-  });
 </script>
 </body>
 </html>`);