From 08ba4577f68e99b04629078a36e84269713c6aea Mon Sep 17 00:00:00 2001
From: Bruno Windels <bruno@windels.cloud>
Date: Wed, 5 May 2021 17:10:15 +0200
Subject: [PATCH] rejoin logic was throwing away the prev_batch token

---
 src/matrix/room/timeline/persistence/SyncWriter.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/matrix/room/timeline/persistence/SyncWriter.js b/src/matrix/room/timeline/persistence/SyncWriter.js
index dc2344e5..8e3d2527 100644
--- a/src/matrix/room/timeline/persistence/SyncWriter.js
+++ b/src/matrix/room/timeline/persistence/SyncWriter.js
@@ -200,10 +200,10 @@ export class SyncWriter {
                 const index = events.findIndex(event => event.event_id === lastEventId);
                 if (index !== -1) {
                     log.set("overlap_event_id", lastEventId);
-                    return {
+                    return Object.assign({}, timeline, {
                         limited: false,
-                        events: events.slice(index + 1)
-                    };
+                        events: events.slice(index + 1),
+                    });
                 }
             }
         }