refactor(messages): internals messages are now stored in database and are shown on panel

Author: Akinator31

rustmail/src/api/handler/bot/tickets.rs

@@ -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,
             });
     }
 

rustmail/src/db/operations/messages.rs

@@ -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,
 }

rustmail/src/handlers/guild_messages_handler.rs

@@ -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;
     }
 

rustmail/src/utils/message/message_builder.rs

@@ -775,7 +775,7 @@ impl<'a> StaffReply<'a> {
             .add_attachments(self.attachments.clone())
             .to_channel(thread_channel);
 
-        let thread_msg = thread_builder.send(true).await?;
+        let thread_msg = thread_builder.send(false).await?;
 
         let dm_msg_opt: Option<Message> = self.build_and_send_message(top_role_name).await;
 
@@ -927,7 +927,8 @@ impl<'a> UserIncoming<'a> {
         .content(self.content)
         .add_attachments(self.attachments)
         .to_channel(thread_channel);
-        let sent = builder.send(true).await?;
+
+        let sent = builder.send(false).await?;
         if let Err(e) = insert_user_message_with_ids(
             self.dm_msg,
             &sent,

rustmail_panel/src/components/ticket.rs

@@ -23,16 +23,19 @@ pub struct ThreadMessage {
     pub message_number: Option<i64>,
     pub created_at: String,
     pub content: String,
+    pub is_internal: bool,
 }
 
 impl ThreadMessage {
     fn message_type(&self) -> MessageType {
-        if self.user_name.starts_with("System") || self.user_name == "System" {
-            MessageType::System
-        } else if self.user_id == 0 || self.is_anonymous {
+        if self.is_internal {
+            MessageType::Internal
+        } else if self.message_number.is_some() {
+            MessageType::Staff
+        } else if self.dm_message_id.is_some() && self.inbox_message_id.is_some() {
             MessageType::User
         } else {
-            MessageType::Staff
+            MessageType::System
         }
     }
 }
@@ -42,6 +45,7 @@ enum MessageType {
     User,
     Staff,
     System,
+    Internal,
 }
 
 #[derive(Clone, PartialEq, Deserialize, Debug)]
@@ -507,6 +511,7 @@ pub fn ticket_details(props: &TicketDetailsProps) -> Html {
     let show_user = use_state(|| true);
     let show_staff = use_state(|| true);
     let show_system = use_state(|| true);
+    let show_internal = use_state(|| true);
     let search_query = use_state(|| String::new());
 
     let permissions = use_state(|| None::<Vec<PanelPermission>>);
@@ -594,6 +599,7 @@ pub fn ticket_details(props: &TicketDetailsProps) -> Html {
                                 MessageType::User => *show_user,
                                 MessageType::Staff => *show_staff,
                                 MessageType::System => *show_system,
+                                MessageType::Internal => *show_internal,
                             };
 
                             let search_match = if search_query.is_empty() {
@@ -746,6 +752,25 @@ pub fn ticket_details(props: &TicketDetailsProps) -> Html {
                                         <i class="bi bi-gear"></i>
                                         {i18n.t("panel.tickets.filter_system")}
                                     </button>
+
+                                    <button
+                                        onclick={{
+                                            let show_internal = show_internal.clone();
+                                            move |_| show_internal.set(!*show_internal)
+                                        }}
+                                        class={classes!(
+                                            "px-4", "py-2", "rounded-lg", "border", "transition-all", "text-sm", "font-medium",
+                                            "flex", "items-center", "gap-2",
+                                            if *show_internal {
+                                                "bg-purple-500/20 text-purple-400 border-purple-500/50"
+                                            } else {
+                                                "bg-slate-700/30 text-gray-400 border-slate-600"
+                                            }
+                                        )}
+                                    >
+                                        <i class="bi bi-pencil-square"></i>
+                                        {i18n.t("panel.tickets.filter_internal")}
+                                    </button>
                                 </div>
                             </div>
 
@@ -779,6 +804,11 @@ pub fn ticket_details(props: &TicketDetailsProps) -> Html {
                                                             "border-yellow-500/30",
                                                             "text-yellow-400"
                                                         ),
+                                                        MessageType::Internal => (
+                                                            "bg-purple-500/10",
+                                                            "border-purple-500/30",
+                                                            "text-purple-400"
+                                                        ),
                                                     };
 
                                                     html! {

rustmail_panel/src/i18n/en/en.json

@@ -168,6 +168,7 @@
       "filter_user": "Users",
       "filter_staff": "Staff",
       "filter_system": "System",
+      "filter_internal": "Internal",
       "tickets_per_page": "Tickets per page",
       "no_messages": "No messages to display with selected filters"
     },

rustmail_panel/src/i18n/fr/fr.json

@@ -168,6 +168,7 @@
       "filter_user": "Utilisateurs",
       "filter_staff": "Staff",
       "filter_system": "Système",
+      "filter_internal": "Interne",
       "no_messages": "Aucun message à afficher avec les filtres sélectionnés",
       "tickets_per_page": "Tickets par page"
     },