From aeb6cddc2f150881ff59d9244d53604f5f3ceb5d Mon Sep 17 00:00:00 2001 From: Robin Date: Fri, 1 Apr 2022 11:28:47 -0400 Subject: [PATCH 1/4] Update video rooms to new design specs (#21623) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * "Voice room" → "video room" * Customize Jitsi behavior in video rooms --- docs/labs.md | 4 ++-- src/vector/jitsi/index.ts | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/docs/labs.md b/docs/labs.md index e6e74db94..72b8b09ba 100644 --- a/docs/labs.md +++ b/docs/labs.md @@ -183,6 +183,6 @@ Threads can be access by clicking their summary below the root event on the room This feature might work in degraded mode if the homeserver a user is connected to does not advertise support for the unstable feature `org.matrix.msc3440` when calling the `/versions` API endpoint. -## Voice & video rooms (`feature_voice_rooms`) [In Development] +## Voice & video rooms (`feature_video_rooms`) [In Development] -Enables support for creating and joining voice & video rooms, which are persistent voice chats that users can jump in and out of. +Enables support for creating and joining video rooms, which are persistent video chats that users can jump in and out of. diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index d62b76f5a..598d4f3e0 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -51,6 +51,7 @@ let roomId: string; let openIdToken: IOpenIDCredentials; let roomName: string; let startAudioOnly: boolean; +let isVideoChannel: boolean; let widgetApi: WidgetApi; let meetApi: any; // JitsiMeetExternalAPI @@ -120,12 +121,13 @@ const ack = (ev: CustomEvent) => widgetApi.transport.reply(ev roomId = qsParam('roomId', true); roomName = qsParam('roomName', true); startAudioOnly = qsParam('isAudioOnly', true) === "true"; + isVideoChannel = qsParam('isVideoChannel', true) === "true"; // We've reached the point where we have to wait for the config, so do that then parse it. const instanceConfig = new SnakedObject((await configPromise) ?? {}); const jitsiConfig = instanceConfig.get("jitsi_widget") ?? {}; skipOurWelcomeScreen = (new SnakedObject(jitsiConfig)) - .get("skip_built_in_welcome_screen") || false; + .get("skip_built_in_welcome_screen") || isVideoChannel; // If we're meant to skip our screen, skip to the part where we show Jitsi instead of us. // We don't set up the call yet though as this might lead to failure without the widget API. @@ -300,6 +302,7 @@ function joinConference() { // event handler bound in HTML "they mention 'external_api' or 'jitsi' in the stack. They're just Jitsi Meet trying to parse " + "our fragment values and not recognizing the options.", ); + const options = { width: "100%", height: "100%", @@ -313,10 +316,23 @@ function joinConference() { // event handler bound in HTML }, configOverwrite: { startAudioOnly, - }, + } as any, jwt: jwt, }; + // Video channel widgets need some more tailored config options + if (isVideoChannel) { + // Ensure that we start on Jitsi Meet's native prejoin screen, for + // deployments that skip straight to the conference by default + options.configOverwrite.prejoinConfig = { enabled: true }; + // Use a simplified set of toolbar buttons + options.configOverwrite.toolbarButtons = [ + "microphone", "camera", "desktop", "tileview", "hangup", + ]; + // Hide all top bar elements + options.configOverwrite.conferenceInfo = { autoHide: [] }; + } + meetApi = new JitsiMeetExternalAPI(jitsiDomain, options); if (displayName) meetApi.executeCommand("displayName", displayName); if (avatarUrl) meetApi.executeCommand("avatarUrl", avatarUrl); @@ -332,6 +348,9 @@ function joinConference() { // event handler bound in HTML widgetApi.setAlwaysOnScreen(true); widgetApi.transport.send(ElementWidgetActions.JoinCall, {}); } + + // Video rooms should start in tile mode + if (isVideoChannel) meetApi.executeCommand("setTileView", true); }); meetApi.on("readyToClose", () => { From b1a60b25b4c8e006328d13f1d73afe5f792d3041 Mon Sep 17 00:00:00 2001 From: "Shivrani A. Jadhav" <86149243+ShivraniAJ@users.noreply.github.com> Date: Mon, 4 Apr 2022 11:35:37 +0530 Subject: [PATCH 2/4] Fix typo in translation docs (#21653) * Correct typo * Removing extra lines --- docs/translating.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/translating.md b/docs/translating.md index a8d29a387..bfb970275 100644 --- a/docs/translating.md +++ b/docs/translating.md @@ -62,4 +62,4 @@ You can use inside the translation field "Review needed" checkbox. It will be sh ### Further reading -The official Weblate doc provides some more in-deepth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html +The official Weblate doc provides some more in-depth explanation on how to do translations and talks about do and don'ts. You can find it at: https://docs.weblate.org/en/latest/user/translating.html \ No newline at end of file From b79133c6947b51233982e3d253cb869a1b3d078a Mon Sep 17 00:00:00 2001 From: Robin Date: Mon, 4 Apr 2022 07:32:12 -0400 Subject: [PATCH 3/4] Fix stuck persistence of Jitsi widgets (#21650) The hangup event may or may not be handled, so we need to account for cases where it throws an error. --- src/vector/jitsi/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 598d4f3e0..346c9dab0 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -361,7 +361,7 @@ function joinConference() { // event handler bound in HTML // can cause the receiving side to instantly stop listening. // ignored promise because we don't care if it works // noinspection JSIgnoredPromiseFromCall - widgetApi.transport.send(ElementWidgetActions.HangupCall, {}).then(() => + widgetApi.transport.send(ElementWidgetActions.HangupCall, {}).finally(() => widgetApi.setAlwaysOnScreen(false), ); } From eab8a19ec7e897e0834edf29ad15281798d6bda3 Mon Sep 17 00:00:00 2001 From: Robin Date: Tue, 5 Apr 2022 11:32:26 -0400 Subject: [PATCH 4/4] Avoid flashing the Jitsi prejoin screen at the user before skipping it (#21665) --- src/vector/jitsi/index.scss | 4 ++++ src/vector/jitsi/index.ts | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/vector/jitsi/index.scss b/src/vector/jitsi/index.scss index 95a23c177..ac6aff165 100644 --- a/src/vector/jitsi/index.scss +++ b/src/vector/jitsi/index.scss @@ -56,6 +56,10 @@ body, html { position: absolute; height: 100%; width: 100%; + + // Hidden by default to avoid flashing the prejoin screen at the user when + // we're supposed to skip it anyways + visibility: hidden; } .joinConferenceFloating { diff --git a/src/vector/jitsi/index.ts b/src/vector/jitsi/index.ts index 346c9dab0..055d4aff4 100644 --- a/src/vector/jitsi/index.ts +++ b/src/vector/jitsi/index.ts @@ -129,11 +129,9 @@ const ack = (ev: CustomEvent) => widgetApi.transport.reply(ev skipOurWelcomeScreen = (new SnakedObject(jitsiConfig)) .get("skip_built_in_welcome_screen") || isVideoChannel; - // If we're meant to skip our screen, skip to the part where we show Jitsi instead of us. + // Either reveal the prejoin screen, or skip straight to Jitsi depending on the config. // We don't set up the call yet though as this might lead to failure without the widget API. - if (skipOurWelcomeScreen) { - toggleConferenceVisibility(true); - } + toggleConferenceVisibility(skipOurWelcomeScreen); if (widgetApi) { await readyPromise;