mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-09 13:21:55 +00:00
Make not showing non-federated rooms the default
This commit is contained in:
parent
6946c20111
commit
6728bf3940
@ -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):
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user