From ba3a4ab8b2fc88493fd641696eba921a5ade9ab5 Mon Sep 17 00:00:00 2001
From: Bruno Windels <brunow@matrix.org>
Date: Thu, 20 Aug 2020 09:39:19 +0200
Subject: [PATCH] process state events in the timeline together with other
 timeline events

so member info gets overwritten after all the previous events
have already been written
---
 .../room/timeline/persistence/SyncWriter.js   | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/matrix/room/timeline/persistence/SyncWriter.js b/src/matrix/room/timeline/persistence/SyncWriter.js
index 6667cc5f..967c56ce 100644
--- a/src/matrix/room/timeline/persistence/SyncWriter.js
+++ b/src/matrix/room/timeline/persistence/SyncWriter.js
@@ -118,7 +118,7 @@ export class SyncWriter {
     _writeStateEvents(roomResponse, txn) {
         const changedMembers = [];
         // persist state
-        const {state, timeline} = roomResponse;
+        const {state} = roomResponse;
         if (state.events) {
             for (const event of state.events) {
                 const member = this._writeStateEvent(event, txn);
@@ -127,31 +127,29 @@ export class SyncWriter {
                 }
             }
         }
-        // persist live state events in timeline
+        return changedMembers;
+    }
+
+    _writeTimeline(entries, timeline, currentKey, txn) {
+        const changedMembers = [];
         if (timeline.events) {
-            for (const event of timeline.events) {
+            const events = deduplicateEvents(timeline.events);
+            for(const event of events) {
+                // process live state events first, so new member info is available
                 if (typeof event.state_key === "string") {
                     const member = this._writeStateEvent(event, txn);
                     if (member) {
                         changedMembers.push(member);
                     }
                 }
-            }
-        }
-        return changedMembers;
-    }
-
-    _writeTimeline(entries, timeline, currentKey, txn) {
-        if (timeline.events) {
-            const events = deduplicateEvents(timeline.events);
-            for(const event of events) {
+                // store event in timeline
                 currentKey = currentKey.nextKey();
                 const entry = createEventEntry(currentKey, this._roomId, event);
                 txn.timelineEvents.insert(entry);
                 entries.push(new EventEntry(entry, this._fragmentIdComparer));
             }
         }
-        return currentKey;
+        return {currentKey, changedMembers};
     }
 
     async writeSync(roomResponse, txn) {
@@ -177,8 +175,9 @@ export class SyncWriter {
         // important this happens before _writeTimeline so
         // members are available in the transaction
         const changedMembers = this._writeStateEvents(roomResponse, txn);
-
-        currentKey = this._writeTimeline(entries, timeline, currentKey, txn);
+        const timelineResult = this._writeTimeline(entries, timeline, currentKey, txn);
+        currentKey = timelineResult.currentKey;
+        changedMembers.push(...timelineResult.changedMembers);
 
         return {entries, newLiveKey: currentKey, changedMembers};
     }