diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2020-03-17 07:37:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-17 07:37:04 -0400 |
| commit | 60724c46b7dc5300243fd97d5a485564b3e00afe (patch) | |
| tree | a22f3e764cdaafa76d6414dd772ec64d8d279afc /synapse/handlers | |
| parent | Revert "Add options to disable setting profile info for prevent changes. (#70... (diff) | |
| download | synapse-60724c46b7dc5300243fd97d5a485564b3e00afe.tar.xz | |
Remove special casing of `m.room.aliases` events (#7034)
Diffstat (limited to 'synapse/handlers')
| -rw-r--r-- | synapse/handlers/room.py | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py index 8ee870f0bb..f580ab2e9f 100644 --- a/synapse/handlers/room.py +++ b/synapse/handlers/room.py @@ -292,16 +292,6 @@ class RoomCreationHandler(BaseHandler): except AuthError as e: logger.warning("Unable to update PLs in old room: %s", e) - new_pl_content = copy_power_levels_contents(old_room_pl_state.content) - - # pre-msc2260 rooms may not have the right setting for aliases. If no other - # value is set, set it now. - events_default = new_pl_content.get("events_default", 0) - new_pl_content.setdefault("events", {}).setdefault( - EventTypes.Aliases, events_default - ) - - logger.debug("Setting correct PLs in new room to %s", new_pl_content) yield self.event_creation_handler.create_and_send_nonmember_event( requester, { @@ -309,7 +299,7 @@ class RoomCreationHandler(BaseHandler): "state_key": "", "room_id": new_room_id, "sender": requester.user.to_string(), - "content": new_pl_content, + "content": old_room_pl_state.content, }, ratelimit=False, ) @@ -814,10 +804,6 @@ class RoomCreationHandler(BaseHandler): EventTypes.RoomHistoryVisibility: 100, EventTypes.CanonicalAlias: 50, EventTypes.RoomAvatar: 50, - # MSC2260: Allow everybody to send alias events by default - # This will be reudundant on pre-MSC2260 rooms, since the - # aliases event is special-cased. - EventTypes.Aliases: 0, EventTypes.Tombstone: 100, EventTypes.ServerACL: 100, }, |