diff options
| author | Richard van der Hoff <richard@matrix.org> | 2018-09-18 19:02:45 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2018-09-18 19:02:45 +0100 |
| commit | 38ead946a9571f1916228c3d96aad48b6b57ef89 (patch) | |
| tree | cdc68014a0368b266796c83f78b9a02e41c0fe07 /synapse/handlers/pagination.py | |
| parent | towncrier (diff) | |
| parent | Merge pull request #3879 from matrix-org/matthew/fix-autojoin (diff) | |
| download | synapse-38ead946a9571f1916228c3d96aad48b6b57ef89.tar.xz | |
Merge remote-tracking branch 'origin/develop' into neilj/fix_room_invite_mail_links
Diffstat (limited to 'synapse/handlers/pagination.py')
| -rw-r--r-- | synapse/handlers/pagination.py | 9 |
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() |