summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorMatthew Hodgson <matthew@arasphere.net>2018-09-14 18:12:52 +0100
committerGitHub <noreply@github.com>2018-09-14 18:12:52 +0100
commit024be6cf1891fc20baac2356246595dc7f8ba5c5 (patch)
treebe8c86d2453e23bd9c564997a5562135f004192f /synapse/handlers
parentMerge pull request #3872 from matrix-org/hawkowl/timeouts-2 (diff)
downloadsynapse-024be6cf1891fc20baac2356246595dc7f8ba5c5.tar.xz
don't filter membership events based on history visibility (#3874)
don't filter membership events based on history visibility
as we will already have filtered the messages in the timeline, and state events
are always visible.

and because @erikjohnston said so.
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/pagination.py9
1 files changed, 1 insertions, 8 deletions
diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py
index 5170d093e3..a155b6e938 100644
--- a/synapse/handlers/pagination.py
+++ b/synapse/handlers/pagination.py
@@ -269,14 +269,7 @@ class PaginationHandler(object):
 
             if state_ids:
                 state = yield self.store.get_events(list(state_ids.values()))
-
-            if state:
-                state = yield filter_events_for_client(
-                    self.store,
-                    user_id,
-                    state.values(),
-                    is_peeking=(member_event_id is None),
-                )
+                state = state.values()
 
         time_now = self.clock.time_msec()