From 6a6f77a10095ae7920a597f49d87bd0e39f8a95c Mon Sep 17 00:00:00 2001 From: dasha_uwu <> Date: Mon, 11 Aug 2025 09:59:15 +0000 Subject: [PATCH] Simplify feature condition. Signed-off-by: Jason Volk --- src/service/uiaa/mod.rs | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/service/uiaa/mod.rs b/src/service/uiaa/mod.rs index c80e083d..0dfb8925 100644 --- a/src/service/uiaa/mod.rs +++ b/src/service/uiaa/mod.rs @@ -125,27 +125,17 @@ pub async fn try_auth( match auth { // Find out what the user completed - | AuthData::Password(Password { - identifier, - password, - #[cfg(feature = "element_hacks")] - user, - .. - }) => { - #[cfg(feature = "element_hacks")] + | AuthData::Password(Password { identifier, password, user, .. }) => { let username = if let Some(UserIdentifier::UserIdOrLocalpart(username)) = identifier { username - } else if let Some(username) = user { + } else if cfg!(feature = "element_hacks") + && let Some(username) = user + { username } else { return Err!(Request(Unrecognized("Identifier type not recognized."))); }; - #[cfg(not(feature = "element_hacks"))] - let Some(UserIdentifier::UserIdOrLocalpart(username)) = identifier else { - return Err!(Request(Unrecognized("Identifier type not recognized."))); - }; - let user_id_from_username = UserId::parse_with_server_name( username.clone(), self.services.globals.server_name(),