summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-22 12:11:43 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-26 13:37:24 +0000
commit7a4632af9c4a26604b9d30f69eb81cb4630a82e7 (patch)
tree7edac860e2ac73df4a093486f53ddaea7bfc6b08 /synapse/federation/transport/server.py
parentMerge branch 'release-v0.33.8' (diff)
downloadsynapse-7a4632af9c4a26604b9d30f69eb81cb4630a82e7.tar.xz
Prevent showing non-fed rooms in fed /publicRooms
Diffstat (limited to 'synapse/federation/transport/server.py')
-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))