From b75e2fe0ceb3d0d0d0653fca5fed3eda30858208 Mon Sep 17 00:00:00 2001
From: Bruno Windels <bruno@windels.cloud>
Date: Fri, 24 Sep 2021 15:40:33 +0200
Subject: [PATCH] decode straight to EventKey object

---
 src/matrix/storage/idb/stores/TimelineEventStore.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/matrix/storage/idb/stores/TimelineEventStore.ts b/src/matrix/storage/idb/stores/TimelineEventStore.ts
index cc23df41..7338f96a 100644
--- a/src/matrix/storage/idb/stores/TimelineEventStore.ts
+++ b/src/matrix/storage/idb/stores/TimelineEventStore.ts
@@ -44,9 +44,9 @@ function encodeKey(roomId: string, fragmentId: number, eventIndex: number): stri
     return `${roomId}|${encodeUint32(fragmentId)}|${encodeUint32(eventIndex)}`;
 }
 
-function decodeKey(key: string): { roomId: string, fragmentId: number, eventIndex: number } {
+function decodeKey(key: string): { roomId: string, eventKey: EventKey } {
     const [roomId, fragmentId, eventIndex] = key.split("|");
-    return {roomId, fragmentId: parseInt(fragmentId, 10), eventIndex: parseInt(eventIndex, 10)};
+    return {roomId, eventKey: new EventKey(parseInt(fragmentId, 10), parseInt(eventIndex, 10))};
 }
 
 function encodeEventIdKey(roomId: string, eventId: string): string {
@@ -231,8 +231,8 @@ export class TimelineEventStore {
         const results = new Map();
         await byEventId.findExistingKeys(keys, false, (indexKey, pk) => {
             const {eventId} = decodeEventIdKey(indexKey as string);
-            const {fragmentId, eventIndex} = decodeKey(pk as string);
-            results.set(eventId, new EventKey(fragmentId, eventIndex));
+            const {eventKey} = decodeKey(pk as string);
+            results.set(eventId, eventKey);
             return false;
         });
         return results;