From 5caf79b312947c823977c89275c1ea5750aeec92 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Fri, 26 Oct 2018 23:56:40 +0100
Subject: [PATCH] Remember to copy the avatar on room upgrades

---
 changelog.d/4100.feature | 1 +
 synapse/handlers/room.py | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 100644 changelog.d/4100.feature

diff --git a/changelog.d/4100.feature b/changelog.d/4100.feature
new file mode 100644
index 000000000..a3f7dbdcd
--- /dev/null
+++ b/changelog.d/4100.feature
@@ -0,0 +1 @@
+Support for replacing rooms with new ones
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8e48c1ca6..c59c02527 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -228,7 +228,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(