summary refs log tree commit diff
path: root/synapse/federation/transport/server.py
diff options
context:
space:
mode:
authorAndrew Morgan <1342360+anoadragon453@users.noreply.github.com>2019-02-26 13:07:15 +0000
committerGitHub <noreply@github.com>2019-02-26 13:07:15 +0000
commita1a6473293141cf3356bcedc49c1262146976233 (patch)
tree205eb39ac6f53c624002da7c43274b0e5e7273cb /synapse/federation/transport/server.py
parentDon't log stack trace when client has gone away during media download (#4738) (diff)
parentCleaner chunk logic (diff)
downloadsynapse-a1a6473293141cf3356bcedc49c1262146976233.tar.xz
Merge pull request #4736 from matrix-org/anoa/public_rooms_federate
Config option to 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 a2396ab466..5ba94be2ec 100644
--- a/synapse/federation/transport/server.py
+++ b/synapse/federation/transport/server.py
@@ -736,7 +736,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))