summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorPaul "LeoNerd" Evans <paul@matrix.org>2014-11-18 16:34:43 +0000
committerPaul "LeoNerd" Evans <paul@matrix.org>2014-11-18 16:34:43 +0000
commit88dfa7baa6b5ed995954021328ecc4927693504a (patch)
tree6bbac875fab7e14b80085bc6e4c98a1328eec213 /synapse
parentRename message handler's new snapshot_room to room_initial_sync() as that bet... (diff)
downloadsynapse-88dfa7baa6b5ed995954021328ecc4927693504a.tar.xz
Ensure to parse a real pagination config object out of room initialSync request and pass it on
Diffstat (limited to 'synapse')
-rw-r--r--synapse/rest/room.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/rest/room.py b/synapse/rest/room.py
index e656dd3f35..17322ee9bb 100644
--- a/synapse/rest/room.py
+++ b/synapse/rest/room.py
@@ -362,11 +362,13 @@ class RoomInitialSyncRestServlet(RestServlet):
     @defer.inlineCallbacks
     def on_GET(self, request, room_id):
         user = yield self.auth.get_user_by_req(request)
-        events = yield self.handlers.message_handler.room_initial_sync(
+        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,
         )
-        defer.returnValue((200, events))
+        defer.returnValue((200, content))
 
 
 class RoomTriggerBackfill(RestServlet):