From 39f8cb95ec03f2d75c2979fa4fd7812bdf367fee Mon Sep 17 00:00:00 2001
From: Timo K <toger5@hotmail.de>
Date: Thu, 9 Oct 2025 15:29:47 +0200
Subject: [PATCH] make compatible with related_event (async CallMembership)
 branch

Signed-off-by: Timo K <toger5@hotmail.de>
---
 package.json                  |  2 +-
 src/home/useGroupCallRooms.ts | 35 +++++++++++++++++++----------------
 yarn.lock                     | 10 +++++-----
 3 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 91583023..571fe9e7 100644
--- a/package.json
+++ b/package.json
@@ -108,7 +108,7 @@
     "livekit-client": "^2.13.0",
     "lodash-es": "^4.17.21",
     "loglevel": "^1.9.1",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#head=voip-team/multi-SFU",
+    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#head=toger5/use-relation-based-CallMembership-create-ts",
     "matrix-widget-api": "^1.13.0",
     "normalize.css": "^8.0.1",
     "observable-hooks": "^4.2.3",
diff --git a/src/home/useGroupCallRooms.ts b/src/home/useGroupCallRooms.ts
index e89c3f14..149af4b0 100644
--- a/src/home/useGroupCallRooms.ts
+++ b/src/home/useGroupCallRooms.ts
@@ -20,6 +20,7 @@ import {
   MatrixRTCSessionManagerEvents,
   type MatrixRTCSession,
 } from "matrix-js-sdk/lib/matrixrtc";
+import { logger } from "matrix-js-sdk/lib/logger";
 
 import { getKeyForRoom } from "../e2ee/sharedKeyManagement";
 
@@ -139,22 +140,24 @@ export function useGroupCallRooms(client: MatrixClient): GroupCallRoom[] {
         .filter(roomHasCallMembershipEvents)
         .filter(roomIsJoinable);
       const sortedRooms = sortRooms(client, rooms);
-      const items = sortedRooms.map((room) => {
-        const session = client.matrixRTC.getRoomSession(room);
-        return {
-          roomAlias: room.getCanonicalAlias() ?? undefined,
-          roomName: room.name,
-          avatarUrl: room.getMxcAvatarUrl()!,
-          room,
-          session,
-          participants: session.memberships
-            .filter((m) => m.sender)
-            .map((m) => room.getMember(m.sender!))
-            .filter((m) => m) as RoomMember[],
-        };
-      });
-
-      setRooms(items);
+      Promise.all(
+        sortedRooms.map(async (room) => {
+          const session = await client.matrixRTC.getRoomSession(room);
+          return {
+            roomAlias: room.getCanonicalAlias() ?? undefined,
+            roomName: room.name,
+            avatarUrl: room.getMxcAvatarUrl()!,
+            room,
+            session,
+            participants: session.memberships
+              .filter((m) => m.sender)
+              .map((m) => room.getMember(m.sender!))
+              .filter((m) => m) as RoomMember[],
+          };
+        }),
+      )
+        .then((items) => setRooms(items))
+        .catch(logger.error);
     }
 
     updateRooms();
diff --git a/yarn.lock b/yarn.lock
index 197cee3e..701a7f67 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7537,7 +7537,7 @@ __metadata:
     livekit-client: "npm:^2.13.0"
     lodash-es: "npm:^4.17.21"
     loglevel: "npm:^1.9.1"
-    matrix-js-sdk: "github:matrix-org/matrix-js-sdk#head=voip-team/multi-SFU"
+    matrix-js-sdk: "github:matrix-org/matrix-js-sdk#head=toger5/use-relation-based-CallMembership-create-ts"
     matrix-widget-api: "npm:^1.13.0"
     normalize.css: "npm:^8.0.1"
     observable-hooks: "npm:^4.2.3"
@@ -10297,9 +10297,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=voip-team/multi-SFU":
-  version: 38.3.0
-  resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=a343e8c92a5a37f419eb1b762db3a123e41ef66d"
+"matrix-js-sdk@github:matrix-org/matrix-js-sdk#head=toger5/use-relation-based-CallMembership-create-ts":
+  version: 38.4.0
+  resolution: "matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk.git#commit=4608506288c6beaa252982d224e996e23e51f681"
   dependencies:
     "@babel/runtime": "npm:^7.12.5"
     "@matrix-org/matrix-sdk-crypto-wasm": "npm:^15.3.0"
@@ -10315,7 +10315,7 @@ __metadata:
     sdp-transform: "npm:^2.14.1"
     unhomoglyph: "npm:^1.0.6"
     uuid: "npm:13"
-  checksum: 10c0/4893878f2fe07b06334bab4674a01569037d0f3e737fef3f0bb97a98b01d71fc304627921673f128821a17d824de9b63cc06456db15f9d45eb10bba1ceacd5c5
+  checksum: 10c0/2e896d6a92cb3bbb47c120a39dd1a0030b4bf02289cb914f6c848b564208f421ada605e8efb68f6d9d55a0d2e3f86698b6076cb029e9bab2bac0f70f7250dd17
   languageName: node
   linkType: hard