Make not showing non-federated rooms the default

2 files changed, 1 insertions, 13 deletions

diff --git a/synapse/config/room_directory.py b/synapse/config/room_directory.py

index 3322cf2eea..9b897abe3c 100644
--- a/synapse/config/room_directory.py
+++ b/synapse/config/room_directory.py
@@ -52,10 +52,6 @@ class RoomDirectoryConfig(Config):
                 )
             ]
 
-        self.allow_non_federated_in_public_rooms = config.get(
-            "allow_non_federated_in_public_rooms", True,
-        )
-
     def default_config(self, config_dir_path, server_name, **kwargs):
         return """
         # The `alias_creation` option controls who's allowed to create aliases
@@ -114,14 +110,6 @@ class RoomDirectoryConfig(Config):
         #    alias: "*"
         #    room_id: "*"
         #    action: allow
-
-        # Specify whether rooms that only allow local users to join should be
-        # shown in the federation public room directory.
-        #
-        # Note that this does not affect the room directory shown to users on
-        # this homeserver, only those on other homeservers.
-        #
-        #allow_non_federated_in_public_rooms: True
         """
 
     def is_alias_creation_allowed(self, user_id, room_id, alias):
diff --git a/synapse/handlers/room_list.py b/synapse/handlers/room_list.py

index 7c21f142a0..f1a51a7ca9 100644
--- a/synapse/handlers/room_list.py
+++ b/synapse/handlers/room_list.py
@@ -328,7 +328,7 @@ class RoomListHandler(BaseHandler):
 
         result = yield self.generate_room_entry(room_id, num_joined_users)
 
-        if from_federation and not self.config.allow_non_federated_in_public_rooms:
+        if from_federation:
             if not result or result["m.federate"] is False:
                 # This is a non-federating room and the config has chosen not
                 # to show these rooms to other servers