diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-10-29 12:49:21 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-29 12:49:21 +0000 |
| commit | 7fbfea062ebb11576e59aa9bdd200826efe8883d (patch) | |
| tree | 64912a3d46f5fd018346be2054ea9fc9950c1e86 | |
| parent | Merge pull request #4099 from matrix-org/rav/upgrade_odd_pls (diff) | |
| parent | Remember to copy the avatar on room upgrades (diff) | |
| download | synapse-7fbfea062ebb11576e59aa9bdd200826efe8883d.tar.xz | |
Merge pull request #4100 from matrix-org/rav/room_upgrade_avatar
Remember to copy the avatar on room upgrades
| -rw-r--r-- | changelog.d/4100.feature | 1 | ||||
| -rw-r--r-- | synapse/handlers/room.py | 3 |
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 70085db625..1d9417ff1a 100644 --- 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( |