Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-06-12 12:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy config of show non-member settings

Browse Source
This commit is contained in:
Hugh Nimmo-Smith
2024-11-07 14:02:25 +00:00
parent 95effe0852
commit 6bda8953ab
6 changed files with 32 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/state/CallViewModel.ts
View File

@@ -67,7 +67,7 @@ import {
} from "./MediaViewModel";
import { accumulate, finalizeValue } from "../utils/observable";
import { ObservableScope } from "./ObservableScope";
import { duplicateTiles, nonMemberTiles } from "../settings/settings";
import { duplicateTiles, showNonMemberTiles } from "../settings/settings";
import { isFirefox } from "../Platform";
import { setPipEnabled } from "../controls";
import { GridTileViewModel, SpotlightTileViewModel } from "./TileViewModel";
@@ -434,7 +434,7 @@ export class CallViewModel extends ViewModel {
this.matrixRTCSession,
MatrixRTCSessionEvent.MembershipsChanged,
).pipe(startWith(null)),
nonMemberTiles.value,
showNonMemberTiles.value,
]).pipe(
scan(
(
@@ -444,7 +444,7 @@ export class CallViewModel extends ViewModel {
{ participant: localParticipant },
duplicateTiles,
_membershipsChanged,
nonMemberTiles,
showNonMemberTiles,
],
) => {
const newItems = new Map(
@@ -534,7 +534,7 @@ export class CallViewModel extends ViewModel {
// - If one wants to test scalability using the livekit cli.
// - If an experimental project does not yet do the matrixRTC bits.
// - If someone wants to debug if the LK connection works but matrixRTC room state failed to arrive.
const debugShowNonMember = nonMemberTiles; //Config.get().show_non_member_tiles;
const debugShowNonMember = showNonMemberTiles; //Config.get().show_non_member_tiles;
const newNonMemberItems = debugShowNonMember
? new Map(
function* (this: CallViewModel): Iterable<[string, MediaItem]> {
@@ -689,7 +689,7 @@ export class CallViewModel extends ViewModel {
? ([of(screenShares.map((m) => m.vm)), this.spotlightSpeaker] as const)
: ([
this.spotlightSpeaker.pipe(
map((speaker) => (speaker && [speaker]) ?? []),
map((speaker) => (speaker ? [speaker] : [])),
),
this.spotlightSpeaker.pipe(
switchMap((speaker) =>
@@ -722,7 +722,7 @@ export class CallViewModel extends ViewModel {
distinctUntilChanged(),
);
private readonly pip: Observable<UserMediaViewModel | null> =
private readonly pip: Observable<UserMediaViewModel | undefined> =
this.spotlightAndPip.pipe(switchMap(([, pip]) => pip));
private readonly pipEnabled: Observable<boolean> = setPipEnabled.pipe(