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

Filter state, events_before and events_after in /context requests #6329

Merged
merged 17 commits into from
Dec 4, 2019
Merged

Filter state, events_before and events_after in /context requests #6329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1dffa78
Filter events_before and events_after in /context requests
babolivier Nov 5, 2019
a7c818c
Add test case
babolivier Nov 5, 2019
c9e4748
Merge labels tests for /context and /messages
babolivier Nov 5, 2019
037360e
Add tests for /search
babolivier Nov 5, 2019
d8d808d
Changelog
babolivier Nov 5, 2019
8822b33
Update copyrights
babolivier Nov 5, 2019
a6863da
Lint
babolivier Nov 5, 2019
f141af4
Update copyright
babolivier Nov 5, 2019
cb2cbe4
Only filter if a filter was provided
babolivier Nov 5, 2019
eda1473
Also filter state events
babolivier Nov 6, 2019
49243c5
Update changelog since this isn't going to be featured in 1.6.0
babolivier Nov 20, 2019
b2f8c21
Format changelog
babolivier Nov 20, 2019
4c1b799
Merge branch 'develop' into babolivier/context_filters
babolivier Nov 26, 2019
08a436e
Incorporate review
babolivier Dec 4, 2019
9dc84b7
Merge branch 'develop' into babolivier/context_filters
babolivier Dec 4, 2019
aeda1b3
Merge branch 'babolivier/context_filters' of github.com:matrix-org/sy…
babolivier Dec 4, 2019
65c6aee
Un-remove room purge test
babolivier Dec 4, 2019
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/6329.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Correctly apply the event filter to the `state`, `events_before` and `events_after` fields in the response to `/context` requests.
3 changes: 2 additions & 1 deletion synapse/api/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd
# Copyright 2017 Vector Creations Ltd
# Copyright 2018 New Vector Ltd
# Copyright 2018-2019 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 3 additions & 0 deletions synapse/api/filtering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2015, 2016 OpenMarket Ltd
# Copyright 2017 Vector Creations Ltd
babolivier marked this conversation as resolved.
Show resolved Hide resolved
# Copyright 2018-2019 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
14 changes: 12 additions & 2 deletions synapse/handlers/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# Copyright 2014 - 2016 OpenMarket Ltd
# Copyright 2018 New Vector Ltd
# Copyright 2018-2019 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -900,6 +901,10 @@ def filter_evts(events):
room_id, event_id, before_limit, after_limit, event_filter
)

if event_filter:
results["events_before"] = event_filter.filter(results["events_before"])
results["events_after"] = event_filter.filter(results["events_after"])

results["events_before"] = yield filter_evts(results["events_before"])
results["events_after"] = yield filter_evts(results["events_after"])
results["event"] = event
Expand Down Expand Up @@ -928,7 +933,12 @@ def filter_evts(events):
state = yield self.state_store.get_state_for_events(
[last_event_id], state_filter=state_filter
)
results["state"] = list(state[last_event_id].values())

state_events = list(state[last_event_id].values())
if event_filter:
state_events = event_filter.filter(state_events)

results["state"] = state_events

# We use a dummy token here as we only care about the room portion of
# the token, which we replace.
Expand Down
3 changes: 3 additions & 0 deletions synapse/rest/client/versions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2016 OpenMarket Ltd
# Copyright 2017 Vector Creations Ltd
# Copyright 2018-2019 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 3 additions & 0 deletions synapse/storage/data_stores/main/stream.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2014-2016 OpenMarket Ltd
# Copyright 2017 Vector Creations Ltd
# Copyright 2018-2019 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
3 changes: 3 additions & 0 deletions tests/api/test_filtering.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# -*- coding: utf-8 -*-
# Copyright 2015, 2016 OpenMarket Ltd
# Copyright 2017 Vector Creations Ltd
# Copyright 2018-2019 New Vector Ltd
# Copyright 2019 The Matrix.org Foundation C.I.C.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
Loading