mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-11-29 15:39:00 +03:00
Code Issues Projects Releases Packages Wiki Activity

Only fetch aliases when publishing rooms

Browse source
This commit is contained in:
Erik Johnston 2019-02-14 18:08:09 +00:00
parent f666fe36d7
commit f61b2068e6
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
synapse/handlers/directory.py
View file

@ -417,22 +417,22 @@ class DirectoryHandler(BaseHandler):
yield self.auth.check_can_change_room_list(room_id, requester.user) yield self.auth.check_can_change_room_list(room_id, requester.user)
room_aliases = yield self.store.get_aliases_for_room(room_id)
canonical_alias = yield self.store.get_canonical_alias_for_room(room_id)
if canonical_alias:
room_aliases.append(canonical_alias)
making_public = visibility == "public" making_public = visibility == "public"
if making_public:
room_aliases = yield self.store.get_aliases_for_room(room_id)
canonical_alias = yield self.store.get_canonical_alias_for_room(room_id)
if canonical_alias:
room_aliases.append(canonical_alias)
if making_public and not self.config.is_publishing_room_allowed( if not self.config.is_publishing_room_allowed(
user_id, room_id, room_aliases, user_id, room_id, room_aliases,
): ):
# Lets just return a generic message, as there may be all sorts of # Lets just return a generic message, as there may be all sorts of
# reasons why we said no. TODO: Allow configurable error messages # reasons why we said no. TODO: Allow configurable error messages
# per alias creation rule? # per alias creation rule?
raise SynapseError( raise SynapseError(
403, "Not allowed to publish room", 403, "Not allowed to publish room",
) )
yield self.store.set_room_is_public(room_id, making_public) yield self.store.set_room_is_public(room_id, making_public)