summary refs log tree commit diff
path: root/synapse/federation
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-22 15:43:11 +0000
committerErik Johnston <erik@matrix.org>2019-02-25 15:04:46 +0000
commitbd398b874eb375e92939a087a64258a4feb91f49 (patch)
tree8b92730b60c1b15fc343dc6cab524a25103b2075 /synapse/federation
parentConfig option to prevent showing non-fed rooms in fed /publicRooms (diff)
downloadsynapse-bd398b874eb375e92939a087a64258a4feb91f49.tar.xz
Don't restrict non-fed rooms over client APIs
Diffstat (limited to 'synapse/federation')
-rw-r--r--synapse/federation/transport/server.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/federation/transport/server.py b/synapse/federation/transport/server.py
index 7288d49074..6d4a26f595 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -697,7 +697,8 @@ class PublicRoomList(BaseFederationServlet):
 
         data = yield self.handler.get_local_public_room_list(
             limit, since_token,
-            network_tuple=network_tuple
+            network_tuple=network_tuple,
+            from_federation=True,
         )
         defer.returnValue((200, data))