refactor(threads): add timeout for thread's status updates

Author: Akinator31

rustmail/src/commands/anonreply/text_command/anonreply.rs

@@ -8,6 +8,7 @@ use chrono::Utc;
 use serenity::all::{Context, GuildId, Message, UserId};
 use std::collections::HashMap;
 use std::sync::Arc;
+use crate::modules::update_thread_status_ui;
 
 pub async fn anonreply(
     ctx: Context,
@@ -77,7 +78,8 @@ pub async fn anonreply(
 
     ticket_status.last_message_by = TicketAuthor::Staff;
     ticket_status.last_message_at = Utc::now().timestamp();
-    update_thread_status(&thread.id, &ticket_status, db_pool).await?;
+    update_thread_status_db(&thread.id, &ticket_status, db_pool).await?;
+    update_thread_status_ui(&ctx, &ticket_status).await?;
 
     let _ = msg.delete(&ctx.http).await;
 

rustmail/src/commands/reply/slash_command/reply.rs

@@ -14,6 +14,7 @@ use serenity::all::{
 };
 use std::collections::HashMap;
 use std::sync::Arc;
+use crate::modules::update_thread_status_ui;
 
 pub struct ReplyCommand;
 
@@ -166,7 +167,8 @@ impl RegistrableCommand for ReplyCommand {
 
             ticket_status.last_message_by = TicketAuthor::Staff;
             ticket_status.last_message_at = Utc::now().timestamp();
-            update_thread_status(&thread.id, &ticket_status, db_pool).await?;
+            update_thread_status_db(&thread.id, &ticket_status, db_pool).await?;
+            update_thread_status_ui(&ctx, &ticket_status).await?;
 
             let mut sr = MessageBuilder::begin_staff_reply(
                 &ctx,

rustmail/src/commands/reply/text_command/reply.rs

@@ -8,6 +8,7 @@ use chrono::Utc;
 use serenity::all::{Context, GuildId, Message, UserId};
 use std::collections::HashMap;
 use std::sync::Arc;
+use crate::modules::update_thread_status_ui;
 
 pub async fn reply(
     ctx: Context,
@@ -49,7 +50,8 @@ pub async fn reply(
 
     ticket_status.last_message_by = TicketAuthor::Staff;
     ticket_status.last_message_at = Utc::now().timestamp();
-    update_thread_status(&thread.id, &ticket_status, db_pool).await?;
+    update_thread_status_db(&thread.id, &ticket_status, db_pool).await?;
+    update_thread_status_ui(&ctx, &ticket_status).await?;
 
     let _ = msg.delete(&ctx.http).await;
 

rustmail/src/db/operations/threads.rs

@@ -479,7 +479,7 @@ pub async fn get_thread_status(thread_id: &str, pool: &SqlitePool) -> Option<Tic
     }
 }
 
-pub async fn update_thread_status(
+pub async fn update_thread_status_db(
     thread_id: &str,
     ticket: &TicketState,
     pool: &SqlitePool,

rustmail/src/handlers/ready_handler.rs

@@ -101,6 +101,8 @@ fn update_threads_status(ctx: &Context, pool: &SqlitePool) {
         async move {
             let mut interval = interval(Duration::from_secs(60 * 10));
 
+            interval.tick().await;
+
             loop {
                 let tickets_status = get_all_thread_status(&pool).await;
 
@@ -110,7 +112,7 @@ fn update_threads_status(ctx: &Context, pool: &SqlitePool) {
                     let ticket = ticket.clone();
                     let handle = tokio::spawn(async move {
                         println!("Update");
-                        if let Err(e) = update_thread_status(&ctx, &ticket).await {
+                        if let Err(e) = update_thread_status_ui(&ctx, &ticket).await {
                             eprintln!(
                                 "Failed to update thread status for channel {}: {:?}",
                                 ticket.channel_id, e

rustmail/src/modules/threads_status.rs

@@ -1,11 +1,13 @@
+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 tokio::time::timeout;
 
-pub async fn update_thread_status(ctx: &Context, ticket: &TicketState) -> ModmailResult<()> {
+pub async fn update_thread_status_ui(ctx: &Context, ticket: &TicketState) -> ModmailResult<()> {
     let channel = ChannelId::new(ticket.channel_id as u64);
 
     let color = match ticket.last_message_by {
@@ -47,14 +49,28 @@ pub async fn update_thread_status(ctx: &Context, ticket: &TicketState) -> Modmai
 
     name.push_str(&format!("・{}", time_str));
 
-    tokio::spawn({
-        let ctx = ctx.clone();
-        async move {
-            let _ = channel
-                .edit(&ctx.http, EditChannel::new().name(&name))
-                .await;
+    let result = timeout(
+        Duration::from_secs(2),
+        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
+            );
+            Err(e.into())
         }
-    });
 
-    Ok(())
+        Err(_) => {
+            eprintln!(
+                "Timeout editing channel {} (skipping)",
+                ticket.channel_id
+            );
+            Ok(())
+        }
+    }
 }

rustmail/src/utils/thread/send_to_thread.rs

@@ -7,6 +7,7 @@ use crate::types::TicketAuthor;
 use chrono::Utc;
 use serenity::all::{ChannelId, Context, CreateAttachment, GuildId, Message, UserId};
 use std::collections::HashMap;
+use crate::modules::update_thread_status_ui;
 
 fn extract_message_content_with_media(msg: &Message) -> (String, Vec<String>) {
     let content = msg.content.clone();
@@ -137,7 +138,8 @@ pub async fn send_to_thread(
 
     ticket_status.last_message_by = TicketAuthor::User;
     ticket_status.last_message_at = Utc::now().timestamp();
-    update_thread_status(&thread_id.clone(), &ticket_status, &pool.clone()).await?;
+    update_thread_status_db(&thread_id.clone(), &ticket_status, &pool.clone()).await?;
+    update_thread_status_ui(&ctx, &ticket_status).await?;
 
     let builder = MessageBuilder::begin_user_incoming(ctx, config, thread_id.clone(), msg)
         .to_thread(channel_id)