summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorAndrew Morgan <andrew@amorgan.xyz>2019-02-26 11:52:52 +0000
committerAndrew Morgan <andrew@amorgan.xyz>2019-02-26 11:52:52 +0000
commit6728bf39405c52e4f2473c1e19a7648134361c15 (patch)
treeed5dc38fb2e1e63833679f27a11a6ce2e97ed475 /synapse/config
parentResult may be None (diff)
downloadsynapse-6728bf39405c52e4f2473c1e19a7648134361c15.tar.xz
Make not showing non-federated rooms the default
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/room_directory.py12
1 files changed, 0 insertions, 12 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):