Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Implement MSC3818: copy room type on upgrade #12786

Merged
merged 4 commits into from
May 19, 2022
Merged

Implement MSC3818: copy room type on upgrade #12786

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ae17632
Implement MSC 3818
Mikaela May 18, 2022
24b56d7
feedback from review
Mikaela May 19, 2022
743fdbe
Update changelog.d/12786.feature
Mikaela May 19, 2022
0835b6d
oops
Mikaela May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/12786.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Implement [MSC 3818: Copy room type on upgrade](https://github.com/matrix-org/matrix-spec-proposals/pull/3818).
Mikaela marked this conversation as resolved.
Show resolved Hide resolved
10 changes: 7 additions & 3 deletions synapse/handlers/room.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,13 +469,17 @@ async def clone_existing_room(
(EventTypes.PowerLevels, ""),
]

# If the old room was a space, copy over the room type and the rooms in
# the space.
# Copy the room type as per MSC3818 https://github.com/matrix-org/matrix-spec-proposals/pull/3818.
Mikaela marked this conversation as resolved.
Show resolved Hide resolved
if old_room_create_event.content.get(EventContentFields.ROOM_TYPE) is not None:
Mikaela marked this conversation as resolved.
Show resolved Hide resolved
creation_content[
EventContentFields.ROOM_TYPE
] = old_room_create_event.content.get(EventContentFields.ROOM_TYPE)

# If the old room was a space, copy over the rooms in the space.
if (
old_room_create_event.content.get(EventContentFields.ROOM_TYPE)
== RoomTypes.SPACE
):
creation_content[EventContentFields.ROOM_TYPE] = RoomTypes.SPACE
types_to_copy.append((EventTypes.SpaceChild, None))

old_room_state_ids = await self.store.get_filtered_current_state_ids(
Expand Down