refactor(db): only fetch thread_status entries with active threads

Author: Akinator31

rustmail/src/commands/new_thread/slash_command/new_thread.rs

@@ -137,7 +137,7 @@ impl RegistrableCommand for NewThreadCommand {
             }
 
             let inbox_category_id = ChannelId::new(config.thread.inbox_category_id);
-            let channel_name = user.name.to_lowercase().replace(" ", "-").to_string();
+            let channel_name = format!("🔵・{}・0m", user.name);
             let mut channel_builder = serenity::all::CreateChannel::new(&channel_name);
             channel_builder = channel_builder
                 .kind(serenity::model::channel::ChannelType::Text)

rustmail/src/commands/new_thread/text_command/new_thread.rs

@@ -58,7 +58,7 @@ pub async fn new_thread(
     }
 
     let inbox_category_id = ChannelId::new(config.thread.inbox_category_id);
-    let channel_name = user.name.to_lowercase().replace(" ", "-").to_string();
+    let channel_name = format!("🔵・{}・0m", user.name);
     let mut channel_builder = serenity::all::CreateChannel::new(&channel_name);
     channel_builder = channel_builder
         .kind(serenity::model::channel::ChannelType::Text)

rustmail/src/db/operations/threads.rs

@@ -420,8 +420,14 @@ pub async fn is_orphaned_thread_channel(
 pub async fn get_all_thread_status(pool: &SqlitePool) -> Vec<TicketState> {
     match sqlx::query!(
         r#"
-        SELECT channel_id, owner_id, taken_by, last_message_by, last_message_at
-        FROM thread_status
+        SELECT ts.channel_id,
+               ts.owner_id,
+               ts.taken_by,
+               ts.last_message_by,
+               ts.last_message_at
+        FROM thread_status ts
+        JOIN threads t ON ts.thread_id = t.id
+        WHERE t.status = 1
         "#
     )
     .fetch_all(pool)

rustmail/src/modules/threads_status.rs

@@ -1,10 +1,10 @@
-use std::time::Duration;
 use crate::prelude::errors::*;
 use crate::prelude::types::*;
 use chrono::Utc;
 use serenity::all::{ChannelId, UserId};
 use serenity::builder::EditChannel;
 use serenity::client::Context;
+use std::time::Duration;
 use tokio::time::timeout;
 
 pub async fn update_thread_status_ui(ctx: &Context, ticket: &TicketState) -> ModmailResult<()> {
@@ -24,14 +24,7 @@ pub async fn update_thread_status_ui(ctx: &Context, ticket: &TicketState) -> Mod
     };
 
     let owner_id = ticket.owner_id.parse().unwrap_or(0);
-    let owner_name = if owner_id != 0 {
-        ctx.cache
-            .user(UserId::new(owner_id))
-            .map(|u| u.name.clone())
-            .unwrap_or_else(|| format!("User-{}", owner_id))
-    } else {
-        "Unknown".to_string()
-    };
+    let owner_name = UserId::new(owner_id).to_user(&ctx.http).await?.name;
 
     let mut name = format!("{color}・{}", owner_name);
 
@@ -51,25 +44,20 @@ pub async fn update_thread_status_ui(ctx: &Context, ticket: &TicketState) -> Mod
 
     let result = timeout(
         Duration::from_secs(2),
-        channel.edit(&ctx.http, EditChannel::new().name(&name))
-    ).await;
+        channel.edit(&ctx.http, EditChannel::new().name(&name)),
+    )
+    .await;
 
     match result {
         Ok(Ok(_)) => Ok(()),
 
         Ok(Err(e)) => {
-            eprintln!(
-                "Failed to edit channel {}: {:?}",
-                ticket.channel_id, e
-            );
+            eprintln!("Failed to edit channel {}: {:?}", ticket.channel_id, e);
             Err(e.into())
         }
 
         Err(_) => {
-            eprintln!(
-                "Timeout editing channel {} (skipping)",
-                ticket.channel_id
-            );
+            eprintln!("Timeout editing channel {} (skipping)", ticket.channel_id);
             Ok(())
         }
     }