summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-10-26 23:56:40 +0100
committerRichard van der Hoff <richard@matrix.org>2018-10-26 23:56:40 +0100
commit5caf79b312947c823977c89275c1ea5750aeec92 (patch)
tree2522413277bcc070617202231f2ce5b12f7e05ec
parentoptimise state copying (diff)
downloadsynapse-5caf79b312947c823977c89275c1ea5750aeec92.tar.xz
Remember to copy the avatar on room upgrades
-rw-r--r--changelog.d/4100.feature1
-rw-r--r--synapse/handlers/room.py3
2 files changed, 3 insertions, 1 deletions
diff --git a/changelog.d/4100.feature b/changelog.d/4100.feature
new file mode 100644
index 0000000000..a3f7dbdcdd
--- /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 8e48c1ca6a..c59c02527c 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(