From 5c6ea69f4351ba475e5737d15a19e81c863560ce Mon Sep 17 00:00:00 2001
From: Robert Long <robert@robertlong.me>
Date: Mon, 1 Nov 2021 13:39:30 -0700
Subject: [PATCH] Fix up more call ids in the inspector

---
 src/GroupCallInspector.jsx | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/GroupCallInspector.jsx b/src/GroupCallInspector.jsx
index 5010470c..045d7380 100644
--- a/src/GroupCallInspector.jsx
+++ b/src/GroupCallInspector.jsx
@@ -78,9 +78,12 @@ export function GroupCallInspector({ client, groupCall, show }) {
     function onCallHangup(call) {
       setState(({ hangupCalls, ...rest }) => ({
         ...rest,
-        hangupCalls: hangupCalls
-          ? [...hangupCalls, getHangupCallState(call)]
-          : [getHangupCallState(call)],
+        hangupCalls: {
+          ...hangupCalls,
+          [`${call.callId} (${
+            call.getOpponentMember()?.userId || call.sender
+          })`]: getHangupCallState(call),
+        },
       }));
     }
 
@@ -102,7 +105,10 @@ export function GroupCallInspector({ client, groupCall, show }) {
         return;
       }
 
-      setToDeviceEvents((prev) => [...prev, { eventType, content }]);
+      setToDeviceEvents((prev) => [
+        ...prev,
+        { eventType, content, sender: event.getSender() },
+      ]);
     }
 
     client.on("RoomState.events", onUpdateRoomState);
@@ -159,8 +165,9 @@ export function GroupCallInspector({ client, groupCall, show }) {
 
     for (const event of toDeviceEvents) {
       const callId = event.content.call_id;
-      result[callId] = result[callId] || [];
-      result[callId].push(event);
+      const key = `${callId} (${event.sender})`;
+      result[key] = result[key] || [];
+      result[key].push(event);
     }
 
     return result;