Matrix-Mirrors/synapse-product
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse-product.git synced 2024-10-01 08:25:44 -04:00
Code Issues Packages 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

15
synapse/handlers/pagination.py
View File

@ -235,13 +235,7 @@ class PaginationHandler(object):
"room_key", next_key "room_key", next_key
) )
if not events: if events:
defer.returnValue({
"chunk": [],
"start": pagin_config.from_token.to_string(),
"end": next_token.to_string(),
})
if event_filter: if event_filter:
events = event_filter.filter(events) events = event_filter.filter(events)
@ -252,6 +246,13 @@ class PaginationHandler(object):
is_peeking=(member_event_id is None), is_peeking=(member_event_id is None),
) )
if not events:
defer.returnValue({
"chunk": [],
"start": pagin_config.from_token.to_string(),
"end": next_token.to_string(),
})
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