Skip to content
Snippets Groups Projects
Unverified Commit e9981d58 authored by Erik Johnston's avatar Erik Johnston Committed by GitHub
Browse files

Merge pull request #5293 from Kagamihime/messages-federation-format

Fix ignored filter field in `/messages` endpoint
parents 31d44ec4 0b6bc364
No related branches found
No related tags found
No related merge requests found
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`.
......@@ -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(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment