Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
matrix-org · Jan 8, 2025 · da5bc96 · da5bc96
1 parent df213e5
commit da5bc96
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/spec/unit/crypto.spec.ts b/spec/unit/crypto.spec.ts
@@ -858,7 +858,8 @@ describe("Crypto", function () {
             );
             const ksEvent = await keyshareEventForEvent(aliceClient, events[0], 0);
             ksEvent.event.sender = claraClient.getUserId()!;
-            ksEvent.sender = new RoomMember(roomId, claraClient.getUserId()!);
+            // @ts-ignore - private field access
+            ksEvent._sender = new RoomMember(roomId, claraClient.getUserId()!);
             await bobDecryptor.onRoomKeyEvent(ksEvent);
             const key = await bobClient.crypto!.olmDevice.getInboundGroupSessionKey(
                 roomId,
@@ -945,7 +946,8 @@ describe("Crypto", function () {
 
             const ksEvent = await keyshareEventForEvent(aliceClient, events[0], 0);
             ksEvent.event.sender = aliceClient.getUserId()!;
-            ksEvent.sender = new RoomMember(roomId, aliceClient.getUserId()!);
+            // @ts-ignore - private field access
+            ksEvent._sender = new RoomMember(roomId, aliceClient.getUserId()!);
             await bobDecryptor.onRoomKeyEvent(ksEvent);
             const key = await bobClient.crypto!.olmDevice.getInboundGroupSessionKey(
                 roomId,
@@ -1015,7 +1017,8 @@ describe("Crypto", function () {
 
             const ksEvent = await keyshareEventForEvent(aliceClient, events[0], 0);
             ksEvent.event.sender = claraClient.getUserId()!;
-            ksEvent.sender = new RoomMember(roomId, claraClient.getUserId()!);
+            // @ts-ignore - private field access
+            ksEvent._sender = new RoomMember(roomId, claraClient.getUserId()!);
             await bobDecryptor.onRoomKeyEvent(ksEvent);
             const key = await bobClient.crypto!.olmDevice.getInboundGroupSessionKey(
                 roomId,

diff --git a/src/client.ts b/src/client.ts
@@ -7351,7 +7351,9 @@ export class MatrixClient extends TypedEventEmitter<EmittedEvents, ClientEventHa
                 // Copy over a known event sender if we can
                 for (const ev of sr.context.getTimeline()) {
                     const sender = room.getMember(ev.getSender()!);
-                    if (!ev.sender && sender) ev.sender = sender;
+                    if (!ev.sender && sender) {
+                        ev.setMetadata(room.currentState, false);
+                    }
                 }
             }
             searchResults.results.push(sr);

diff --git a/src/testing.ts b/src/testing.ts
@@ -72,7 +72,8 @@ export function mkMatrixEvent(opts: {
     }
 
     const mxEvent = new MatrixEvent(event);
-    mxEvent.sender = {
+    // @ts-ignore - private field access
+    mxEvent._sender = {
         userId: opts.sender,
         membership: "join",
         name: opts.sender,