Depublish a room from the public rooms list when it is upgraded (#6232)

* commit 'ace947e8d':
  Depublish a room from the public rooms list when it is upgraded (#6232)

1 files changed, 7 insertions, 1 deletions

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 22d46c353e..8464d220a4 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -131,6 +131,7 @@ class RoomCreationHandler(BaseHandler):
             old_room_id,
             new_version,  # args for _upgrade_room
         )
+
         return ret
 
     @defer.inlineCallbacks
@@ -191,7 +192,12 @@ class RoomCreationHandler(BaseHandler):
             requester, old_room_id, new_room_id, old_room_state
         )
 
-        # and finally, shut down the PLs in the old room, and update them in the new
+        # Copy over user push rules, tags and migrate room directory state
+        yield self.room_member_handler.transfer_room_state_on_room_upgrade(
+            old_room_id, new_room_id
+        )
+
+        # finally, shut down the PLs in the old room, and update them in the new
         # room.
         yield self._update_upgraded_room_pls(
             requester, old_room_id, new_room_id, old_room_state