diff options
| author | Erik Johnston <erik@matrix.org> | 2015-11-13 11:40:17 +0000 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2015-11-13 11:40:17 +0000 |
| commit | da3dd4867dfb6414a4402089cbe3ef70fb605d23 (patch) | |
| tree | a80ccd094d9dacafdbe02dc4a6705b0f3d217c2b /synapse/rest/client/v1/room.py | |
| parent | Update date (diff) | |
| parent | Implementation of state rollback in /sync (diff) | |
| download | synapse-da3dd4867dfb6414a4402089cbe3ef70fb605d23.tar.xz | |
Merge branch 'develop' into release-v0.11.0
Diffstat (limited to 'synapse/rest/client/v1/room.py')
| -rw-r--r-- | synapse/rest/client/v1/room.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index c583025e30..d298aee3ab 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -372,12 +372,13 @@ class RoomInitialSyncRestServlet(ClientV1RestServlet): @defer.inlineCallbacks def on_GET(self, request, room_id): - user, _, _ = yield self.auth.get_user_by_req(request) + user, _, is_guest = yield self.auth.get_user_by_req(request, allow_guest=True) pagination_config = PaginationConfig.from_request(request) content = yield self.handlers.message_handler.room_initial_sync( room_id=room_id, user_id=user.to_string(), pagin_config=pagination_config, + is_guest=is_guest, ) defer.returnValue((200, content)) |