Mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2026-05-26 20:49:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

style: Combine "unsupported version" checks

Browse Source
This commit is contained in:
timedout
2026-05-25 19:44:40 +01:00
parent d8a7f7c7ca
commit 5cba4b126f
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/client/room/upgrade.rs
+6 -9
View File
@@ -279,15 +279,12 @@ pub(crate) async fn upgrade_room_route(
) -> Result<upgrade_room::v3::Response> { ) -> Result<upgrade_room::v3::Response> {
let sender_user = body.sender_user(); let sender_user = body.sender_user();
if !services.server.supported_room_version(&body.new_version) { let (supported, forbid_unstable, is_unstable) = (
return Err(Error::BadRequest( services.server.supported_room_version(&body.new_version),
ErrorKind::UnsupportedRoomVersion, !services.config.allow_unstable_room_versions,
"This server does not support that room version.", UNSTABLE_ROOM_VERSIONS.contains(&body.new_version),
)); );
} if !supported || (forbid_unstable && is_unstable) {
if !services.config.allow_unstable_room_versions
&& UNSTABLE_ROOM_VERSIONS.contains(&body.new_version)
{
return Err(Error::BadRequest( return Err(Error::BadRequest(
ErrorKind::UnsupportedRoomVersion, ErrorKind::UnsupportedRoomVersion,
"This server does not support that room version.", "This server does not support that room version.",