From ec02f8241637f5e428b45a96bbacbb9fb976bb81 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 11 Jan 2022 16:15:20 +0000
Subject: [PATCH] Update default Jitsi URLs to meet.element.io (#7514)

---
 src/SdkConfig.ts                    |  2 +-
 src/stores/widgets/StopGapWidget.ts |  4 ++--
 src/widgets/Jitsi.ts                | 13 ++++++-------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/SdkConfig.ts b/src/SdkConfig.ts
index af2a706aaa..575b4a626d 100644
--- a/src/SdkConfig.ts
+++ b/src/SdkConfig.ts
@@ -40,7 +40,7 @@ export const DEFAULTS: ConfigOptions = {
     // Jitsi conference options
     jitsi: {
         // Default conference domain
-        preferredDomain: "jitsi.riot.im",
+        preferredDomain: "meet.element.io",
     },
     desktopBuilds: {
         available: true,
diff --git a/src/stores/widgets/StopGapWidget.ts b/src/stores/widgets/StopGapWidget.ts
index 38c6dc08e4..369cafab5b 100644
--- a/src/stores/widgets/StopGapWidget.ts
+++ b/src/stores/widgets/StopGapWidget.ts
@@ -109,8 +109,8 @@ export class ElementWidget extends Widget {
         }
         let domain = super.rawData['domain'];
         if (domain === undefined) {
-            // v1 widgets default to jitsi.riot.im regardless of user settings
-            domain = "jitsi.riot.im";
+            // v1 widgets default to meet.element.io regardless of user settings
+            domain = "meet.element.io";
         }
 
         let theme = new ThemeWatcher().getEffectiveTheme();
diff --git a/src/widgets/Jitsi.ts b/src/widgets/Jitsi.ts
index 5bf54490e4..5534557dca 100644
--- a/src/widgets/Jitsi.ts
+++ b/src/widgets/Jitsi.ts
@@ -15,6 +15,7 @@ limitations under the License.
 */
 
 import { logger } from "matrix-js-sdk/src/logger";
+import { IClientWellKnown } from "matrix-js-sdk/src/client";
 
 import SdkConfig from "../SdkConfig";
 import { MatrixClientPeg } from "../MatrixClientPeg";
@@ -33,7 +34,7 @@ export class Jitsi {
     private domain: string;
 
     public get preferredDomain(): string {
-        return this.domain || 'jitsi.riot.im';
+        return this.domain || "meet.element.io";
     }
 
     /**
@@ -67,15 +68,13 @@ export class Jitsi {
         this.update(cli.getClientWellKnown());
     }
 
-    private update = async (discoveryResponse): Promise<any> => {
+    private update = async (discoveryResponse: IClientWellKnown): Promise<any> => {
         // Start with a default of the config's domain
-        let domain = (SdkConfig.get()['jitsi'] || {})['preferredDomain'] || 'jitsi.riot.im';
+        let domain = SdkConfig.get().jitsi?.preferredDomain || "meet.element.io";
 
         logger.log("Attempting to get Jitsi conference information from homeserver");
-        if (discoveryResponse && discoveryResponse[JITSI_WK_PROPERTY]) {
-            const wkPreferredDomain = discoveryResponse[JITSI_WK_PROPERTY]['preferredDomain'];
-            if (wkPreferredDomain) domain = wkPreferredDomain;
-        }
+        const wkPreferredDomain = discoveryResponse?.[JITSI_WK_PROPERTY]?.['preferredDomain'];
+        if (wkPreferredDomain) domain = wkPreferredDomain;
 
         // Put the result into memory for us to use later
         this.domain = domain;