summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-07-30 13:59:34 +0100
committerErik Johnston <erik@matrix.org>2024-07-30 13:59:34 +0100
commit4fb43460d449f4224400896693a591c35454a49a (patch)
tree2efb13b178e57ae9aaa373a1a16ef14e7d30105d /synapse/handlers
parentTrace stuff (diff)
downloadsynapse-4fb43460d449f4224400896693a591c35454a49a.tar.xz
Don't set the initial flag
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/sliding_sync.py15
1 files changed, 8 insertions, 7 deletions
diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py
index 45a55a37d2..3e8e833367 100644
--- a/synapse/handlers/sliding_sync.py
+++ b/synapse/handlers/sliding_sync.py
@@ -1473,13 +1473,8 @@ class SlidingSyncHandler:
                 connection_token=from_token.connection_position,
                 room_id=room_id,
             )
-            if (
-                room_status.timeline_limit is not None
-                and room_status.timeline_limit < room_sync_config.timeline_limit
-            ):
-                from_bound = None
-                initial = True
-            elif room_status.status == HaveSentRoomFlag.LIVE:
+
+            if room_status.status == HaveSentRoomFlag.LIVE:
                 from_bound = from_token.stream_token.room_key
                 initial = False
             elif room_status.status == HaveSentRoomFlag.PREVIOUSLY:
@@ -1492,6 +1487,12 @@ class SlidingSyncHandler:
             else:
                 assert_never(room_status.status)
 
+            if (
+                room_status.timeline_limit is not None
+                and room_status.timeline_limit < room_sync_config.timeline_limit
+            ):
+                from_bound = None
+
             set_tag("sliding_sync.from_bound", from_bound)
             set_tag("sliding_sync.room_status", room_status.status)