summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-09-15 10:36:19 +0100
committerErik Johnston <erik@matrix.org>2016-09-15 10:36:19 +0100
commit5810cffd335f96ac448497e7caf46c5cbf29d6a8 (patch)
treebd9edc96cb470204d1e9245512bacf2ef6430766 /synapse/rest
parentAllow paginating both forwards and backwards (diff)
downloadsynapse-5810cffd335f96ac448497e7caf46c5cbf29d6a8.tar.xz
Pass since/from parameters over federation
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/client/v1/room.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py

index 00b7738e0b..db0cd4380a 100644 --- a/synapse/rest/client/v1/room.py +++ b/synapse/rest/client/v1/room.py
@@ -320,19 +320,19 @@ class PublicRoomListRestServlet(ClientV1RestServlet): pass limit = parse_integer(request, "limit", 0) - next_batch = parse_string(request, "since", None) + since_token = parse_string(request, "since", None) handler = self.hs.get_room_list_handler() if server: data = yield handler.get_remote_public_room_list( server, limit=limit, - next_batch=next_batch, + since_token=since_token, ) else: data = yield handler.get_local_public_room_list( limit=limit, - next_batch=next_batch, + since_token=since_token, ) defer.returnValue((200, data))