summary refs log tree commit diff
path: root/synapse/handlers/sync.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2024-04-23 17:10:20 +0100
committerRichard van der Hoff <richard@matrix.org>2024-04-23 17:10:20 +0100
commit6a4c6a1492e6a578090227b6e8ff0ab892bd6903 (patch)
tree9247f1020288d0cbe68b8206987c30ab6083dc27 /synapse/handlers/sync.py
parentMerge branch 'rav/log_state_desync' into active_branches_base (diff)
parentEnable MSC4115 in complement tests (diff)
downloadsynapse-rav/work.tar.xz
Merge branch 'rav/event_visibility' into active_branches_base github/rav/work rav/work
Diffstat (limited to 'synapse/handlers/sync.py')
-rw-r--r--synapse/handlers/sync.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/handlers/sync.py b/synapse/handlers/sync.py
index dafcfa89fb..1fb7ca4f71 100644
--- a/synapse/handlers/sync.py
+++ b/synapse/handlers/sync.py
@@ -600,6 +600,7 @@ class SyncHandler:
                     sync_config.user.to_string(),
                     recents,
                     always_include_ids=current_state_ids,
+                    msc4115_membership_on_events=self.hs_config.experimental.msc4115_membership_on_events,
                 )
                 log_kv({"recents_after_visibility_filtering": len(recents)})
             else:
@@ -685,6 +686,7 @@ class SyncHandler:
                     sync_config.user.to_string(),
                     loaded_recents,
                     always_include_ids=current_state_ids,
+                    msc4115_membership_on_events=self.hs_config.experimental.msc4115_membership_on_events,
                 )
 
                 loaded_recents = []