style: Clean up whoami code

This commit is contained in:
timedout
2026-01-09 01:12:38 +00:00
parent fb536ca1ce
commit 5a2a1b6240
+6 -5
View File
@@ -733,16 +733,17 @@ pub(crate) async fn whoami_route(
State(services): State<crate::State>, State(services): State<crate::State>,
body: Ruma<whoami::v3::Request>, body: Ruma<whoami::v3::Request>,
) -> Result<whoami::v3::Response> { ) -> Result<whoami::v3::Response> {
Ok(whoami::v3::Response { let is_guest = services
user_id: body.sender_user().to_owned(),
device_id: body.sender_device.clone(),
is_guest: services
.users .users
.is_deactivated(body.sender_user()) .is_deactivated(body.sender_user())
.await .await
.map_err(|_| { .map_err(|_| {
err!(Request(Forbidden("Application service has not registered this user."))) err!(Request(Forbidden("Application service has not registered this user.")))
})? && body.appservice_info.is_none(), })? && body.appservice_info.is_none();
Ok(whoami::v3::Response {
user_id: body.sender_user().to_owned(),
device_id: body.sender_device.clone(),
is_guest,
}) })
} }