Merge pull request #4736 from matrix-org/anoa/public_rooms_federate

Config option to prevent showing non-fed rooms in fed /publicRooms

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