From 5cba4b126f7463cd3b2632f95f382f367a7aa406 Mon Sep 17 00:00:00 2001 From: timedout Date: Mon, 25 May 2026 19:44:40 +0100 Subject: [PATCH] style: Combine "unsupported version" checks --- src/api/client/room/upgrade.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/api/client/room/upgrade.rs b/src/api/client/room/upgrade.rs index 8ce753aff..aaa01add6 100644 --- a/src/api/client/room/upgrade.rs +++ b/src/api/client/room/upgrade.rs @@ -279,15 +279,12 @@ pub(crate) async fn upgrade_room_route( ) -> Result { let sender_user = body.sender_user(); - if !services.server.supported_room_version(&body.new_version) { - return Err(Error::BadRequest( - ErrorKind::UnsupportedRoomVersion, - "This server does not support that room version.", - )); - } - if !services.config.allow_unstable_room_versions - && UNSTABLE_ROOM_VERSIONS.contains(&body.new_version) - { + let (supported, forbid_unstable, is_unstable) = ( + services.server.supported_room_version(&body.new_version), + !services.config.allow_unstable_room_versions, + UNSTABLE_ROOM_VERSIONS.contains(&body.new_version), + ); + if !supported || (forbid_unstable && is_unstable) { return Err(Error::BadRequest( ErrorKind::UnsupportedRoomVersion, "This server does not support that room version.",