Mirrors
/
synapse-old
mirror of https://github.com/matrix-org/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Incorporate review

This commit is contained in:
Brendan Abolivier 2019-12-04 14:18:46 +00:00
parent b2f8c21a9b
commit 08a436ecb2
No known key found for this signature in database
GPG Key ID: 1E015C145F1916CD
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/6329.bugfix Normal file
View File

@ -0,0 +1 @@
Correctly apply the event filter to the `state`, `events_before` and `events_after` fields in the response to `/context` requests.

1
changelog.d/6329.feature
View File

@ -1 +0,0 @@
Filter `state`, `events_before` and `events_after` in `/context` requests.

3
synapse/handlers/room.py
View File

@ -908,12 +908,11 @@ class RoomContextHandler(object):
[last_event_id], state_filter=state_filter [last_event_id], state_filter=state_filter
) )
# Apply the filter on state events.
state_events = list(state[last_event_id].values()) state_events = list(state[last_event_id].values())
if event_filter: if event_filter:
state_events = event_filter.filter(state_events) state_events = event_filter.filter(state_events)
results["state"] = list(state_events) results["state"] = state_events
# We use a dummy token here as we only care about the room portion of # We use a dummy token here as we only care about the room portion of
# the token, which we replace. # the token, which we replace.