summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2024-07-28 17:46:34 +0100
committerErik Johnston <erik@matrix.org>2024-07-28 17:46:34 +0100
commitce6194f60c43dd77fa4eef7677bf0cc8358ec72a (patch)
tree4ececa4b6500f5122f8c3ad22e3a2f98d0f20dcb
parentTag (diff)
downloadsynapse-ce6194f60c43dd77fa4eef7677bf0cc8358ec72a.tar.xz
Always initial on room subs
-rw-r--r--synapse/handlers/sliding_sync.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/synapse/handlers/sliding_sync.py b/synapse/handlers/sliding_sync.py
index 35a9581592..7dc632f5a6 100644
--- a/synapse/handlers/sliding_sync.py
+++ b/synapse/handlers/sliding_sync.py
@@ -1463,7 +1463,11 @@ class SlidingSyncHandler:
         #    connection before
         from_bound = None
         initial = True
-        if from_token and not room_membership_for_user_at_to_token.newly_joined:
+        if (
+            from_token
+            and not room_membership_for_user_at_to_token.newly_joined
+            and room_id not in sync_config.room_subscriptions
+        ):
             room_status = await self.connection_store.have_sent_room(
                 sync_config=sync_config,
                 connection_token=from_token.connection_position,