Merge pull request #350 from matrix-org/erikj/search

Implement pagination, order by and groups in search
This commit is contained in:
Erik Johnston 2015-11-05 17:52:32 +00:00
commit 6be1b4b113
3 changed files with 288 additions and 36 deletions

View file

@ -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))