From f0656a3b06f74e826e3a0829cba6b36b2de637f2 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Mon, 11 Aug 2025 16:45:40 +0100
Subject: [PATCH] Update impl of `_calculate_upgraded_room_creation_content`

---
 synapse/handlers/room.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8b3377b39..5b7514243 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -529,6 +529,7 @@ class RoomCreationHandler:
         old_room_create_event: EventBase,
         tombstone_event_id: Optional[str],
         new_room_version: RoomVersion,
+        additional_creators: Optional[List[str]],
     ) -> JsonDict:
         creation_content: JsonDict = {
             "room_version": new_room_version.identifier,
@@ -538,6 +539,11 @@ class RoomCreationHandler:
         }
         if tombstone_event_id is not None:
             creation_content["predecessor"]["event_id"] = tombstone_event_id
+        if (
+            additional_creators is not None
+            and new_room_version.msc4289_creator_power_enabled
+        ):
+            creation_content["additional_creators"] = additional_creators
         # Check if old room was non-federatable
         if not old_room_create_event.content.get(EventContentFields.FEDERATE, True):
             # If so, mark the new room as non-federatable as well