From 3a1ce2effa1c815b12ff163fd27ab0336d2f9ef0 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 14 Sep 2018 16:47:34 +0100 Subject: [PATCH 1/3] don't filter membership events based on history viz as we will already have filtered the messages in the timeline, and state events are always visible. and because @erikjohnston said so. --- synapse/handlers/pagination.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index 5170d093e365..dffad5a1256f 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -270,14 +270,6 @@ def get_messages(self, requester, room_id=None, pagin_config=None, 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), - ) - time_now = self.clock.time_msec() chunk = { From cfef0c8dd504cae5db8d5e379f9e3a277f8bc798 Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 14 Sep 2018 17:31:21 +0100 Subject: [PATCH 2/3] fix tests --- synapse/handlers/pagination.py | 1 + 1 file changed, 1 insertion(+) diff --git a/synapse/handlers/pagination.py b/synapse/handlers/pagination.py index dffad5a1256f..a155b6e938ff 100644 --- a/synapse/handlers/pagination.py +++ b/synapse/handlers/pagination.py @@ -269,6 +269,7 @@ def get_messages(self, requester, room_id=None, pagin_config=None, if state_ids: state = yield self.store.get_events(list(state_ids.values())) + state = state.values() time_now = self.clock.time_msec() From e119ebdecba1e0bb52f38d79a7c4032a0f46381e Mon Sep 17 00:00:00 2001 From: Matthew Hodgson Date: Fri, 14 Sep 2018 17:38:01 +0100 Subject: [PATCH 3/3] changelog --- changelog.d/3874.bugfix | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 changelog.d/3874.bugfix diff --git a/changelog.d/3874.bugfix b/changelog.d/3874.bugfix new file mode 100644 index 000000000000..e69de29bb2d1