Merge pull request #280 from Rustmail/277-incorrectly-categorized-messages-on-the-panel

fix(panel): incorrectly categorized messages on the panel

Author: Akinator31

…4ef60d33d78ce17d773466f374cd2803e15.json …4d9cc00ff70392c014872208fbf09be4c46.json.sqlx/query-0a9a9189a018b53b2a3c6ae0c85c44ef60d33d78ce17d773466f374cd2803e15.json renamed to .sqlx/query-19a1b22e10deb0dd6e9bf4b5fb6f54d9cc00ff70392c014872208fbf09be4c46.json .sqlx/query-0a9a9189a018b53b2a3c6ae0c85c44ef60d33d78ce17d773466f374cd2803e15.json renamed to .sqlx/query-19a1b22e10deb0dd6e9bf4b5fb6f54d9cc00ff70392c014872208fbf09be4c46.json

@@ -0,0 +1,2 @@
+-- Add is_internal field to thread_messages table to support internal staff notes
+ALTER TABLE thread_messages ADD COLUMN is_internal BOOLEAN NOT NULL DEFAULT false;

.sqlx/query-7d9494022e24d0fe923efbfef1ab3f6a046c063b445ea68a6d21b1b5bb93bba9.json

@@ -22,6 +22,7 @@ pub struct ThreadMessage {
     pub message_number: Option<i64>,
     pub created_at: String,
     pub content: String,
+    pub is_internal: bool,
 }
 
 #[derive(Debug, Clone, Serialize)]
@@ -180,7 +181,8 @@ pub async fn handle_tickets_bot(
                 inbox_message_id,
                 message_number,
                 created_at as "created_at: String",
-                content
+                content,
+                is_internal
             FROM thread_messages
             WHERE thread_id = ?
             ORDER BY created_at ASC
@@ -210,6 +212,7 @@ pub async fn handle_tickets_bot(
                 message_number: m.message_number,
                 created_at: m.created_at,
                 content: m.content,
+                is_internal: m.is_internal,
             })
             .collect();
 
@@ -391,7 +394,8 @@ pub async fn handle_tickets_bot(
             inbox_message_id,
             message_number,
             created_at,
-            content
+            content,
+            is_internal
         FROM thread_messages
         WHERE thread_id IN ({})
         ORDER BY thread_id, created_at ASC
@@ -412,6 +416,7 @@ pub async fn handle_tickets_bot(
             Option<i64>,
             String,
             String,
+            bool,
         ),
     >(&messages_query_str);
 
@@ -445,6 +450,7 @@ pub async fn handle_tickets_bot(
                 message_number: msg.7,
                 created_at: msg.8,
                 content: msg.9,
+                is_internal: msg.10,
             });
     }
 

…7324a9ab038f38d0242446bce07faaa3c48.json …19901f9d98d9c85029cc814d27cd510c94f.json.sqlx/query-58b509ab34151e24f3f505e8516537324a9ab038f38d0242446bce07faaa3c48.json renamed to .sqlx/query-8bd9999e773c8ff007893fe3d18a519901f9d98d9c85029cc814d27cd510c94f.json .sqlx/query-58b509ab34151e24f3f505e8516537324a9ab038f38d0242446bce07faaa3c48.json renamed to .sqlx/query-8bd9999e773c8ff007893fe3d18a519901f9d98d9c85029cc814d27cd510c94f.json

@@ -166,7 +166,7 @@ pub async fn get_latest_thread_message(
         r#"
         SELECT id, thread_id, user_id, user_name, is_anonymous,
                dm_message_id, inbox_message_id, message_number,
-               created_at as "created_at: String", content
+               created_at as "created_at: String", content, is_internal
         FROM thread_messages
         WHERE thread_id = ?
         ORDER BY created_at DESC
@@ -188,6 +188,7 @@ pub async fn get_latest_thread_message(
         message_number: row.message_number,
         _created_at: row.created_at,
         content: row.content,
+        _is_internal: row.is_internal,
     });
 
     Ok(latest)
@@ -259,6 +260,49 @@ pub async fn insert_user_message_with_ids(
     Ok(())
 }
 
