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

Remember to copy the avatar on room upgrades
This commit is contained in:
Richard van der Hoff 2018-10-29 12:49:21 +00:00 committed by GitHub
commit 7fbfea062e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions

1
changelog.d/4100.feature Normal file
View file

@ -0,0 +1 @@
Support for replacing rooms with new ones

View file

@ -265,7 +265,8 @@ class RoomCreationHandler(BaseHandler):
(EventTypes.Name, ""), (EventTypes.Name, ""),
(EventTypes.Topic, ""), (EventTypes.Topic, ""),
(EventTypes.RoomHistoryVisibility, ""), (EventTypes.RoomHistoryVisibility, ""),
(EventTypes.GuestAccess, "") (EventTypes.GuestAccess, ""),
(EventTypes.RoomAvatar, ""),
) )
old_room_state_ids = yield self.store.get_filtered_current_state_ids( old_room_state_ids = yield self.store.get_filtered_current_state_ids(