MirrorHub/synapse
0
0
Fork 1
mirror of https://mau.dev/maunium/synapse.git synced 2024-12-14 21:33:53 +01:00
Code Issues Projects Releases Wiki Activity

fix NPE in /messages by checking if all events were filtered out (#4330)

Browse source
This commit is contained in:
Matthew Hodgson 2019-01-02 23:37:39 +00:00 committed by Richard van der Hoff
parent 37f8bdc1d5
commit 27128145e6
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/4330.bugfix Normal file
View file

@ -0,0 +1 @@
fix NPE in /messages by checking if all events were filtered out

21
synapse/handlers/pagination.py
View file

@ -235,6 +235,17 @@ class PaginationHandler(object):
"room_key", next_key "room_key", next_key
) )
if events:
if event_filter:
events = event_filter.filter(events)
events = yield filter_events_for_client(
self.store,
user_id,
events,
is_peeking=(member_event_id is None),
)
if not events: if not events:
defer.returnValue({ defer.returnValue({
"chunk": [], "chunk": [],
@ -242,16 +253,6 @@ class PaginationHandler(object):
"end": next_token.to_string(), "end": next_token.to_string(),
}) })
if event_filter:
events = event_filter.filter(events)
events = yield filter_events_for_client(
self.store,
user_id,
events,
is_peeking=(member_event_id is None),
)
state = None state = None
if event_filter and event_filter.lazy_load_members(): if event_filter and event_filter.lazy_load_members():
# TODO: remove redundant members # TODO: remove redundant members