+pub async fn insert_internal_message(
+    ctx: &Context,
+    msg: &Message,
+    thread_id: &str,
+    pool: &SqlitePool,
+    config: &Config,
+) -> Result<(), Error> {
+    let user_id = msg.author.id.get() as i64;
+    let inbox_message_id = msg.id.to_string();
+
+    let user_name = msg
+        .author
+        .id
+        .to_user(&ctx.http)
+        .await
+        .map(|user| user.name)
+        .unwrap_or_else(|_| "Unknown".to_string());
+
+    let content = extract_message_content(msg, config);
+
+    sqlx::query!(
+        r#"
+        INSERT INTO thread_messages (
+            thread_id, user_id, user_name, is_anonymous, inbox_message_id, content, thread_status, is_internal
+        ) VALUES (
+            ?, ?, ?, ?, ?, ?, ?, ?
+        )
+        "#,
+        thread_id,
+        user_id,
+        user_name,
+        false,
+        inbox_message_id,
+        content,
+        1,
+        true
+    )
+    .execute(pool)
+    .await?;
+
+    Ok(())
+}
+
 pub async fn get_thread_message_by_inbox_message_id(
     inbox_message_id: &str,
     pool: &SqlitePool,
@@ -267,7 +311,7 @@ pub async fn get_thread_message_by_inbox_message_id(
         r#"
         SELECT id, thread_id, user_id, user_name, is_anonymous,
                dm_message_id, inbox_message_id, message_number,
-               created_at as "created_at: String", content
+               created_at as "created_at: String", content, is_internal
         FROM thread_messages
         WHERE inbox_message_id = ?
         ORDER BY created_at DESC
@@ -289,6 +333,7 @@ pub async fn get_thread_message_by_inbox_message_id(
         message_number: row.message_number,
         _created_at: row.created_at,
         content: row.content,
+        _is_internal: row.is_internal,
     }) {
         Some(row) => row,
         None => {
@@ -309,7 +354,7 @@ pub async fn get_thread_message_by_message_id(
         r#"
         SELECT id, thread_id, user_id, user_name, is_anonymous,
                dm_message_id, inbox_message_id, message_number,
-               created_at as "created_at: String", content
+               created_at as "created_at: String", content, is_internal
         FROM thread_messages
         WHERE dm_message_id = ? OR inbox_message_id = ?
         ORDER BY created_at DESC
@@ -332,6 +377,7 @@ pub async fn get_thread_message_by_message_id(
         message_number: row.message_number,
         _created_at: row.created_at,
         content: row.content,
+        _is_internal: row.is_internal,
     }) {
         Some(row) => row,
         None => {
@@ -354,7 +400,7 @@ pub async fn get_thread_message_by_dm_message_id(
         r#"
         SELECT id, thread_id, user_id, user_name, is_anonymous,
                dm_message_id, inbox_message_id, message_number,
-               created_at as "created_at: String", content
+               created_at as "created_at: String", content, is_internal
         FROM thread_messages
         WHERE dm_message_id = ?
         AND thread_status = 1
@@ -377,6 +423,7 @@ pub async fn get_thread_message_by_dm_message_id(
         message_number: row.message_number,
         _created_at: row.created_at,
         content: row.content,
+        _is_internal: row.is_internal,
     }) {
         Some(row) => row,
         None => {
@@ -401,4 +448,5 @@ pub struct ThreadMessage {
     pub message_number: Option<i64>,
     pub _created_at: String,
     pub content: String,
+    pub _is_internal: bool,
 }

…2b7bddd509e1bceb1b7614010ffa97a4a4c.json …2b848d8da2d1801c4e47e6efaa90f42d4c2.json.sqlx/query-9e31ac92a673943c1173fbe2ffe072b7bddd509e1bceb1b7614010ffa97a4a4c.json renamed to .sqlx/query-a97fc2e1d356748f9253aede913332b848d8da2d1801c4e47e6efaa90f42d4c2.json .sqlx/query-9e31ac92a673943c1173fbe2ffe072b7bddd509e1bceb1b7614010ffa97a4a4c.json renamed to .sqlx/query-a97fc2e1d356748f9253aede913332b848d8da2d1801c4e47e6efaa90f42d4c2.json

@@ -242,6 +242,23 @@ impl EventHandler for GuildMessagesHandler {
             }
             return;
         }
+
+        if let Some(guild_id) = msg.guild_id {
+            let staff_guild_id = self.config.bot.get_staff_guild_id();
+            if guild_id.get() == staff_guild_id && !msg.author.bot {
+                if let Some(pool) = &self.config.db_pool {
+                    let channel_id_str = msg.channel_id.to_string();
+                    if let Some(_thread) = get_thread_by_channel_id(&channel_id_str, pool).await {
+                        if let Err(e) =
+                            insert_internal_message(&ctx, &msg, &_thread.id, pool, &self.config)
+                                .await
+                        {
+                            eprintln!("Failed to record internal message: {}", e);
+                        }
+                    }
+                }
+            }
+        }
         return;
     }