Implement MSC 3818

Resolves: #11896 Signed-off-by: Aminda Suomalainen <[email protected]>
matrix-org · May 18, 2022 · 2901741 · 2901741
1 parent 50ae4ea
commit 2901741
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/changelog.d/12786.feature b/changelog.d/12786.feature
@@ -0,0 +1 @@
+Implement [MSC 3818: Copy room type on upgrade](https://github.com/matrix-org/matrix-spec-proposals/pull/3818).
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
@@ -469,13 +469,19 @@ 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.
+        if (
+            old_room_create_event.content.get(EventContentFields.ROOM_TYPE)
+            is not None
+        ):
+            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(