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

add local storage + more readable + remoteParticipants + use publishingParticipants

Browse Source 
Signed-off-by: Timo K <toger5@hotmail.de>
This commit is contained in:
Timo K
2025-08-28 10:34:43 +02:00
parent efa9a9cc45
commit e9fd74c82c
2 changed files with 38 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/state/CallViewModel.ts
View File

@@ -55,7 +55,7 @@ import { logger } from "matrix-js-sdk/lib/logger";
import {
type CallMembership,
isLivekitFocusConfig,
LivekitFocusConfig,
type LivekitFocusConfig,
type MatrixRTCSession,
MatrixRTCSessionEvent,
MembershipManagerEvent,
@@ -478,7 +478,7 @@ class Connection {
this.stopped = true;
}
public readonly participantsIncludingJustSubscribers$ = this.scope.behavior(
public readonly participantsIncludingSubscribers$ = this.scope.behavior(
connectedParticipantsObserver(this.livekitRoom),
[],
);
@@ -547,12 +547,14 @@ export class CallViewModel extends ViewModel {
),
);
private readonly memberships$ = fromEvent(
this.matrixRTCSession,
MatrixRTCSessionEvent.MembershipsChanged,
).pipe(
startWith(null),
map(() => this.matrixRTCSession.memberships),
private readonly memberships$ = this.scope.behavior(
fromEvent(
this.matrixRTCSession,
MatrixRTCSessionEvent.MembershipsChanged,
).pipe(
startWith(null),
map(() => this.matrixRTCSession.memberships),
),
);
private readonly foci$ = this.memberships$.pipe(
@@ -702,9 +704,24 @@ export class CallViewModel extends ViewModel {
* The RemoteParticipants including those that are being "held" on the screen
*/
private readonly remoteParticipants$ = this.scope
.behavior<
RemoteParticipant[]
>(combineLatest([this.localConnection, this.remoteConnections$], (localConnection, remoteConnections) => combineLatest([localConnection.participantsIncludingJustSubscribers$, ...[...remoteConnections.values()].map((c) => c.participantsIncludingJustSubscribers$)], (...ps) => ps.flat(1))).pipe(switchAll(), startWith([])))
.behavior<RemoteParticipant[]>(
combineLatest(
[this.localConnection, this.remoteConnections$],
(localConnection, remoteConnections) => {
const remoteConnectionsParticipants = [
...remoteConnections.values(),
].map((c) => c.publishingParticipants$(this.memberships$));
return combineLatest(
[
localConnection.publishingParticipants$(this.memberships$),
...remoteConnectionsParticipants,
],
(...ps) => ps.flat(1),
);
},
).pipe(switchAll(), startWith([])),
)
.pipe(pauseWhen(this.pretendToBeDisconnected$));
/**