fix: guard voice controls against toggling intent while server muted/deafened

This commit is contained in:
Jannis Braun
2026-03-09 23:15:47 +01:00
parent 018828575c
commit 651d7edf9d
3 changed files with 25 additions and 4 deletions
+19 -2
View File
@@ -1,4 +1,5 @@
import { useVoiceStore } from '../stores/voiceStore';
import { useSpaceStore, getChannelOrigin, getMyUserIdForOrigin } from '../stores/spaceStore';
import { AudioManager } from './AudioManager';
import type { ParticipantInfo } from '../hooks/useLiveKit';
@@ -168,8 +169,24 @@ export class SpeakingDetector {
// --- Local participant ---
if (this.localIdentity) {
if (store.isMuted) {
// Muted → never speaking, reset hold counter
// Compute effective muted/deafened state (intent OR server enforcement)
let effectiveMuted = store.isMuted;
let effectiveDeafened = store.isDeafened;
const channelId = store.currentVoiceChannelId;
if (channelId) {
const spaceId = useSpaceStore.getState().channelToSpaceMap.get(channelId);
if (spaceId) {
const myOriginId = getMyUserIdForOrigin(getChannelOrigin(channelId));
if (myOriginId) {
const serverKey = `${spaceId}:${myOriginId}`;
effectiveMuted = effectiveMuted || store.serverMutedUserIds.has(serverKey);
effectiveDeafened = effectiveDeafened || store.serverDeafenedUserIds.has(serverKey);
}
}
}
if (effectiveMuted || effectiveDeafened) {
// Muted or deafened → never speaking, reset hold counter
this.holdCounters.delete(this.localIdentity);
} else {
const analyser = AudioManager.getInstance().getAnalyserNode();
@@ -43,6 +43,7 @@ export function ChannelSidebar() {
const location = useLocation();
const handleMicToggle = async () => {
if (isServerMuted || isServerDeafened) return;
const wasDeafened = useVoiceStore.getState().isDeafened;
toggleMic();
broadcastVoiceStatus();
@@ -53,6 +54,7 @@ export function ChannelSidebar() {
};
const handleDeafenToggle = async () => {
if (isServerDeafened) return;
toggleDeafen();
broadcastVoiceStatus();
broadcastDeafenViaLiveKit();
@@ -39,6 +39,7 @@ export function VoiceControlBar() {
const qualityBtnRef = useRef<HTMLButtonElement>(null);
const handleMute = React.useCallback(async () => {
if (isServerMuted || isServerDeafened) return;
const wasDeafened = useVoiceStore.getState().isDeafened;
toggleMic();
broadcastVoiceStatus();
@@ -46,13 +47,14 @@ export function VoiceControlBar() {
if (wasDeafened && !useVoiceStore.getState().isDeafened) {
broadcastDeafenViaLiveKit();
}
}, [toggleMic]);
}, [isServerMuted, isServerDeafened, toggleMic]);
const handleDeafen = React.useCallback(async () => {
if (isServerDeafened) return;
toggleDeafen();
broadcastVoiceStatus();
broadcastDeafenViaLiveKit();
}, [toggleDeafen]);
}, [isServerDeafened, toggleDeafen]);
const handleCamera = async () => {
const room = getActiveRoom();