From 5b8799e71f73ef6c90a4939b5a67a380d6cf7ce3 Mon Sep 17 00:00:00 2001 From: timedout Date: Sun, 24 May 2026 16:44:18 +0100 Subject: [PATCH] fix: Include `sender` in older room versions --- changelog.d/1807.bugfix.md | 1 + changelog.d/1807.feature.md | 1 + src/api/client/room/upgrade.rs | 6 +++--- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 changelog.d/1807.bugfix.md create mode 100644 changelog.d/1807.feature.md diff --git a/changelog.d/1807.bugfix.md b/changelog.d/1807.bugfix.md new file mode 100644 index 000000000..8eda6ea49 --- /dev/null +++ b/changelog.d/1807.bugfix.md @@ -0,0 +1 @@ +Fixed several bugs in the `POST /_matrix/client/v3/rooms/{roomId}/upgrade` endpoint. Contributed by @nex. diff --git a/changelog.d/1807.feature.md b/changelog.d/1807.feature.md new file mode 100644 index 000000000..42f219ed4 --- /dev/null +++ b/changelog.d/1807.feature.md @@ -0,0 +1 @@ +Added full support for [MSC4168: Update `m.space.*` state on room upgrade](https://github.com/matrix-org/matrix-spec-proposals/pull/4168). Contributed by @nex. diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index 187a04d82..d3dc72a55 100644 --- a/src/api/client/room/upgrade.rs +++ b/src/api/client/room/upgrade.rs @@ -308,13 +308,13 @@ pub(crate) async fn upgrade_room_route( body.additional_creators.clone() } else { Vec::new() }, creator: if new_version_rules.authorization.use_room_create_sender { - Some(sender_user.to_owned()) - } else { None }, + None + } else { Some(sender_user.to_owned()) }, predecessor: Some(assign!(PreviousRoom::new(body.room_id.clone()), { event_id: last_event, })), - room_version: body.new_version.clone(), room_type: old_create_event.room_type.clone(), + room_version: body.new_version.clone(), } ) };