Merge branch 'main' into dima/fix-flight-position

phnx-im · Feb 6, 2025 · 99c5840 · 99c5840
2 parents b5a2e50 + f80d394
commit 99c5840
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/coreclient/src/clients/persistence.rs b/coreclient/src/clients/persistence.rs
@@ -167,7 +167,10 @@ impl ClientRecord {
     }
 
     pub(crate) fn delete(connection: &Connection, client_id: &AsClientId) -> rusqlite::Result<()> {
-        connection.execute("DELETE FROM client_record WHERE ?", params![client_id])?;
+        connection.execute(
+            "DELETE FROM client_record WHERE client_id = ?",
+            params![client_id],
+        )?;
         Ok(())
     }
 }

diff --git a/coreclient/src/groups/mod.rs b/coreclient/src/groups/mod.rs
@@ -57,7 +57,7 @@ use phnxtypes::{
 };
 use rusqlite::Connection;
 use serde::{Deserialize, Serialize};
-use tracing::{debug, error, info};
+use tracing::{debug, error};
 
 use crate::{
     clients::api_clients::ApiClients, contacts::ContactAddInfos,
@@ -803,8 +803,8 @@ impl Group {
                 .collect::<Vec<_>>();
             let infra_group_members = GroupMembership::group_members(connection, self.group_id())?;
             if mls_group_members.len() != infra_group_members.len() {
-                info!(?mls_group_members, "Group members according to OpenMLS");
-                info!(?infra_group_members, "Group members according to Infra");
+                tracing::info!(?mls_group_members, "Group members according to OpenMLS");
+                tracing::info!(?infra_group_members, "Group members according to Infra");
                 panic!("Group members don't match up");
             }
             let infra_indices =