Merge pull request #11668 from nextcloud/backport/11660/stable27

[stable27] Ignore label of data channel when processing received messages.
nextcloud · Feb 28, 2024 · 451d24a · 451d24a
2 parents 925f878 + b46954b
commit 451d24a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 22 deletions.
diff --git a/src/utils/webrtc/models/CallParticipantModel.js b/src/utils/webrtc/models/CallParticipantModel.js
@@ -229,10 +229,6 @@ CallParticipantModel.prototype = {
 			return
 		}
 
-		if (label !== 'status' && label !== 'JanusDataChannel') {
-			return
-		}
-
 		if (data.type === 'speaking') {
 			this.set('speaking', true)
 		} else if (data.type === 'stoppedSpeaking') {

diff --git a/src/utils/webrtc/webrtc.js b/src/utils/webrtc/webrtc.js
@@ -1594,25 +1594,21 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
 	})
 
 	webrtc.on('channelMessage', function(peer, label, data) {
-		if (label === 'status' || label === 'JanusDataChannel') {
-			if (data.type === 'audioOn') {
-				webrtc.emit('unmute', { id: peer.id, name: 'audio' })
-			} else if (data.type === 'audioOff') {
-				webrtc.emit('mute', { id: peer.id, name: 'audio' })
-			} else if (data.type === 'videoOn') {
-				webrtc.emit('unmute', { id: peer.id, name: 'video' })
-			} else if (data.type === 'videoOff') {
-				webrtc.emit('mute', { id: peer.id, name: 'video' })
-			} else if (data.type === 'nickChanged') {
-				const name = typeof (data.payload) === 'string' ? data.payload : data.payload.name
-				webrtc.emit('nick', { id: peer.id, name })
-			} else if (data.type === 'speaking' || data.type === 'stoppedSpeaking') {
-				// Valid known messages, handled by CallParticipantModel.js
-			} else {
-				console.debug('Unknown message type %s from %s datachannel', data.type, label, data, peer.id, peer)
-			}
+		if (data.type === 'audioOn') {
+			webrtc.emit('unmute', { id: peer.id, name: 'audio' })
+		} else if (data.type === 'audioOff') {
+			webrtc.emit('mute', { id: peer.id, name: 'audio' })
+		} else if (data.type === 'videoOn') {
+			webrtc.emit('unmute', { id: peer.id, name: 'video' })
+		} else if (data.type === 'videoOff') {
+			webrtc.emit('mute', { id: peer.id, name: 'video' })
+		} else if (data.type === 'nickChanged') {
+			const name = typeof (data.payload) === 'string' ? data.payload : data.payload.name
+			webrtc.emit('nick', { id: peer.id, name })
+		} else if (data.type === 'speaking' || data.type === 'stoppedSpeaking') {
+			// Valid known messages, handled by CallParticipantModel.js
 		} else {
-			console.debug('Unknown message from %s datachannel', label, data, peer.id, peer)
+			console.debug('Unknown message type %s from %s datachannel', data.type, label, data, peer.id, peer)
 		}
 	})