diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-02-20 16:24:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-20 16:24:04 -0500 |
| commit | 99eed85a77acdc25b68f4a7b6447a5ffaecebb0d (patch) | |
| tree | 2b69e1b3a8add0ecd5ad32bff2bc6588eeab66d9 /synapse/handlers/directory.py | |
| parent | don't insert into the device table for remote cross-signing keys (#6956) (diff) | |
| download | synapse-99eed85a77acdc25b68f4a7b6447a5ffaecebb0d.tar.xz | |
Do not send alias events when creating / upgrading a room (#6941)
Stop emitting room alias update events during room creation/upgrade.
Diffstat (limited to 'synapse/handlers/directory.py')
| -rw-r--r-- | synapse/handlers/directory.py | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/synapse/handlers/directory.py b/synapse/handlers/directory.py index db2104c5f6..921d887b24 100644 --- a/synapse/handlers/directory.py +++ b/synapse/handlers/directory.py @@ -14,6 +14,7 @@ # limitations under the License. +import collections import logging import string from typing import List @@ -283,22 +284,6 @@ class DirectoryHandler(BaseHandler): ) @defer.inlineCallbacks - def send_room_alias_update_event(self, requester, room_id): - aliases = yield self.store.get_aliases_for_room(room_id) - - yield self.event_creation_handler.create_and_send_nonmember_event( - requester, - { - "type": EventTypes.Aliases, - "state_key": self.hs.hostname, - "room_id": room_id, - "sender": requester.user.to_string(), - "content": {"aliases": aliases}, - }, - ratelimit=False, - ) - - @defer.inlineCallbacks def _update_canonical_alias(self, requester, user_id, room_id, room_alias): """ Send an updated canonical alias event if the removed alias was set as @@ -326,7 +311,7 @@ class DirectoryHandler(BaseHandler): alt_aliases = content.pop("alt_aliases", None) # If the aliases are not a list (or not found) do not attempt to modify # the list. - if isinstance(alt_aliases, list): + if isinstance(alt_aliases, collections.Sequence): send_update = True alt_aliases = [alias for alias in alt_aliases if alias != alias_str] if alt_aliases: |