Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

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

Merged
merged 2 commits into from
Jan 2, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4330.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
fix NPE in /messages by checking if all events were filtered out
21 changes: 11 additions & 10 deletions synapse/handlers/pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -235,23 +235,24 @@ def get_messages(self, requester, room_id=None, pagin_config=None,
"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:
defer.returnValue({
"chunk": [],
"start": pagin_config.from_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
if event_filter and event_filter.lazy_load_members():
# TODO: remove redundant members
Expand Down