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

post merge lint fixes

Browse Source
This commit is contained in:
Valere
2025-10-10 15:04:12 +02:00
parent 4608d68cd9
commit 4a8f5bccac
2 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/home/useGroupCallRooms.ts
View File

@@ -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(async (room) => { sortedRooms.map((room) => {
const session = await client.matrixRTC.getRoomSession(room); const session = client.matrixRTC.getRoomSession(room);
return { return {
roomAlias: room.getCanonicalAlias() ?? undefined, roomAlias: room.getCanonicalAlias() ?? undefined,
roomName: room.name, roomName: room.name,

60
src/room/RoomPage.tsx
View File

@@ -150,34 +150,38 @@ export const RoomPage: FC = () => {
</> </>
); );
return ( return (
muteStates && <LobbyView muteStates && (
client={client!} <LobbyView
matrixInfo={{ client={client!}
userId: client!.getUserId() ?? "", matrixInfo={{
displayName: userDisplayName ?? "", userId: client!.getUserId() ?? "",
avatarUrl: avatarUrl ?? "", displayName: userDisplayName ?? "",
roomAlias: null, avatarUrl: avatarUrl ?? "",
roomId: groupCallState.roomSummary.room_id, roomAlias: null,
roomName: groupCallState.roomSummary.name ?? "", roomId: groupCallState.roomSummary.room_id,
roomAvatar: groupCallState.roomSummary.avatar_url ?? null, roomName: groupCallState.roomSummary.name ?? "",
e2eeSystem: { roomAvatar: groupCallState.roomSummary.avatar_url ?? null,
kind: groupCallState.roomSummary["im.nheko.summary.encryption"] e2eeSystem: {
? E2eeType.PER_PARTICIPANT kind: groupCallState.roomSummary[
: E2eeType.NONE, "im.nheko.summary.encryption"
}, ]
}} ? E2eeType.PER_PARTICIPANT
onEnter={async (): Promise<void> => { : E2eeType.NONE,
knock?.(); },
return Promise.resolve(); }}
}} onEnter={async (): Promise<void> => {
enterLabel={label} knock?.();
waitingForInvite={groupCallState.kind === "waitForInvite"} return Promise.resolve();
confineToRoom={confineToRoom} }}
hideHeader={header !== "standard"} enterLabel={label}
participantCount={null} waitingForInvite={groupCallState.kind === "waitForInvite"}
muteStates={muteStates} confineToRoom={confineToRoom}
onShareClick={null} hideHeader={header !== "standard"}
/> participantCount={null}
muteStates={muteStates}
onShareClick={null}
/>
)
); );
} }
case "loading": case "loading":