1 files changed, 99 insertions, 6 deletions

diff --git a/filamento/src/db.rs b/filamento/src/db.rs
index c19f16c..cdc7520 100644
--- a/filamento/src/db.rs
+++ b/filamento/src/db.rs
@@ -75,16 +75,107 @@ impl Db {
         Ok(user)
     }
 
-    pub(crate) async fn upsert_user_nick(&self, jid: JID, nick: String) -> Result<(), Error> {
-        sqlx::query!(
+    /// returns whether or not the nickname was updated
+    pub(crate) async fn delete_user_nick(&self, jid: JID) -> Result<bool, Error> {
+        if sqlx::query!(
+            "insert into users (jid, nick) values (?, ?) on conflict do update set nick = ?",
+            jid,
+            None::<String>,
+            None::<String>,
+        )
+        .execute(&self.db)
+        .await?
+        .rows_affected()
+            > 0
+        {
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    /// returns whether or not the nickname was updated
+    pub(crate) async fn upsert_user_nick(&self, jid: JID, nick: String) -> Result<bool, Error> {
+        if sqlx::query!(
             "insert into users (jid, nick) values (?, ?) on conflict do update set nick = ?",
             jid,
             nick,
             nick
         )
         .execute(&self.db)
-        .await?;
-        Ok(())
+        .await?
+        .rows_affected()
+            > 0
+        {
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    }
+
+    /// returns whether or not the avatar was updated, and the file to delete if there existed an old avatar
+    pub(crate) async fn delete_user_avatar(
+        &self,
+        jid: JID,
+    ) -> Result<(bool, Option<String>), Error> {
+        #[derive(sqlx::FromRow)]
+        struct AvatarRow {
+            avatar: Option<String>,
+        }
+        let old_avatar: Option<String> = sqlx::query_as("select avatar from users where jid = ?")
+            .bind(jid.clone())
+            .fetch_optional(&self.db)
+            .await?
+            .map(|row: AvatarRow| row.avatar)
+            .unwrap_or(None);
+        if sqlx::query!(
+            "insert into users (jid, avatar) values (?, ?) on conflict do update set avatar = ?",
+            jid,
+            None::<String>,
+            None::<String>,
+        )
+        .execute(&self.db)
+        .await?
+        .rows_affected()
+            > 0
+        {
+            Ok((true, old_avatar))
+        } else {
+            Ok((false, old_avatar))
+        }
+    }
+
+    /// returns whether or not the avatar was updated, and the file to delete if there existed an old avatar
+    pub(crate) async fn upsert_user_avatar(
+        &self,
+        jid: JID,
+        avatar: String,
+    ) -> Result<(bool, Option<String>), Error> {
+        #[derive(sqlx::FromRow)]
+        struct AvatarRow {
+            avatar: Option<String>,
+        }
+        let old_avatar: Option<String> = sqlx::query_as("select avatar from users where jid = ?")
+            .bind(jid.clone())
+            .fetch_optional(&self.db)
+            .await?
+            .map(|row: AvatarRow| row.avatar)
+            .unwrap_or(None);
+        if sqlx::query!(
+            "insert into users (jid, avatar) values (?, ?) on conflict do update set avatar = ?",
+            jid,
+            avatar,
+            avatar
+        )
+        .execute(&self.db)
+        .await?
+        .rows_affected()
+            > 0
+        {
+            Ok((true, old_avatar))
+        } else {
+            Ok((false, old_avatar))
+        }
     }
 
     pub(crate) async fn update_user(&self, user: User) -> Result<(), Error> {
@@ -441,12 +532,14 @@ impl Db {
         .execute(&self.db)
         .await?;
         let id = Uuid::new_v4();
-        let chat: Chat = sqlx::query_as("insert into chats (id, correspondent, have_chatted) values (?, ?, ?) on conflict do nothing returning *")
+        let chat: Chat = sqlx::query_as("insert into chats (id, correspondent, have_chatted) values (?, ?, ?) on conflict do nothing; select * from chats where correspondent = ?")
             .bind(id)
-            .bind(bare_chat)
+            .bind(bare_chat.clone())
             .bind(false)
+            .bind(bare_chat)
             .fetch_one(&self.db)
             .await?;
+        tracing::debug!("CHECKING chat: {:?}", chat);
         Ok(chat.have_chatted)
     }