first attempt at trying to keep track of locally send id

core/kordophone-db/migrations/2025-09-12-000001_add_message_aliases/down.sql

@@ -0,0 +1,3 @@
+-- Drop the alias mapping table
+DROP TABLE IF EXISTS `message_aliases`;
+

core/kordophone-db/migrations/2025-09-12-000001_add_message_aliases/up.sql

@@ -0,0 +1,7 @@
+-- Add table to map local (client) IDs to server message GUIDs
+CREATE TABLE IF NOT EXISTS `message_aliases` (
+    `local_id` TEXT NOT NULL PRIMARY KEY,
+    `server_id` TEXT NOT NULL UNIQUE,
+    `conversation_id` TEXT NOT NULL
+);
+

core/kordophone-db/src/repository.rs

@@ -307,8 +307,11 @@ impl<'a> Repository<'a> {
     }
 
     pub fn delete_all_messages(&mut self) -> Result<()> {
-        use crate::schema::messages::dsl::*;
-        diesel::delete(messages).execute(self.connection)?;
+        use crate::schema::messages::dsl as messages_dsl;
+        use crate::schema::message_aliases::dsl as aliases_dsl;
+
+        diesel::delete(messages_dsl::messages).execute(self.connection)?;
+        diesel::delete(aliases_dsl::message_aliases).execute(self.connection)?;
         Ok(())
     }
 
@@ -359,6 +362,57 @@ impl<'a> Repository<'a> {
         )
     }
 
+    /// Create or update an alias mapping between a local (client) message id and a server message id.
+    pub fn set_message_alias(
+        &mut self,
+        local_id_in: &str,
+        server_id_in: &str,
+        conversation_id_in: &str,
+    ) -> Result<()> {
+        use crate::schema::message_aliases::dsl::*;
+        diesel::replace_into(message_aliases)
+            .values((
+                local_id.eq(local_id_in),
+                server_id.eq(server_id_in),
+                conversation_id.eq(conversation_id_in),
+            ))
+            .execute(self.connection)?;
+        Ok(())
+    }
+
+    /// Returns the local id for a given server id, if any.
+    pub fn get_local_id_for(&mut self, server_id_in: &str) -> Result<Option<String>> {
+        use crate::schema::message_aliases::dsl::*;
+        let result = message_aliases
+            .filter(server_id.eq(server_id_in))
+            .select(local_id)
+            .first::<String>(self.connection)
+            .optional()?;
+        Ok(result)
+    }
+
+    /// Batch lookup: returns a map server_id -> local_id for the provided server ids.
+    pub fn get_local_ids_for(
+        &mut self,
+        server_ids_in: Vec<String>,
+    ) -> Result<HashMap<String, String>> {
+        use crate::schema::message_aliases::dsl::*;
+        if server_ids_in.is_empty() {
+            return Ok(HashMap::new());
+        }
+
+        let rows: Vec<(String, String)> = message_aliases
+            .filter(server_id.eq_any(&server_ids_in))
+            .select((server_id, local_id))
+            .load::<(String, String)>(self.connection)?;
+
+        let mut map = HashMap::new();
+        for (sid, lid) in rows {
+            map.insert(sid, lid);
+        }
+        Ok(map)
+    }
+
     /// Update the contact_id for an existing participant record.
     pub fn update_participant_contact(
         &mut self,

core/kordophone-db/src/schema.rs

@@ -44,6 +44,14 @@ diesel::table! {
     }
 }
 
+diesel::table! {
+    message_aliases (local_id) {
+        local_id -> Text,
+        server_id -> Text,
+        conversation_id -> Text,
+    }
+}
+
 diesel::table! {
     settings (key) {
         key -> Text,
@@ -62,5 +70,6 @@ diesel::allow_tables_to_appear_in_same_query!(
     conversation_participants,
     messages,
     conversation_messages,
+    message_aliases,
     settings,
 );