mirror of
https://github.com/vector-im/element-call.git
synced 2026-09-04 21:35:19 +00:00
Convert reaction sounds to call view model / rxjs
This commit is contained in:
@@ -26,6 +26,7 @@ import {
|
||||
Subject,
|
||||
combineLatest,
|
||||
concat,
|
||||
distinct,
|
||||
distinctUntilChanged,
|
||||
filter,
|
||||
forkJoin,
|
||||
@@ -66,7 +67,11 @@ import {
|
||||
} from "./MediaViewModel";
|
||||
import { accumulate, finalizeValue } from "../utils/observable";
|
||||
import { ObservableScope } from "./ObservableScope";
|
||||
import { duplicateTiles, showReactions } from "../settings/settings";
|
||||
import {
|
||||
duplicateTiles,
|
||||
playReactionsSound,
|
||||
showReactions,
|
||||
} from "../settings/settings";
|
||||
import { isFirefox } from "../Platform";
|
||||
import { setPipEnabled } from "../controls";
|
||||
import { GridTileViewModel, SpotlightTileViewModel } from "./TileViewModel";
|
||||
@@ -1101,12 +1106,9 @@ export class CallViewModel extends ViewModel {
|
||||
this.reactions.next(data.reactions);
|
||||
}
|
||||
|
||||
public readonly visibleReactions = combineLatest([
|
||||
this.reactions,
|
||||
showReactions.value,
|
||||
])
|
||||
public readonly visibleReactions = showReactions.value
|
||||
.pipe(switchMap((show) => (show ? this.reactions : of({}))))
|
||||
.pipe(
|
||||
map(([reactions, setting]) => (setting ? reactions : {})),
|
||||
scan<
|
||||
Record<string, ReactionOption>,
|
||||
{ sender: string; emoji: string; startX: number }[]
|
||||
@@ -1123,6 +1125,32 @@ export class CallViewModel extends ViewModel {
|
||||
)
|
||||
.pipe(this.scope.state());
|
||||
|
||||
public readonly audibleReactions = playReactionsSound.value
|
||||
.pipe(
|
||||
switchMap((show) =>
|
||||
show ? this.reactions : of<Record<string, ReactionOption>>({}),
|
||||
),
|
||||
)
|
||||
.pipe(
|
||||
map((reactions) => Object.values(reactions).map((v) => v.name)),
|
||||
scan<string[], { playing: string[]; newSounds: string[] }>(
|
||||
(acc, latest) => {
|
||||
return {
|
||||
playing: latest.filter(
|
||||
(v) => acc.playing.includes(v) || acc.newSounds.includes(v),
|
||||
),
|
||||
newSounds: latest.filter(
|
||||
(v) => !acc.playing.includes(v) && !acc.newSounds.includes(v),
|
||||
),
|
||||
};
|
||||
},
|
||||
{ playing: [], newSounds: [] },
|
||||
),
|
||||
map((v) => v.newSounds),
|
||||
distinct(),
|
||||
)
|
||||
.pipe(this.scope.state());
|
||||
|
||||
public constructor(
|
||||
// A call is permanently tied to a single Matrix room and LiveKit room
|
||||
private readonly matrixRTCSession: MatrixRTCSession,
|
||||
|
||||
Reference in New Issue
Block a user