summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-07-17 15:50:29 +0100
committerOlivier Wilkinson (reivilibre) <olivier@librepush.net>2019-08-30 16:49:12 +0100
commitd5cc8b3e51738ccbfc187405f8d0f964b05d4869 (patch)
treebadf8b8d78c3cc1009b971dc54337667d956da2f /synapse/federation
parent Remove unnecessary parentheses around return statements (#5931) (diff)
downloadsynapse-d5cc8b3e51738ccbfc187405f8d0f964b05d4869.tar.xz
Use room_stats and room_state for room directory search
Signed-off-by: Olivier Wilkinson (reivilibre) <olivier@librepush.net>
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/server.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index f9930b6460..e35141c548 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -761,6 +761,10 @@ class PublicRoomList(BaseFederationServlet):
         else:
             network_tuple = ThirdPartyInstanceID(None, None)
 
+        if limit == 0:
+            # zero is a special value which corresponds to no limit.
+            limit = None
+
         data = await maybeDeferred(
             self.handler.get_local_public_room_list,
             limit,
@@ -796,6 +800,10 @@ class PublicRoomList(BaseFederationServlet):
         if search_filter is None:
             logger.warning("Nonefilter")
 
+        if limit == 0:
+            # zero is a special value which corresponds to no limit.
+            limit = None
+
         data = await self.handler.get_local_public_room_list(
             limit=limit,
             since_token=since_token,