diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-11 18:17:49 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-11 18:17:49 +0000 |
| commit | aa3ab6c6a057f58abe6f74637a5ce2aa08732edd (patch) | |
| tree | afb813a93991252bede451936872437f6802319f /synapse/rest/client/v1/room.py | |
| parent | Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0 (diff) | |
| parent | Merge pull request #361 from matrix-org/daniel/guestcontext (diff) | |
| download | synapse-aa3ab6c6a057f58abe6f74637a5ce2aa08732edd.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into release-v0.11.0
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 03ac073926..c583025e30 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -417,12 +417,12 @@ class RoomEventContext(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id, event_id): - user, _ = yield self.auth.get_user_by_req(request) + user, _, is_guest = yield self.auth.get_user_by_req(request, allow_guest=True) limit = int(request.args.get("limit", [10])[0]) results = yield self.handlers.room_context_handler.get_event_context( - user, room_id, event_id, limit, + user, room_id, event_id, limit, is_guest ) time_now = self.clock.time_msec() |