Fixup

element-hq · Jul 17, 2024 · 1c9e685 · 1c9e685
1 parent 21f4e80
commit 1c9e685
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py
@@ -627,11 +627,17 @@ async def current_sync_for_user(
                 user_id,
                 conn_id=sync_config.device_id or "",  # TODO
                 prev_store_token=from_token.room_store_token if from_token else None,
-                last_room_token=from_token.stream_token.room_key if from_token else None,
+                last_room_token=(
+                    from_token.stream_token.room_key if from_token else None
+                ),
                 new_sent_room_ids=relevant_room_map.keys(),
                 new_missing_room_ids=room_membership_for_user_map.keys()
                 - relevant_room_map.keys(),
             )
+        elif from_token:
+            room_store_token = from_token.room_store_token
+        else:
+            room_store_token = 0
 
         return SlidingSyncResult(
             next_pos=SlidingSyncStreamToken(to_token, room_store_token),