Merge pull request #146 from Rustmail/135-convert-recover-command-to-slash-command

feat(commands): add complete slash command for recover command

Author: Akinator31

src/commands/delete/slash_command/delete.rs

@@ -3,7 +3,7 @@ use crate::commands::delete::common::{
     update_message_numbers,
 };
 use crate::config::Config;
-use crate::errors::{common, MessageError, ModmailError, ModmailResult};
+use crate::errors::{MessageError, ModmailError, ModmailResult, common};
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response_ephemeral;
 use crate::utils::message::message_builder::MessageBuilder;

src/commands/delete/text_command/delete.rs

@@ -3,7 +3,7 @@ use crate::commands::delete::common::{
     get_thread_info, send_delete_message, update_message_numbers,
 };
 use crate::config::Config;
-use crate::errors::{common, ModmailResult};
+use crate::errors::{ModmailResult, common};
 use serenity::all::{Context, Message};
 
 pub async fn delete(ctx: &Context, msg: &Message, config: &Config) -> ModmailResult<()> {

src/commands/recover/mod.rs

@@ -0,0 +1,2 @@
+pub mod slash_command;
+pub mod text_command;

src/commands/recover/slash_command/mod.rs

@@ -0,0 +1 @@
+pub mod recover;

src/commands/recover/slash_command/recover.rs

@@ -0,0 +1,84 @@
+use crate::config::Config;
+use crate::errors::{ModmailResult, common};
+use crate::i18n::get_translated_message;
+use crate::modules::message_recovery::recover_missing_messages;
+use crate::utils::command::defer_response::defer_response;
+use crate::utils::message::message_builder::MessageBuilder;
+use serenity::all::{CommandInteraction, Context, CreateCommand, ResolvedOption};
+use std::collections::HashMap;
+
+pub async fn register(config: &Config) -> CreateCommand {
+    let cmd_desc = get_translated_message(
+        config,
+        "slash_command.recover_command_description",
+        None,
+        None,
+        None,
+        None,
+    )
+    .await;
+
+    CreateCommand::new("recover").description(cmd_desc)
+}
+
+pub async fn run(
+    ctx: &Context,
+    command: &CommandInteraction,
+    _options: &[ResolvedOption<'_>],
+    config: &Config,
+) -> ModmailResult<()> {
+    let _ = config
+        .db_pool
+        .as_ref()
+        .ok_or_else(common::database_connection_failed)?;
+
+    defer_response(&ctx, &command).await?;
+
+    let mut params = HashMap::new();
+    params.insert("user".to_string(), command.user.name.clone());
+
+    let response = MessageBuilder::system_message(ctx, config)
+        .translated_content(
+            "recovery.started",
+            Some(&params),
+            Some(command.user.id),
+            command.guild_id.map(|g| g.get()),
+        )
+        .await
+        .to_channel(command.channel_id)
+        .build_interaction_message_followup()
+        .await;
+
+    let _ = command.create_followup(&ctx.http, response).await;
+
+    let ctx_clone = ctx.clone();
+    let config_clone = config.clone();
+    let channel_id = command.channel_id;
+    let command_clone = command.clone();
+
+    tokio::spawn(async move {
+        let recovery_results = recover_missing_messages(&ctx_clone, &config_clone).await;
+
+        let total_recovered: u32 = recovery_results.iter().map(|r| r.recovered_count).sum();
+        let successful_threads = recovery_results.iter().filter(|r| r.success).count();
+        let failed_threads = recovery_results.len() - successful_threads;
+
+        let mut params = HashMap::new();
+        params.insert("total".to_string(), total_recovered.to_string());
+        params.insert("threads".to_string(), successful_threads.to_string());
+        params.insert("failed".to_string(), failed_threads.to_string());
+
+        let response = MessageBuilder::system_message(&ctx_clone, &config_clone)
+            .translated_content("recovery.summary", Some(&params), None, None)
+            .await
+            .to_channel(channel_id)
+            .build_interaction_message_followup()
+            .await;
+
+        let _ = command_clone
+            .create_followup(&ctx_clone.http, response)
+            .await;
+    });
+
+    Ok(())
+}

src/commands/recover/text_command/mod.rs

@@ -0,0 +1 @@
+pub mod recover;

src/commands/recover.rs …commands/recover/text_command/recover.rssrc/commands/recover.rs renamed to src/commands/recover/text_command/recover.rs src/commands/recover.rs renamed to src/commands/recover/text_command/recover.rs

@@ -7,6 +7,7 @@ use crate::commands::force_close::slash_command::force_close;
 use crate::commands::id::slash_command::id;
 use crate::commands::move_thread::slash_command::move_thread;
 use crate::commands::new_thread::slash_command::new_thread;
+use crate::commands::recover::slash_command::recover;
 use crate::commands::remove_staff::slash_command::remove_staff;
 use crate::commands::reply::slash_command::reply;
 use crate::config::Config;
@@ -90,6 +91,9 @@ impl EventHandler for InteractionHandler {
                     "delete" => {
                         delete::run(&ctx, &command, &command.data.options(), &self.config).await
                     }
+                    "recover" => {
+                        recover::run(&ctx, &command, &command.data.options(), &self.config).await
+                    }
                     _ => Err(ModmailError::Command(CommandError::UnknownSlashCommand(
                         command.data.name.clone(),
                     ))),

src/handlers/guild_interaction_handler.rs

@@ -9,7 +9,7 @@ use crate::commands::force_close::text_command::force_close::force_close;
 use crate::commands::id::text_command::id::id;
 use crate::commands::move_thread::text_command::move_thread::move_thread;
 use crate::commands::new_thread::text_command::new_thread::new_thread;
-use crate::commands::recover::recover;
+use crate::commands::recover::text_command::recover::recover;
 use crate::commands::remove_staff::text_command::remove_staff::remove_staff;
 use crate::commands::reply::text_command::reply::reply;
 use crate::config::Config;
@@ -20,7 +20,7 @@ use crate::db::operations::{
 };
 use crate::db::operations::{get_thread_channel_by_user_id, thread_exists, update_message_content};
 use crate::db::threads::get_thread_by_user_id;
-use crate::errors::{common, ModmailResult};
+use crate::errors::{ModmailResult, common};
 use crate::i18n::get_translated_message;
 use crate::utils::message::message_builder::MessageBuilder;
 use crate::utils::thread::get_thread_lock::get_thread_lock;

src/handlers/guild_messages_handler.rs

@@ -7,6 +7,7 @@ use crate::commands::force_close::slash_command::force_close;
 use crate::commands::id::slash_command::id;
 use crate::commands::move_thread::slash_command::move_thread;
 use crate::commands::new_thread::slash_command::new_thread;
+use crate::commands::recover::slash_command::recover;
 use crate::commands::remove_staff::slash_command::remove_staff;
 use crate::commands::reply::slash_command::reply;
 use crate::config::Config;
@@ -66,6 +67,7 @@ impl EventHandler for ReadyHandler {
                     force_close::register(&self.config).await,
                     reply::register(&self.config).await,
                     delete::register(&self.config).await,
+                    recover::register(&self.config).await,
                 ],
             )
             .await;