summary refs log tree commit diff
path: root/synapse/handlers
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2018-05-21 17:41:10 +0100
committerErik Johnston <erik@matrix.org>2018-05-25 10:55:10 +0100
commitf24c3bf0be6cbb642ab1442bd8a808f421ad4b9d (patch)
treecf3fb53fd96127e96e78449a522e8e31b9af08d2 /synapse/handlers
parentUse calculated topological ordering when persisting events (diff)
downloadsynapse-f24c3bf0be6cbb642ab1442bd8a808f421ad4b9d.tar.xz
Implement pagination using chunks
Diffstat (limited to 'synapse/handlers')
-rw-r--r--synapse/handlers/message.py2
-rw-r--r--synapse/handlers/room.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py
index 81cff0870e..c350c93c7e 100644
--- a/synapse/handlers/message.py
+++ b/synapse/handlers/message.py
@@ -235,7 +235,7 @@ class MessageHandler(BaseHandler):
                     room_id, max_topo
                 )
 
-            events, next_key = yield self.store.paginate_room_events(
+            events, next_key, extremities = yield self.store.paginate_room_events(
                 room_id=room_id,
                 from_key=source_config.from_key,
                 to_key=source_config.to_key,
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index b5850db42f..d627b6db13 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -534,7 +534,7 @@ class RoomEventSource(object):
 
     @defer.inlineCallbacks
     def get_pagination_rows(self, user, config, key):
-        events, next_key = yield self.store.paginate_room_events(
+        events, next_key, _ = yield self.store.paginate_room_events(
             room_id=key,
             from_key=config.from_key,
             to_key=config.to_key,