Skip to content

[stable31] fix(VideoVue): do not rely on participant permissions #16546

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 2 commits into from
Dec 13, 2025
Merged

[stable31] fix(VideoVue): do not rely on participant permissions #16546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1398c8c
fix(VideoVue): do not rely on participant permissions
Antreesy Dec 12, 2025
4e4dbac
fix(webrtc): improve code readability
Antreesy Dec 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/CallView/shared/VideoVue.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ import TransitionWrapper from '../../UIShared/TransitionWrapper.vue'
import Screen from './Screen.vue'
import VideoBackground from './VideoBackground.vue'
import VideoBottomBar from './VideoBottomBar.vue'
import { ATTENDEE, AVATAR, PARTICIPANT } from '../../../constants.ts'
import { ATTENDEE, AVATAR } from '../../../constants.ts'
import { EventBus } from '../../../services/EventBus.ts'
import { useCallViewStore } from '../../../stores/callView.ts'
import { useGuestNameStore } from '../../../stores/guestName.js'
Expand Down Expand Up @@ -456,8 +456,7 @@ export default {
},

hasVideo() {
return !!(this.participant.permissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)
&& !this.model.attributes.videoBlocked
return !this.model.attributes.videoBlocked
&& this.model.attributes.videoAvailable
&& this.sharedData.remoteVideoBlocker.isVideoEnabled() && (typeof this.model.attributes.stream === 'object')
},
Expand Down
30 changes: 15 additions & 15 deletions src/utils/webrtc/webrtc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1039,8 +1039,11 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
return
}

if (webrtc.webrtc.isAudioAllowed() === !!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO)
&& webrtc.webrtc.isVideoAllowed() === !!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)) {
const hasPublishAudioPermissions = !!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO)
const hasPublishVideoPermissions = !!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)

if (webrtc.webrtc.isAudioAllowed() === hasPublishAudioPermissions
&& webrtc.webrtc.isVideoAllowed() === hasPublishVideoPermissions) {
return
}

Expand All @@ -1057,11 +1060,8 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
hasVideoSenders ||= !!videoSender
})

const removeSender = (hasAudioSenders && !(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO))
|| (hasVideoSenders && !(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO))

const hasPublishAudioPermissions = !!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO)
const hasPublishVideoPermissions = !!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)
const removeSender = (hasAudioSenders && !hasPublishAudioPermissions)
|| (hasVideoSenders && !hasPublishVideoPermissions)

if (!hasPublishAudioPermissions) {
// If permissions were revoked, disable media devices
Expand All @@ -1079,8 +1079,8 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
}

if (webrtc.webrtc.isLocalMediaActive()
&& !(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO)
&& !(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)) {
&& !hasPublishAudioPermissions
&& !hasPublishVideoPermissions) {
webrtc.stopLocalVideo()

// If the MCU is used and there is no sending peer there is no need
Expand All @@ -1100,10 +1100,10 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
// reconnection.
if (webrtc.webrtc.isLocalMediaActive() && removeSender) {
let flags = signaling.getCurrentCallFlags()
if (!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO)) {
if (!hasPublishAudioPermissions) {
flags &= ~PARTICIPANT.CALL_FLAG.WITH_AUDIO
}
if (!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)) {
if (!hasPublishVideoPermissions) {
flags &= ~PARTICIPANT.CALL_FLAG.WITH_VIDEO
}

Expand All @@ -1128,8 +1128,8 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local

// If media is not active but the participant does not have publishing
// permissions there is no need to start the media nor reconnect.
if (!(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO)
&& !(currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO)) {
if (!hasPublishAudioPermissions
&& !hasPublishVideoPermissions) {
return
}

Expand Down Expand Up @@ -1162,8 +1162,8 @@ export default function initWebRtc(signaling, _callParticipantCollection, _local
webrtc.on('localMediaError', forceReconnectOnceLocalMediaError)

const constraints = {
audio: currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_AUDIO,
video: currentParticipant.participantPermissions & PARTICIPANT.PERMISSIONS.PUBLISH_VIDEO,
audio: hasPublishAudioPermissions,
video: hasPublishVideoPermissions,
}
webrtc.startLocalVideo(constraints)
}
Expand Down
Loading