summary refs log tree commit diff
path: root/synapse/handlers/room_member.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2020-04-24 14:07:47 +0100
committerRichard van der Hoff <richard@matrix.org>2020-04-24 14:07:47 +0100
commit649e48a7991b79891412ca2c745fbbaa1301ba23 (patch)
tree253690c648b7c9ec4f885ddfc342168c80d674f6 /synapse/handlers/room_member.py
parentMerge branch 'release-v1.12.4' into matrix-org-hotfixes (diff)
parentMerge pull request #7337 from matrix-org/rav/fix_update_limit_assertion (diff)
downloadsynapse-649e48a7991b79891412ca2c745fbbaa1301ba23.tar.xz
Merge branch 'develop' into matrix-org-hotfixes
Diffstat (limited to 'synapse/handlers/room_member.py')
-rw-r--r--synapse/handlers/room_member.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/synapse/handlers/room_member.py b/synapse/handlers/room_member.py
index 597ead8653..54a1f02f58 100644
--- a/synapse/handlers/room_member.py
+++ b/synapse/handlers/room_member.py
@@ -539,6 +539,9 @@ class RoomMemberHandler(object):
             yield self.store.set_room_is_public(old_room_id, False)
             yield self.store.set_room_is_public(room_id, True)
 
+        # Transfer alias mappings in the room directory
+        yield self.store.update_aliases_for_room(old_room_id, room_id)
+
         # Check if any groups we own contain the predecessor room
         local_group_ids = yield self.store.get_local_groups_for_room(old_room_id)
         for group_id in local_group_ids: