Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar

Remember to copy the avatar on room upgrades
2018-10-29 12:49:21 +00:00
parent 56ca578f77 5caf79b312
commit 7fbfea062e
2 changed files with 3 additions and 1 deletions
--- a/changelog.d/4100.feature
+++ b/changelog.d/4100.feature
@@ -0,0 +1 @@
+Support for replacing rooms with new ones
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -265,7 +265,8 @@ class RoomCreationHandler(BaseHandler):
            (EventTypes.Name, ""),
            (EventTypes.Topic, ""),
            (EventTypes.RoomHistoryVisibility, ""),
-            (EventTypes.GuestAccess, "")
+            (EventTypes.GuestAccess, ""),
+            (EventTypes.RoomAvatar, ""),
        )

        old_room_state_ids = yield self.store.get_filtered_current_state_ids(