diff options
| author | Erik Johnston <erik@matrix.org> | 2016-10-17 11:08:23 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2016-10-17 11:10:37 +0100 |
| commit | 816988baaa31210b36c49ad207eecf30d0223595 (patch) | |
| tree | 7f10b3a6a890d4bbb7d33a76d5f26e0acc2b7497 /synapse/rest/client/v1/initial_sync.py | |
| parent | Drop some unused indices (diff) | |
| parent | Merge pull request #1162 from larroy/master (diff) | |
| download | synapse-816988baaa31210b36c49ad207eecf30d0223595.tar.xz | |
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/remove_auth
Diffstat (limited to 'synapse/rest/client/v1/initial_sync.py')
| -rw-r--r-- | synapse/rest/client/v1/initial_sync.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/initial_sync.py b/synapse/rest/client/v1/initial_sync.py index 113a49e539..478e21eea8 100644 --- a/synapse/rest/client/v1/initial_sync.py +++ b/synapse/rest/client/v1/initial_sync.py @@ -25,16 +25,15 @@ class InitialSyncRestServlet(ClientV1RestServlet): def __init__(self, hs): super(InitialSyncRestServlet, self).__init__(hs) - self.handlers = hs.get_handlers() + self.initial_sync_handler = hs.get_initial_sync_handler() @defer.inlineCallbacks def on_GET(self, request): requester = yield self.auth.get_user_by_req(request) as_client_event = "raw" not in request.args pagination_config = PaginationConfig.from_request(request) - handler = self.handlers.message_handler include_archived = request.args.get("archived", None) == ["true"] - content = yield handler.snapshot_all_rooms( + content = yield self.initial_sync_handler.snapshot_all_rooms( user_id=requester.user.to_string(), pagin_config=pagination_config, as_client_event=as_client_event, |