rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't keep someone in the spotlight if they've left the call

Browse Source
This commit is contained in:
Robin
2024-08-09 13:06:33 -04:00
parent 29df87d22c
commit 52058716f6
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/state/CallViewModel.ts
View File

@@ -424,21 +424,25 @@ export class CallViewModel extends ViewModel {
),
scan<(readonly [UserMedia, boolean])[], UserMedia, null>(
(prev, mediaItems) => {
const stickyPrev = prev === null || prev.vm.local ? null : prev;
// Only remote users that are still in the call should be sticky
const stickyPrev =
prev === null || prev.vm.local
? null
: mediaItems.find(([m]) => m === prev);
const stillSpeaking = stickyPrev?.[1];
// Decide who to spotlight:
// If the previous speaker (not the local user) is still speaking,
// stick with them rather than switching eagerly to someone else
return (
mediaItems.find(([m, s]) => m === stickyPrev && s)?.[0] ??
// Otherwise, select any remote user who is speaking
mediaItems.find(([m, s]) => !m.vm.local && s)?.[0] ??
// Otherwise, stick with the person who was last speaking
stickyPrev ??
// Otherwise, spotlight an arbitrary remote user
mediaItems.find(([m]) => !m.vm.local)?.[0] ??
// Otherwise, spotlight the local user
mediaItems.find(([m]) => m.vm.local)![0]
);
// If the previous speaker is still speaking, stick with them rather
// than switching eagerly to someone else
return stillSpeaking
? stickyPrev[0]
: // Otherwise, select any remote user who is speaking
(mediaItems.find(([m, s]) => !m.vm.local && s)?.[0] ??
// Otherwise, stick with the person who was last speaking
stickyPrev?.[0] ??
// Otherwise, spotlight an arbitrary remote user
mediaItems.find(([m]) => !m.vm.local)?.[0] ??
// Otherwise, spotlight the local user
mediaItems.find(([m]) => m.vm.local)![0]);
},
null,
),