diff options
| author | Erik Johnston <erik@matrix.org> | 2019-05-31 10:52:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 10:52:59 +0100 |
| commit | e9981d58ca98a6aa0084409e1c2da9efd24c2177 (patch) | |
| tree | c8589059d542fc5d31e3376f3143bfa11c290d7d | |
| parent | Merge pull request #5294 from matrix-org/erikj/speed_up_room_stats (diff) | |
| parent | Add changelog (diff) | |
| download | synapse-e9981d58ca98a6aa0084409e1c2da9efd24c2177.tar.xz | |
Merge pull request #5293 from Kagamihime/messages-federation-format
Fix ignored filter field in `/messages` endpoint
| -rw-r--r-- | changelog.d/5293.bugfix | 1 | ||||
| -rw-r--r-- | synapse/rest/client/v1/room.py | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/changelog.d/5293.bugfix b/changelog.d/5293.bugfix new file mode 100644 index 0000000000..aa519a8433 --- /dev/null +++ b/changelog.d/5293.bugfix @@ -0,0 +1 @@ +Fix a bug where it is not possible to get events in the federation format with the request `GET /_matrix/client/r0/rooms/{roomId}/messages`. 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( |