From efdf01cef28408920e5fc3ab1ed7eba435a90592 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Wed, 24 May 2023 16:55:03 +0200
Subject: [PATCH] Fix condition.

---
 server/lib/custom-fields.ts   | 5 +++--
 server/lib/routers/webchat.ts | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/server/lib/custom-fields.ts b/server/lib/custom-fields.ts
index 8efef0c5..e2445f0f 100644
--- a/server/lib/custom-fields.ts
+++ b/server/lib/custom-fields.ts
@@ -92,9 +92,10 @@ async function fillVideoRemoteLiveChat (
   } else {
     const settings = await options.settingsManager.getSettings([
       'federation-no-remote-chat',
-      'prosody-room-allow-s2s'
+      'prosody-room-allow-s2s',
+      'disable-websocket'
     ])
-    const canWebsocketS2S = !settings['federation-no-remote-chat']
+    const canWebsocketS2S = !settings['federation-no-remote-chat'] && !settings['disable-websocket']
     const canDirectS2S = !settings['federation-no-remote-chat'] && !!settings['prosody-room-allow-s2s']
     if (compatibleRemoteAuthenticatedConnectionEnabled(infos, canWebsocketS2S, canDirectS2S)) {
       // Even better, we can do a proper S2S connection!
diff --git a/server/lib/routers/webchat.ts b/server/lib/routers/webchat.ts
index 071f49d6..76fd713d 100644
--- a/server/lib/routers/webchat.ts
+++ b/server/lib/routers/webchat.ts
@@ -125,7 +125,7 @@ async function initWebchatRouter (options: RegisterServerOptionsV5): Promise<Rou
       let remoteConnectionInfos: WCRemoteConnectionInfos | undefined
       let roomJID: string
       if (video?.remote) {
-        const canWebsocketS2S = !settings['federation-no-remote-chat']
+        const canWebsocketS2S = !settings['federation-no-remote-chat'] && !settings['disable-websocket']
         const canDirectS2S = !settings['federation-no-remote-chat'] && !!settings['prosody-room-allow-s2s']
         remoteConnectionInfos = await _remoteConnectionInfos(remoteChatInfos ?? false, canWebsocketS2S, canDirectS2S)
         if (!remoteConnectionInfos) {