fix: Improve message sending performances (#14800)

wireapp · Mar 10, 2023 · 2b0bef9 · 2b0bef9
1 parent 0a0b3c3
commit 2b0bef9
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/script/event/EventService.ts b/src/script/event/EventService.ts
@@ -127,12 +127,18 @@ export class EventService {
 
     try {
       if (this.storageService.db) {
-        return await this.storageService.db
-          .table(StorageSchemata.OBJECT_STORE.EVENTS)
-          .where('conversation')
-          .equals(conversationId)
-          .filter(item => item.data?.replacing_message_id === eventId || item.id === eventId)
-          .first();
+        const eventStore = this.storageService.db.table(StorageSchemata.OBJECT_STORE.EVENTS);
+        // First lookup the event by its direct id (using the index)
+        const event = eventStore.where('id').equals(eventId).first();
+        return (
+          event ||
+          // If the event was not found, fallback to filtering all the events and check if a `replacing` message is found
+          eventStore
+            .where('conversation')
+            .equals(conversationId)
+            .filter(item => item.data?.replacing_message_id === eventId || item.id === eventId)
+            .first()
+        );
       }
 
       const records = await this.storageService.getAll<EventRecord>(StorageSchemata.OBJECT_STORE.EVENTS);