Skip to content
This repository was archived by the owner on Sep 11, 2024. It is now read-only.

Commit ec02f82

Browse files
authored
Update default Jitsi URLs to meet.element.io (#7514)
1 parent beac956 commit ec02f82

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

src/SdkConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ export const DEFAULTS: ConfigOptions = {
4040
// Jitsi conference options
4141
jitsi: {
4242
// Default conference domain
43-
preferredDomain: "jitsi.riot.im",
43+
preferredDomain: "meet.element.io",
4444
},
4545
desktopBuilds: {
4646
available: true,

src/stores/widgets/StopGapWidget.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ export class ElementWidget extends Widget {
109109
}
110110
let domain = super.rawData['domain'];
111111
if (domain === undefined) {
112-
// v1 widgets default to jitsi.riot.im regardless of user settings
113-
domain = "jitsi.riot.im";
112+
// v1 widgets default to meet.element.io regardless of user settings
113+
domain = "meet.element.io";
114114
}
115115

116116
let theme = new ThemeWatcher().getEffectiveTheme();

src/widgets/Jitsi.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ limitations under the License.
1515
*/
1616

1717
import { logger } from "matrix-js-sdk/src/logger";
18+
import { IClientWellKnown } from "matrix-js-sdk/src/client";
1819

1920
import SdkConfig from "../SdkConfig";
2021
import { MatrixClientPeg } from "../MatrixClientPeg";
@@ -33,7 +34,7 @@ export class Jitsi {
3334
private domain: string;
3435

3536
public get preferredDomain(): string {
36-
return this.domain || 'jitsi.riot.im';
37+
return this.domain || "meet.element.io";
3738
}
3839

3940
/**
@@ -67,15 +68,13 @@ export class Jitsi {
6768
this.update(cli.getClientWellKnown());
6869
}
6970

70-
private update = async (discoveryResponse): Promise<any> => {
71+
private update = async (discoveryResponse: IClientWellKnown): Promise<any> => {
7172
// Start with a default of the config's domain
72-
let domain = (SdkConfig.get()['jitsi'] || {})['preferredDomain'] || 'jitsi.riot.im';
73+
let domain = SdkConfig.get().jitsi?.preferredDomain || "meet.element.io";
7374

7475
logger.log("Attempting to get Jitsi conference information from homeserver");
75-
if (discoveryResponse && discoveryResponse[JITSI_WK_PROPERTY]) {
76-
const wkPreferredDomain = discoveryResponse[JITSI_WK_PROPERTY]['preferredDomain'];
77-
if (wkPreferredDomain) domain = wkPreferredDomain;
78-
}
76+
const wkPreferredDomain = discoveryResponse?.[JITSI_WK_PROPERTY]?.['preferredDomain'];
77+
if (wkPreferredDomain) domain = wkPreferredDomain;
7978

8079
// Put the result into memory for us to use later
8180
this.domain = domain;

0 commit comments

Comments
 (0)