mirror of
https://github.com/vector-im/element-call.git
synced 2026-01-30 03:15:55 +00:00
post merge fixes (js-sdk changes)
This commit is contained in:
@@ -141,8 +141,8 @@ export function useGroupCallRooms(client: MatrixClient): GroupCallRoom[] {
|
||||
.filter(roomIsJoinable);
|
||||
const sortedRooms = sortRooms(client, rooms);
|
||||
Promise.all(
|
||||
sortedRooms.map((room) => {
|
||||
const session = client.matrixRTC.getRoomSession(room);
|
||||
sortedRooms.map(async (room) => {
|
||||
const session = await client.matrixRTC.getRoomSession(room);
|
||||
return {
|
||||
roomAlias: room.getCanonicalAlias() ?? undefined,
|
||||
roomName: room.name,
|
||||
|
||||
@@ -193,8 +193,10 @@ export function mockRtcMembership(
|
||||
const event = new MatrixEvent({
|
||||
sender: typeof user === "string" ? user : user.userId,
|
||||
event_id: `$-ev-${randomUUID()}:example.org`,
|
||||
content: data,
|
||||
});
|
||||
const cms = new CallMembership(event, data);
|
||||
|
||||
const cms = new CallMembership(event);
|
||||
vi.mocked(cms).getTransport = vi.fn().mockReturnValue(fociPreferred[0]);
|
||||
return cms;
|
||||
}
|
||||
@@ -345,9 +347,6 @@ export class MockRTCSession extends TypedEventEmitter<
|
||||
vi.mocked(session).reemitEncryptionKeys = vi
|
||||
.fn<() => void>()
|
||||
.mockReturnValue(undefined);
|
||||
vi.mocked(session).resolveActiveFocus = vi
|
||||
.fn<(member?: CallMembership) => Transport | undefined>()
|
||||
.mockReturnValue(undefined);
|
||||
vi.mocked(session).getOldestMembership = vi
|
||||
.fn<() => CallMembership | undefined>()
|
||||
.mockReturnValue(this.memberships[0]);
|
||||
|
||||
Reference in New Issue
Block a user