studio/element-call
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace calls to deprecated resolveActiveFocus

Browse Source
This commit is contained in:
Robin
2025-10-08 01:04:58 -04:00
parent 1fff71ace1
commit 669bc76dd5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/state/CallViewModel.ts
View File

@@ -523,10 +523,12 @@ export class CallViewModel extends ViewModel {
multiSfu.value$, multiSfu.value$,
], ],
(preferred, memberships, multiSfu) => { (preferred, memberships, multiSfu) => {
const oldestMembership =
this.matrixRTCSession.getOldestMembership();
const remote = memberships.flatMap((m) => { const remote = memberships.flatMap((m) => {
if (m.sender === this.userId && m.deviceId === this.deviceId) if (m.sender === this.userId && m.deviceId === this.deviceId)
return []; return [];
const t = this.matrixRTCSession.resolveActiveFocus(m); const t = m.getTransport(oldestMembership ?? m);
return t && isLivekitTransport(t) return t && isLivekitTransport(t)
? [{ membership: m, transport: t }] ? [{ membership: m, transport: t }]
: []; : [];
@@ -617,10 +619,11 @@ export class CallViewModel extends ViewModel {
// Until the local transport becomes ready we have no idea which // Until the local transport becomes ready we have no idea which
// transports will actually need a dedicated remote connection // transports will actually need a dedicated remote connection
if (transports?.local.state === "ready") { if (transports?.local.state === "ready") {
const oldestMembership = this.matrixRTCSession.getOldestMembership();
const localServiceUrl = transports.local.value.livekit_service_url; const localServiceUrl = transports.local.value.livekit_service_url;
const remoteServiceUrls = new Set( const remoteServiceUrls = new Set(
transports.remote.flatMap(({ membership, transport }) => { transports.remote.flatMap(({ membership, transport }) => {
const t = this.matrixRTCSession.resolveActiveFocus(membership); const t = membership.getTransport(oldestMembership ?? membership);
return t && return t &&
isLivekitTransport(t) && isLivekitTransport(t) &&
t.livekit_service_url !== localServiceUrl t.livekit_service_url !== localServiceUrl