From 82fd465819daa5a43172860f96ec62fc6d630cb8 Mon Sep 17 00:00:00 2001 From: bgrozev Date: Tue, 3 Jan 2023 16:03:42 -0600 Subject: [PATCH] Re-use existing flags for visitor functioonality. (#12703) * Fix documentation. * Re-use existing flags instead for visitor functionality. * Make the linter happy. * Declare the disableFocus flag in configType.ts * chore(deps) lib-jitsi-meet@latest https://github.com/jitsi/lib-jitsi-meet/compare/v1561.0.0+2d4cd935...v1564.0.0+e2aa3700 --- package-lock.json | 22 ++++++++++----------- package.json | 2 +- react/features/base/conference/functions.ts | 7 +++++-- react/features/base/config/configType.ts | 1 + 4 files changed, 18 insertions(+), 14 deletions(-) diff --git a/package-lock.json b/package-lock.json index 36fa228417..3fc52c4d91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "js-md5": "0.6.1", "js-sha512": "0.8.0", "jwt-decode": "2.2.0", - "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", + "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1564.0.0+e2aa3700/lib-jitsi-meet.tgz", "lodash": "4.17.21", "moment": "2.29.4", "moment-duration-format": "2.2.2", @@ -13497,13 +13497,13 @@ }, "node_modules/lib-jitsi-meet": { "version": "0.0.0", - "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", - "integrity": "sha512-ec3XE3LheQQEkIBZ8mrfGdRDE/9yKM/CQpw7E2eF1zMQJGGREZRZ+Xqbhgv7o1eYPgI5GsAECns8ZjmWtre8bg==", + "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1564.0.0+e2aa3700/lib-jitsi-meet.tgz", + "integrity": "sha512-yXMl8yUsac0tymhzsegYc5NQ33gLTceoWtzeK+D36UzwUYUvLSez2YRgBSQmz24vYVtJLqqhqgHW60IPvEOS2Q==", "license": "Apache-2.0", "dependencies": { "@jitsi/js-utils": "2.0.0", "@jitsi/logger": "2.0.0", - "@jitsi/sdp-interop": "https://git@github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b", + "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b", "@jitsi/sdp-simulcast": "0.4.0", "async": "3.2.3", "base64-js": "1.3.1", @@ -13516,7 +13516,7 @@ "sdp-transform": "2.3.0", "strophe.js": "1.3.4", "strophejs-plugin-disco": "0.0.2", - "strophejs-plugin-stream-management": "https://git@github.com/jitsi/strophejs-plugin-stream-management#001cf02bef2357234e1ac5d163611b4d60bf2b6a", + "strophejs-plugin-stream-management": "git+https://github.com/jitsi/strophejs-plugin-stream-management#001cf02bef2357234e1ac5d163611b4d60bf2b6a", "uuid": "8.1.0", "webrtc-adapter": "8.1.1" } @@ -23206,7 +23206,7 @@ "@jitsi/sdp-interop": { "version": "git+https://git@github.com/jitsi/sdp-interop.git#3d49eb4aa26863a3f8d32d7581cdb4321244266b", "integrity": "sha512-80u69QNTBArnCd1CGbTTrl/8AsZOOMF82dQhrgXBQAnrimdpomX1fMZ82ZkxyWyYvRMPG167u43Tp8y1g2DLNA==", - "from": "@jitsi/sdp-interop@https://git@github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b", + "from": "@jitsi/sdp-interop@git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b", "requires": { "lodash.clonedeep": "4.5.0", "sdp-transform": "2.14.1" @@ -30496,12 +30496,12 @@ } }, "lib-jitsi-meet": { - "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", - "integrity": "sha512-ec3XE3LheQQEkIBZ8mrfGdRDE/9yKM/CQpw7E2eF1zMQJGGREZRZ+Xqbhgv7o1eYPgI5GsAECns8ZjmWtre8bg==", + "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1564.0.0+e2aa3700/lib-jitsi-meet.tgz", + "integrity": "sha512-yXMl8yUsac0tymhzsegYc5NQ33gLTceoWtzeK+D36UzwUYUvLSez2YRgBSQmz24vYVtJLqqhqgHW60IPvEOS2Q==", "requires": { "@jitsi/js-utils": "2.0.0", "@jitsi/logger": "2.0.0", - "@jitsi/sdp-interop": "https://git@github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b", + "@jitsi/sdp-interop": "git+https://github.com/jitsi/sdp-interop#3d49eb4aa26863a3f8d32d7581cdb4321244266b", "@jitsi/sdp-simulcast": "0.4.0", "async": "3.2.3", "base64-js": "1.3.1", @@ -30514,7 +30514,7 @@ "sdp-transform": "2.3.0", "strophe.js": "1.3.4", "strophejs-plugin-disco": "0.0.2", - "strophejs-plugin-stream-management": "https://git@github.com/jitsi/strophejs-plugin-stream-management#001cf02bef2357234e1ac5d163611b4d60bf2b6a", + "strophejs-plugin-stream-management": "git+https://github.com/jitsi/strophejs-plugin-stream-management#001cf02bef2357234e1ac5d163611b4d60bf2b6a", "uuid": "8.1.0", "webrtc-adapter": "8.1.1" }, @@ -34219,7 +34219,7 @@ "strophejs-plugin-stream-management": { "version": "git+https://git@github.com/jitsi/strophejs-plugin-stream-management.git#001cf02bef2357234e1ac5d163611b4d60bf2b6a", "integrity": "sha512-ijQSXeEEmGl4dfLx8RcQDCvzg1UPtEArowaCHZr8ITdBOH/X6JxxGzy/DVeMLVSvSy73tH7pGK6iPjBqQajwdQ==", - "from": "strophejs-plugin-stream-management@https://git@github.com/jitsi/strophejs-plugin-stream-management#001cf02bef2357234e1ac5d163611b4d60bf2b6a" + "from": "strophejs-plugin-stream-management@git+https://github.com/jitsi/strophejs-plugin-stream-management#001cf02bef2357234e1ac5d163611b4d60bf2b6a" }, "style-loader": { "version": "3.3.1", diff --git a/package.json b/package.json index e28afef2d8..b521efc211 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "js-md5": "0.6.1", "js-sha512": "0.8.0", "jwt-decode": "2.2.0", - "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", + "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1564.0.0+e2aa3700/lib-jitsi-meet.tgz", "lodash": "4.17.21", "moment": "2.29.4", "moment-duration-format": "2.2.2", diff --git a/react/features/base/conference/functions.ts b/react/features/base/conference/functions.ts index 736fff76a8..d208188f8c 100644 --- a/react/features/base/conference/functions.ts +++ b/react/features/base/conference/functions.ts @@ -253,7 +253,7 @@ export function getConferenceOptions(stateful: IStateful) { } /** - * Returns an object aggregating the conference options. + * Override the global config (that is, window.config) with XMPP configuration required to join as a visitor. * * @param {IStateful} stateful - The redux store state. * @param {Array} params - The received parameters. @@ -274,7 +274,10 @@ export function generateVisitorConfig(stateful: IStateful, params: Array config.hosts.domain = `${vnode}.meet.jitsi`; config.hosts.muc = config.hosts.muc.replace(oldDomain, config.hosts.domain); - config.hosts.visitorFocus = focusJid; + config.focusUserJid = focusJid; + + // This flag disables sending the initial conference request + config.disableFocus = true; config.bosh += `?vnode=${vnode}`; config.websocket += `?vnode=${vnode}`; diff --git a/react/features/base/config/configType.ts b/react/features/base/config/configType.ts index c3008e690a..c89059ae24 100644 --- a/react/features/base/config/configType.ts +++ b/react/features/base/config/configType.ts @@ -233,6 +233,7 @@ export interface IConfig { disableChatSmileys?: boolean; disableDeepLinking?: boolean; disableFilmstripAutohiding?: boolean; + disableFocus?: boolean; disableIncomingMessageSound?: boolean; disableInitialGUM?: boolean; disableInviteFunctions?: boolean;