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

Fix is_guest value on whoami for appservice users

Closes #310

See merge request famedly/conduit!401

src/api/client_server/account.rs

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