Matrix/element-call-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-call.git synced 2026-04-25 09:35:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix activeRoom not beeing early enough

Browse Source
This commit is contained in:
Timo
2024-04-11 19:25:25 +02:00
committed by Andrew Ferrazzutti
parent 6a79bf03c1
commit 6eb3ba4181
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/room/useLoadGroupCall.ts
View File

@@ -154,6 +154,8 @@ export const useLoadGroupCall = (
client.on( client.on(
RoomEvent.MyMembership, RoomEvent.MyMembership,
async (room, membership, prevMembership) => { async (room, membership, prevMembership) => {
if (roomId !== room.roomId) return;
activeRoom.current = room;
if (membership === KnownMembership.Invite) { if (membership === KnownMembership.Invite) {
await client.joinRoom(room.roomId, { viaServers }); await client.joinRoom(room.roomId, { viaServers });
joinedRoom = room; joinedRoom = room;
@@ -179,6 +181,7 @@ export const useLoadGroupCall = (
const alias = roomIdOrAlias; const alias = roomIdOrAlias;
// The call uses a room alias // The call uses a room alias
room = await getRoomByAlias(alias); room = await getRoomByAlias(alias);
activeRoom.current = room;
} else { } else {
// The call uses a room_id // The call uses a room_id
const roomId = roomIdOrAlias; const roomId = roomIdOrAlias;
@@ -187,6 +190,7 @@ export const useLoadGroupCall = (
// - in widget mode // - in widget mode
// - in SPA mode if the user already joined the room // - in SPA mode if the user already joined the room
room = client.getRoom(roomId); room = client.getRoom(roomId);
activeRoom.current = room ?? undefined;
if (room?.getMyMembership() === KnownMembership.Join) { if (room?.getMyMembership() === KnownMembership.Join) {
// room already joined so we are done here already. // room already joined so we are done here already.
return room!; return room!;
@@ -203,6 +207,7 @@ export const useLoadGroupCall = (
roomId, roomId,
viaServers, viaServers,
)) as unknown as RoomSummary; )) as unknown as RoomSummary;
if (room?.getMyMembership() === KnownMembership.Ban) { if (room?.getMyMembership() === KnownMembership.Ban) {
throw BannedError(); throw BannedError();
} else { } else {