From 566833111c2b18055320989845d17c72c3420675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20K=C3=B6sters?= <timo@koesters.xyz>
Date: Wed, 6 Apr 2022 18:49:46 +0200
Subject: [PATCH] refactor: small improvements

---
 src/client_server/account.rs | 9 ++++++---
 src/client_server/report.rs  | 2 +-
 src/database/uiaa.rs         | 4 ++--
 src/server_server.rs         | 9 +++++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/client_server/account.rs b/src/client_server/account.rs
index 4c2dff9f..fcdf5514 100644
--- a/src/client_server/account.rs
+++ b/src/client_server/account.rs
@@ -340,14 +340,17 @@ pub async fn change_password_route(
 /// Get user_id of the sender user.
 ///
 /// Note: Also works for Application Services
-pub async fn whoami_route(body: Ruma<whoami::v3::Request>) -> Result<whoami::v3::Response> {
+pub async fn whoami_route(
+    db: DatabaseGuard,
+    body: Ruma<whoami::v3::Request>,
+) -> Result<whoami::v3::Response> {
     let sender_user = body.sender_user.as_ref().expect("user is authenticated");
     let device_id = body.sender_device.as_ref().cloned();
-    let is_guest = device_id.is_none();
+
     Ok(whoami::v3::Response {
         user_id: sender_user.clone(),
         device_id,
-        is_guest,
+        is_guest: db.users.is_deactivated(&sender_user)?,
     })
 }
 
diff --git a/src/client_server/report.rs b/src/client_server/report.rs
index 8c51e9ca..e60da692 100644
--- a/src/client_server/report.rs
+++ b/src/client_server/report.rs
@@ -62,7 +62,7 @@ pub async fn report_event_route(
                 pdu.room_id,
                 pdu.sender,
                 body.score,
-                HtmlEscape(&body.reason.clone().unwrap_or(String::new()))
+                HtmlEscape(body.reason.as_deref().unwrap_or(""))
             ),
         ));
 
diff --git a/src/database/uiaa.rs b/src/database/uiaa.rs
index 2c610649..12373139 100644
--- a/src/database/uiaa.rs
+++ b/src/database/uiaa.rs
@@ -8,8 +8,8 @@ use ruma::{
     api::client::{
         error::ErrorKind,
         uiaa::{
-            AuthType, IncomingAuthData, IncomingPassword, IncomingUserIdentifier::UserIdOrLocalpart,
-            UiaaInfo,
+            AuthType, IncomingAuthData, IncomingPassword,
+            IncomingUserIdentifier::UserIdOrLocalpart, UiaaInfo,
         },
     },
     signatures::CanonicalJsonValue,
diff --git a/src/server_server.rs b/src/server_server.rs
index 56f5b9df..d68ded82 100644
--- a/src/server_server.rs
+++ b/src/server_server.rs
@@ -2991,6 +2991,11 @@ pub async fn get_devices_route(
         return Err(Error::bad_config("Federation is disabled."));
     }
 
+    let sender_servername = body
+        .sender_servername
+        .as_ref()
+        .expect("server is authenticated");
+
     Ok(get_devices::v1::Response {
         user_id: body.user_id.clone(),
         stream_id: db
@@ -3016,10 +3021,10 @@ pub async fn get_devices_route(
             .collect(),
         master_key: db
             .users
-            .get_master_key(&body.user_id, |u| u == &body.user_id)?,
+            .get_master_key(&body.user_id, |u| u.server_name() == sender_servername)?,
         self_signing_key: db
             .users
-            .get_self_signing_key(&body.user_id, |u| u == &body.user_id)?,
+            .get_self_signing_key(&body.user_id, |u| u.server_name() == sender_servername)?,
     })
 }