diff options
| author | Erik Johnston <erik@matrix.org> | 2018-07-30 09:56:18 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2018-07-30 09:56:18 +0100 |
| commit | 143f1a2532e4a583c4f4f215334800cb63a4117f (patch) | |
| tree | 2926318407e42844fcf70211f6596ccab919b184 /synapse/rest/client | |
| parent | Newsfile (diff) | |
| parent | make /context lazyload & filter aware (#3567) (diff) | |
| download | synapse-143f1a2532e4a583c4f4f215334800cb63a4117f.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/split_fed_store
Diffstat (limited to 'synapse/rest/client')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index b7bd878c90..13c331550b 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -531,11 +531,20 @@ class RoomEventContextServlet(ClientV1RestServlet): limit = parse_integer(request, "limit", default=10) + # picking the API shape for symmetry with /messages + filter_bytes = parse_string(request, "filter") + if filter_bytes: + filter_json = urlparse.unquote(filter_bytes).decode("UTF-8") + event_filter = Filter(json.loads(filter_json)) + else: + event_filter = None + results = yield self.room_context_handler.get_event_context( requester.user, room_id, event_id, limit, + event_filter, ) if not results: |