matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix condition.

Browse Source
This commit is contained in:
John Livingston 2023-05-24 16:55:03 +02:00
parent ff96ff7763
commit efdf01cef2
No known key found for this signature in database
GPG Key ID: B17B5640CE66CDBC
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/lib/custom-fields.ts
View File

@ -92,9 +92,10 @@ async function fillVideoRemoteLiveChat (
} else { } else {
const settings = await options.settingsManager.getSettings([ const settings = await options.settingsManager.getSettings([
'federation-no-remote-chat', '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'] const canDirectS2S = !settings['federation-no-remote-chat'] && !!settings['prosody-room-allow-s2s']
if (compatibleRemoteAuthenticatedConnectionEnabled(infos, canWebsocketS2S, canDirectS2S)) { if (compatibleRemoteAuthenticatedConnectionEnabled(infos, canWebsocketS2S, canDirectS2S)) {
// Even better, we can do a proper S2S connection! // Even better, we can do a proper S2S connection!

2
server/lib/routers/webchat.ts
View File

@ -125,7 +125,7 @@ async function initWebchatRouter (options: RegisterServerOptionsV5): Promise<Rou
let remoteConnectionInfos: WCRemoteConnectionInfos | undefined let remoteConnectionInfos: WCRemoteConnectionInfos | undefined
let roomJID: string let roomJID: string
if (video?.remote) { 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'] const canDirectS2S = !settings['federation-no-remote-chat'] && !!settings['prosody-room-allow-s2s']
remoteConnectionInfos = await _remoteConnectionInfos(remoteChatInfos ?? false, canWebsocketS2S, canDirectS2S) remoteConnectionInfos = await _remoteConnectionInfos(remoteChatInfos ?? false, canWebsocketS2S, canDirectS2S)
if (!remoteConnectionInfos) { if (!remoteConnectionInfos) {