summary refs log tree commit diff
path: root/synapse/rest/client
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-11-05 17:52:32 +0000
committerErik Johnston <erik@matrix.org>2015-11-05 17:52:32 +0000
commit6be1b4b113400053a82f8df992409f93356668a0 (patch)
tree5b17dc38334b96b8c884bfd7098c8d6bb1ccf4eb /synapse/rest/client
parentExchange 3pid invites for m.room.member invites (diff)
parentBe explicit about what we're doing (diff)
downloadsynapse-6be1b4b113400053a82f8df992409f93356668a0.tar.xz
Merge pull request #350 from matrix-org/erikj/search
Implement pagination, order by and groups in search
Diffstat (limited to 'synapse/rest/client')
-rw-r--r--synapse/rest/client/v1/room.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/rest/client/v1/room.py b/synapse/rest/client/v1/room.py
index 3628298376..6e0d93766b 100644
--- a/synapse/rest/client/v1/room.py
+++ b/synapse/rest/client/v1/room.py
@@ -600,7 +600,8 @@ class SearchRestServlet(ClientV1RestServlet):
 
         content = _parse_json(request)
 
-        results = yield self.handlers.search_handler.search(auth_user, content)
+        batch = request.args.get("next_batch", [None])[0]
+        results = yield self.handlers.search_handler.search(auth_user, content, batch)
 
         defer.returnValue((200, results))