diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-05-31 11:38:13 +0100 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-05-31 11:38:13 +0100 |
| commit | c605da97bff8dc749ebea1fc016f231461b2c19f (patch) | |
| tree | 8a1f131272010881b97c215e4a5518dd1ebc4735 /synapse/rest/client/v1 | |
| parent | Rewrite get_server_verify_keys, again. (diff) | |
| parent | Merge pull request #5300 from matrix-org/rav/server_keys/06-fix-serverkeys-ha... (diff) | |
| download | synapse-c605da97bff8dc749ebea1fc016f231461b2c19f.tar.xz | |
Merge remote-tracking branch 'origin/develop' into rav/server_keys/05-rewrite-gsvk-again
Diffstat (limited to 'synapse/rest/client/v1')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 255a85c588..b92c6a9a9c 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -475,6 +475,8 @@ class RoomMessageListRestServlet(ClientV1RestServlet): if filter_bytes: filter_json = urlparse.unquote(filter_bytes.decode("UTF-8")) event_filter = Filter(json.loads(filter_json)) + if event_filter.filter_json.get("event_format", "client") == "federation": + as_client_event = False else: event_filter = None msgs = yield self.pagination_handler.get_messages( |