OpenCloud
/
MatrixSynapse
mirror of https://github.com/matrix-org/synapse
1
0
Fork 0
Code Issues Releases Wiki Activity

Make not showing non-federated rooms the default

pull/4736/head
Andrew Morgan 2019-02-26 11:52:52 +00:00
parent 6946c20111
commit 6728bf3940
2 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
synapse/config/room_directory.py
View File

@ -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): def default_config(self, config_dir_path, server_name, **kwargs):
return """ return """
# The `alias_creation` option controls who's allowed to create aliases # The `alias_creation` option controls who's allowed to create aliases
@ -114,14 +110,6 @@ class RoomDirectoryConfig(Config):
# alias: "*" # alias: "*"
# room_id: "*" # room_id: "*"
# action: allow # 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): def is_alias_creation_allowed(self, user_id, room_id, alias):

2
synapse/handlers/room_list.py
View File

@ -328,7 +328,7 @@ class RoomListHandler(BaseHandler):
result = yield self.generate_room_entry(room_id, num_joined_users) 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: if not result or result["m.federate"] is False:
# This is a non-federating room and the config has chosen not # This is a non-federating room and the config has chosen not
# to show these rooms to other servers # to show these rooms to other servers