diff options
author | Erik Johnston <erik@matrix.org> | 2016-09-21 11:46:28 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2016-09-21 11:46:28 +0100 |
commit | 87528f07561d16dbf35aeebdfcecb111ed385b4f (patch) | |
tree | f095f089b4aaa4cc841368860e57df5d8900b5b9 /synapse/rest/client | |
parent | Merge pull request #1131 from matrix-org/matthew/e2e-notifs (diff) | |
download | synapse-87528f07561d16dbf35aeebdfcecb111ed385b4f.tar.xz |
Support /initialSync in synchrotron worker
Diffstat (limited to 'synapse/rest/client')
-rw-r--r-- | synapse/rest/client/v1/initial_sync.py | 5 | ||||
-rw-r--r-- | synapse/rest/client/v1/room.py | 4 |
2 files changed, 4 insertions, 5 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, diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py index 45287bf05b..20889e4af0 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py @@ -456,13 +456,13 @@ class RoomInitialSyncRestServlet(ClientV1RestServlet): def __init__(self, hs): super(RoomInitialSyncRestServlet, self).__init__(hs) - self.handlers = hs.get_handlers() + self.initial_sync_handler = hs.get_initial_sync_handler() @defer.inlineCallbacks def on_GET(self, request, room_id): requester = 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( + content = yield self.initial_sync_handler.room_initial_sync( room_id=room_id, requester=requester, pagin_config=pagination_config, |