From e2f908a9de637512d151c0e49ddad8966da9ca3e Mon Sep 17 00:00:00 2001
From: ErrorNoInternet <errornointernet@envs.net>
Date: Sun, 16 Mar 2025 04:16:49 -0400
Subject: [PATCH] refactor(matrix): clean up a few messages

---
 src/matrix/mod.rs          |  2 +-
 src/matrix/verification.rs | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/matrix/mod.rs b/src/matrix/mod.rs
index 7680dd5..cd974ad 100644
--- a/src/matrix/mod.rs
+++ b/src/matrix/mod.rs
@@ -55,7 +55,7 @@ pub async fn login(
     if !fs::try_exists(&root_dir).await.unwrap_or_default()
         && let Err(error) = fs::create_dir_all(&root_dir).await
     {
-        warn!("failed to create directory for matrix sqlite3 store: {error:?}");
+        warn!("failed to create directory for matrix sqlite store: {error:?}");
     } else {
         builder = builder.sqlite_store(&root_dir, None);
     }
diff --git a/src/matrix/verification.rs b/src/matrix/verification.rs
index 8c7feaf..03fea11 100644
--- a/src/matrix/verification.rs
+++ b/src/matrix/verification.rs
@@ -30,16 +30,14 @@ async fn confirm_emojis(sas: SasVerification, emoji: [Emoji; 7]) {
 async fn print_devices(user_id: &UserId, client: &Client) -> Result<()> {
     info!("devices of user {user_id}");
 
+    let own_id = client.device_id().context("missing own device id")?;
     for device in client
         .encryption()
         .get_user_devices(user_id)
         .await?
         .devices()
+        .filter(|device| device.device_id() != own_id)
     {
-        if device.device_id() == client.device_id().context("missing device id")? {
-            continue;
-        }
-
         info!(
             "\t{:<10} {:<30} {:<}",
             device.device_id(),
@@ -68,13 +66,13 @@ async fn sas_verification_handler(client: Client, sas: SasVerification) -> Resul
             } => {
                 tokio::spawn(confirm_emojis(
                     sas.clone(),
-                    emojis.context("only emojis supported")?.emojis,
+                    emojis.context("only emoji verification supported")?.emojis,
                 ));
             }
             SasState::Done { .. } => {
                 let device = sas.other_device();
                 info!(
-                    "successfully verified device {} {} trust {:?}",
+                    "successfully verified device {} {} with trust {:?}",
                     device.user_id(),
                     device.device_id(),
                     device.local_trust_state()