From 39432310e304322b425b1456256be311bd15b3ef Mon Sep 17 00:00:00 2001
From: Timo K <toger5@hotmail.de>
Date: Fri, 9 Jan 2026 17:56:30 +0100
Subject: [PATCH] use actual uuid for `member.id`

review with some renaming and removal of unnecassary if
---
 src/state/CallViewModel/CallViewModel.ts      | 44 +++++++++----------
 .../remoteMembers/MatrixLivekitMembers.ts     |  2 +-
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/state/CallViewModel/CallViewModel.ts b/src/state/CallViewModel/CallViewModel.ts
index 8fc2d7e6..bf5ea441 100644
--- a/src/state/CallViewModel/CallViewModel.ts
+++ b/src/state/CallViewModel/CallViewModel.ts
@@ -47,6 +47,7 @@ import {
 } from "matrix-js-sdk/lib/matrixrtc";
 import { type IWidgetApiRequest } from "matrix-widget-api";
 import { type CallMembershipIdentityParts } from "matrix-js-sdk/lib/matrixrtc/EncryptionManager";
+import { v4 as uuidv4 } from "uuid";
 
 import {
   LocalUserMediaViewModel,
@@ -430,9 +431,8 @@ export function createCallViewModel$(
   const ownMembershipIdentity: CallMembershipIdentityParts = {
     userId,
     deviceId,
-    // This will eventually become the salt for the hash endpoint.
-    // For now we keep it as the user+device string since it is expected by non matrix matrixRTCMode === Legacy.
-    memberId: `${userId}:${deviceId}`,
+    // This will only be consumed by the sticky membership manager. So it has no impact on legacy calls.
+    memberId: uuidv4(),
   };
 
   const localTransport$ = createLocalTransport$({
@@ -722,22 +722,20 @@ export function createCallViewModel$(
           if (localMatrixLivekitMember) {
             const { userId, participant, connection$, membership$ } =
               localMatrixLivekitMember;
-            localUserMediaId = `${userId}:${membership$.value.deviceId}`; // should be membership$.value.membershipID which is not optional
 
-            if (localUserMediaId) {
-              for (let dup = 0; dup < 1 + duplicateTiles; dup++) {
-                yield {
-                  keys: [
-                    dup,
-                    localUserMediaId,
-                    userId,
-                    participant satisfies TaggedParticipant as TaggedParticipant, // Widen the type safely
-                    connection$,
-                    membership$.value,
-                  ],
-                  data: undefined,
-                };
-              }
+            localUserMediaId = `${userId}:${membership$.value.deviceId}`;
+            for (let dup = 0; dup < 1 + duplicateTiles; dup++) {
+              yield {
+                keys: [
+                  dup,
+                  localUserMediaId,
+                  userId,
+                  participant satisfies TaggedParticipant as TaggedParticipant, // Widen the type safely
+                  connection$,
+                  membership$.value,
+                ],
+                data: undefined,
+              };
             }
           }
           // add remote members that are available
@@ -748,8 +746,8 @@ export function createCallViewModel$(
             membership$,
           } of matrixLivekitMembers.value) {
             const userMediaId = `${userId}:${membership$.value.deviceId}`;
+            // skip local user as we added them manually before
             if (userMediaId === localUserMediaId) continue;
-            // const participantId = membership$.value?.identity;
             for (let dup = 0; dup < 1 + duplicateTiles; dup++) {
               yield {
                 keys: [
@@ -769,7 +767,7 @@ export function createCallViewModel$(
           scope,
           _data$,
           dup,
-          participantId,
+          userMediaId,
           userId,
           participant,
           connection$,
@@ -789,7 +787,7 @@ export function createCallViewModel$(
 
           return new UserMedia(
             scope,
-            `${participantId}:${dup}`,
+            `${userMediaId}:${dup}`,
             userId,
             membership,
             participant,
@@ -800,8 +798,8 @@ export function createCallViewModel$(
             localMembership.reconnecting$,
             displayName$,
             matrixMemberMetadataStore.createAvatarUrlBehavior$(userId),
-            handsRaised$.pipe(map((v) => v[participantId]?.time ?? null)),
-            reactions$.pipe(map((v) => v[participantId] ?? undefined)),
+            handsRaised$.pipe(map((v) => v[userMediaId]?.time ?? null)),
+            reactions$.pipe(map((v) => v[userMediaId] ?? undefined)),
           );
         },
       ),
diff --git a/src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts b/src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts
index 64455e87..10a3e2cb 100644
--- a/src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts
+++ b/src/state/CallViewModel/remoteMembers/MatrixLivekitMembers.ts
@@ -92,7 +92,7 @@ export function createMatrixLivekitMembers$({
       filter((values) =>
         values.every((value) => value.epoch === values[0].epoch),
       ),
-      map(([x, y]) => new Epoch([x.value, y.value] as const, x.epoch)),
+      map(([ms, data]) => new Epoch([ms.value, data.value] as const, ms.epoch)),
       generateItemsWithEpoch(
         // Generator function.
         // creates an array of `{key, data}[]`