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