Merge branch 'dev'

modules/rmeets/mod.ts

@@ -507,21 +507,22 @@ 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?:\/\//, ""))}", {
+      roomName: decodeURIComponent("${jitsiRoom}"),
       parentNode: document.getElementById("jitsi-container"),
       width: "100%",
       height: "100%",
-    configOverrides: {
+      configOverwrite: {
         startWithAudioMuted: false,
         startWithVideoMuted: false,
-      prejoinPageEnabled: true,
+        prejoinConfig: { enabled: false },
+        prejoinPageEnabled: false,
         disableDeepLinking: true,
         disableThirdPartyRequests: true,
         enableClosePage: false,
-      disableInviteFunctions: false,
         toolbarButtons: [
           "microphone","camera","desktop","hangup",
           "raisehand","tileview","toggle-camera",
@@ -529,7 +530,7 @@ routes.get("/:room", (c) => {
           "participants-pane","select-background",
         ],
       },
-    interfaceConfigOverrides: {
+      interfaceConfigOverwrite: {
         SHOW_JITSI_WATERMARK: false,
         SHOW_BRAND_WATERMARK: false,
         SHOW_POWERED_BY: false,
@@ -540,11 +541,14 @@ routes.get("/:room", (c) => {
     });
     api.addEventListener("readyToClose", function() {
       try { window.close(); } catch(e) {}
-    // window.close() fails if the tab wasn't opened by JS (common on mobile)
       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="loading" style="color:#ef4444">Failed to connect: ' + e.message + '</div>';
+  }
 </script>
 </body>
 </html>`);