TudbuT/conduit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'Nyaaori/fix-whoami-appservices' into 'next'

Browse source 
Fix is_guest value on whoami for appservice users

Closes #310

See merge request famedly/conduit!401
This commit is contained in:
Timo Kösters 2022-10-15 11:32:49 +00:00
commit ed5b8d6a46
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/api/client_server/account.rs
View file

@ -338,7 +338,7 @@ pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3:
Ok(whoami::v3::Response { Ok(whoami::v3::Response {
user_id: sender_user.clone(), user_id: sender_user.clone(),
device_id, device_id,
is_guest: services().users.is_deactivated(sender_user)?, is_guest: services().users.is_deactivated(sender_user)? && !body.from_appservice,
}) })
} }