feat(commands): add remove_reminder command

Akinator31 · Akinator31 · commit 045a62abb509 · 2025-10-08T14:52:51.000+02:00
diff --git a/src/commands/add_reminder/common.rs b/src/commands/add_reminder/common.rs
@@ -1,5 +1,5 @@
 use crate::config::Config;
-use crate::db::reminders::{Reminder, update_reminder_status};
+use crate::db::reminders::{Reminder, is_reminder_active, update_reminder_status};
 use crate::utils::conversion::hex_string_to_int::hex_string_to_int;
 use crate::utils::message::message_builder::MessageBuilder;
 use chrono::Local;
@@ -109,7 +109,13 @@ pub async fn send_register_confirmation_from_command(
     }
 }
 
-pub fn spawn_reminder(reminder: &Reminder, ctx: &Context, config: &Config, pool: &SqlitePool) {
+pub fn spawn_reminder(
+    reminder: &Reminder,
+    reminder_id: Option<i64>,
+    ctx: &Context,
+    config: &Config,
+    pool: &SqlitePool,
+) {
     let pool = pool.clone();
     let config = config.clone();
     let ctx = ctx.clone();
@@ -124,6 +130,20 @@ pub fn spawn_reminder(reminder: &Reminder, ctx: &Context, config: &Config, pool:
         };
         sleep(Duration::from_secs(delay_duration as u64)).await;
 
+        if let Some(reminder_id) = reminder_id {
+            match is_reminder_active(reminder_id, &pool).await {
+                Ok(active) => {
+                    if !active {
+                        return;
+                    }
+                }
+                Err(e) => {
+                    eprintln!("Failed to check reminder status: {}", e);
+                    return;
+                }
+            }
+        }
+
         let mut params = HashMap::new();
         params.insert(
             "time".to_string(),
diff --git a/src/commands/add_reminder/slash_command/add_reminder.rs b/src/commands/add_reminder/slash_command/add_reminder.rs
@@ -199,7 +199,7 @@ impl RegistrableCommand for AddReminderCommand {
             )
             .await;
 
-            spawn_reminder(&reminder, &ctx, &config, &pool);
+            spawn_reminder(&reminder, Some(reminder_id), &ctx, &config, &pool);
 
             Ok(())
         })
diff --git a/src/commands/add_reminder/text_command/add_reminder.rs b/src/commands/add_reminder/text_command/add_reminder.rs
@@ -100,7 +100,7 @@ pub async fn add_reminder(ctx: &Context, msg: &Message, config: &Config) -> Modm
 
     let _ = msg.delete(&ctx.http).await;
 
-    spawn_reminder(&reminder, &ctx, &config, &pool);
+    spawn_reminder(&reminder, Some(reminder_id), &ctx, &config, &pool);
 
     Ok(())
 }
diff --git a/src/commands/mod.rs b/src/commands/mod.rs
@@ -18,6 +18,7 @@ pub mod id;
 pub mod move_thread;
 pub mod new_thread;
 pub mod recover;
+pub mod remove_reminder;
 pub mod remove_staff;
 pub mod reply;
 
diff --git a/src/commands/remove_reminder/mod.rs b/src/commands/remove_reminder/mod.rs
@@ -0,0 +1,2 @@
+pub mod slash_command;
+pub mod text_command;
diff --git a/src/commands/remove_reminder/slash_command/mod.rs b/src/commands/remove_reminder/slash_command/mod.rs
@@ -0,0 +1 @@
+pub mod remove_reminder;
diff --git a/src/commands/remove_reminder/slash_command/remove_reminder.rs b/src/commands/remove_reminder/slash_command/remove_reminder.rs
@@ -0,0 +1,135 @@
+use crate::commands::{BoxFuture, RegistrableCommand};
+use crate::config::Config;
+use crate::db::reminders::{get_reminder_by_id, update_reminder_status};
+use crate::errors::{CommandError, DatabaseError, ModmailError, ModmailResult, common};
+use crate::i18n::get_translated_message;
+use crate::utils::command::defer_response::defer_response;
+use crate::utils::message::message_builder::MessageBuilder;
+use serenity::all::{
+    CommandDataOptionValue, CommandInteraction, CommandOptionType, Context, CreateCommand,
+    CreateCommandOption, ResolvedOption,
+};
+use std::collections::HashMap;
+
+pub struct RemoveReminderCommand;
+
+impl RegistrableCommand for RemoveReminderCommand {
+    fn name(&self) -> &'static str {
+        "remove_reminder"
+    }
+
+    fn register(&self, config: &Config) -> BoxFuture<Vec<CreateCommand>> {
+        let config = config.clone();
+        let name = self.name();
+
+        Box::pin(async move {
+            let cmd_desc = get_translated_message(
+                &config,
+                "slash_command.remove_reminder_command_description",
+                None,
+                None,
+                None,
+                None,
+            )
+            .await;
+            let id_desc = get_translated_message(
+                &config,
+                "slash_command.remove_reminder_id_argument",
+                None,
+                None,
+                None,
+                None,
+            )
+            .await;
+
+            vec![CreateCommand::new(name).description(cmd_desc).add_option(
+                CreateCommandOption::new(CommandOptionType::Number, "id", id_desc).required(true),
+            )]
+        })
+    }
+
+    fn run(
+        &self,
+        ctx: &Context,
+        command: &CommandInteraction,
+        options: &[ResolvedOption<'_>],
+        config: &Config,
+    ) -> BoxFuture<ModmailResult<()>> {
+        let ctx = ctx.clone();
+        let command = command.clone();
+        let config = config.clone();
+
+        Box::pin(async move {
+            let pool = config
+                .db_pool
+                .as_ref()
+                .ok_or_else(common::database_connection_failed)?;
+
+            let _ = defer_response(&ctx, &command).await;
+
+            let mut reminder_id: Option<i64> = None;
+
+            for option in &command.data.options {
+                match option.name.as_str() {
+                    "id" => {
+                        if let CommandDataOptionValue::Number(val) = &option.value {
+                            reminder_id.replace(*val as i64);
+                        }
+                    }
+                    _ => {}
+                }
+            }
+
+            let reminder_id = match reminder_id {
+                Some(id) => id,
+                None => {
+                    return Err(ModmailError::Command(CommandError::InvalidArguments(
+                        "reminder ID".to_string(),
+                    )));
+                }
+            };
+
+            let reminder = match get_reminder_by_id(reminder_id, pool).await {
+                Ok(Some(r)) => r,
+                Ok(None) => {
+                    return Err(ModmailError::Database(DatabaseError::NotFound(
+                        "".to_string(),
+                    )));
+                }
+                Err(e) => {
+                    return Err(ModmailError::Database(DatabaseError::QueryFailed(
+                        e.to_string(),
+                    )));
+                }
+            };
+
+            match update_reminder_status(&reminder, true, pool).await {
+                Ok(_) => {
+                    let mut params = HashMap::new();
+                    params.insert("id".to_string(), reminder_id.to_string());
+
+                    let response = MessageBuilder::system_message(&ctx, &config)
+                        .translated_content(
+                            "remove_reminder.confirmation",
+                            Some(&params),
+                            None,
+                            None,
+                        )
+                        .await
+                        .to_channel(command.channel_id)
+                        .build_interaction_message_followup()
+                        .await;
+
+                    let _ = command.create_followup(&ctx.http, response).await;
+                }
+                Err(e) => {
+                    return Err(ModmailError::Database(DatabaseError::QueryFailed(
+                        e.to_string(),
+                    )));
+                }
+            }
+
+            Ok(())
+        })
+    }
+}
diff --git a/src/commands/remove_reminder/text_command/mod.rs b/src/commands/remove_reminder/text_command/mod.rs
@@ -0,0 +1 @@
+pub mod remove_reminder;
diff --git a/src/commands/remove_reminder/text_command/remove_reminder.rs b/src/commands/remove_reminder/text_command/remove_reminder.rs
@@ -0,0 +1,71 @@
+use crate::config::Config;
+use crate::db::reminders::{get_reminder_by_id, update_reminder_status};
+use crate::errors::{CommandError, DatabaseError, ModmailError, ModmailResult, common};
+use crate::utils::command::extract_reply_content::extract_reply_content;
+use crate::utils::message::message_builder::MessageBuilder;
+use serenity::all::{Context, Message};
+use std::collections::HashMap;
+
+pub async fn remove_reminder(ctx: &Context, msg: &Message, config: &Config) -> ModmailResult<()> {
+    let pool = config
+        .db_pool
+        .as_ref()
+        .ok_or_else(common::database_connection_failed)?;
+
+    let content = match extract_reply_content(
+        &msg.content,
+        &config.command.prefix,
+        &["remove_reminder", "rr"],
+    ) {
+        Some(c) => c,
+        None => {
+            return Err(ModmailError::Command(CommandError::InvalidArguments(
+                "".to_string(),
+            )));
+        }
+    };
+
+    let reminder_id = match content.parse::<u64>() {
+        Ok(id) => id,
+        Err(_) => {
+            return Err(ModmailError::Command(CommandError::InvalidArguments(
+                "Reminder ID".to_string(),
+            )));
+        }
+    };
+
+    let reminder = match get_reminder_by_id(reminder_id as i64, pool).await {
+        Ok(Some(r)) => r,
+        Ok(None) => {
+            return Err(ModmailError::Database(DatabaseError::NotFound(
+                "".to_string(),
+            )));
+        }
+        Err(e) => {
+            return Err(ModmailError::Database(DatabaseError::QueryFailed(
+                e.to_string(),
+            )));
+        }
+    };
+
+    match update_reminder_status(&reminder, true, pool).await {
+        Ok(_) => {
+            let mut params = HashMap::new();
+            params.insert("id".to_string(), reminder_id.to_string());
+
+            let _ = MessageBuilder::system_message(&ctx, &config)
+                .translated_content("remove_reminder.confirmation", Some(&params), None, None)
+                .await
+                .to_channel(msg.channel_id)
+                .send()
+                .await;
+        }
+        Err(e) => {
+            return Err(ModmailError::Database(DatabaseError::QueryFailed(
+                e.to_string(),
+            )));
+        }
+    }
+
+    Ok(())
+}
diff --git a/src/db/operations/reminders.rs b/src/db/operations/reminders.rs
@@ -74,3 +74,43 @@ pub async fn get_all_pending_reminders(
     .await?;
     Ok(rows)
 }
+
+pub async fn get_reminder_by_id(
+    reminder_id: i64,
+    pool: &sqlx::SqlitePool,
+) -> Result<Option<Reminder>, sqlx::Error> {
+    let row = sqlx::query_as!(
+        Reminder,
+        r#"
+        SELECT thread_id, user_id, channel_id, guild_id, reminder_content, trigger_time, created_at, completed
+        FROM reminders
+        WHERE id = ?
+        "#,
+        reminder_id
+    )
+    .fetch_optional(pool)
+    .await?;
+    Ok(row)
+}
+
+pub async fn is_reminder_active(
+    reminder_id: i64,
+    pool: &sqlx::SqlitePool,
+) -> Result<bool, sqlx::Error> {
+    let row = sqlx::query!(
+        r#"
+        SELECT completed
+        FROM reminders
+        WHERE id = ?
+        "#,
+        reminder_id
+    )
+    .fetch_optional(pool)
+    .await?;
+
+    if let Some(record) = row {
+        Ok(!record.completed)
+    } else {
+        Ok(false)
+    }
+}
diff --git a/src/handlers/guild_messages_handler.rs b/src/handlers/guild_messages_handler.rs
@@ -12,6 +12,7 @@ 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::text_command::recover::recover;
+use crate::commands::remove_reminder::text_command::remove_reminder::remove_reminder;
 use crate::commands::remove_staff::text_command::remove_staff::remove_staff;
 use crate::commands::reply::text_command::reply::reply;
 use crate::config::Config;
@@ -72,6 +73,7 @@ impl GuildMessagesHandler {
         wrap_command!(h.commands, "id", id);
         wrap_command!(h.commands, "help", help);
         wrap_command!(h.commands, ["add_reminder", "add_rap"], add_reminder);
+        wrap_command!(h.commands, ["remove_reminder", "rr"], remove_reminder);
         h
     }
 }
diff --git a/src/i18n/language/en.rs b/src/i18n/language/en.rs
@@ -755,4 +755,16 @@ pub fn load_english_messages(dict: &mut ErrorDictionary) {
         "slash_command.add_reminder_content_argument_description".to_string(),
         DictionaryMessage::new("Optional content for the reminder"),
     );
+    dict.messages.insert(
+        "remove_reminder.confirmation".to_string(),
+        DictionaryMessage::new("Reminder **#{id}** has been removed successfully"),
+    );
+    dict.messages.insert(
+        "slash_command.remove_reminder_command_description".to_string(),
+        DictionaryMessage::new("Remove one of your reminders"),
+    );
+    dict.messages.insert(
+        "slash_command.remove_reminder_id_argument".to_string(),
+        DictionaryMessage::new("The ID of the reminder to remove"),
+    );
 }
diff --git a/src/i18n/language/fr.rs b/src/i18n/language/fr.rs
@@ -774,4 +774,16 @@ pub fn load_french_messages(dict: &mut ErrorDictionary) {
         "slash_command.add_reminder_content_argument_description".to_string(),
         DictionaryMessage::new("Le contenu du rappel (optionnel)"),
     );
+    dict.messages.insert(
+        "remove_reminder.confirmation".to_string(),
+        DictionaryMessage::new("Le rappel **#{id}** a été supprimé avec succès."),
+    );
+    dict.messages.insert(
+        "slash_command.remove_reminder_command_description".to_string(),
+        DictionaryMessage::new("Supprimer un rappel que vous avez créé."),
+    );
+    dict.messages.insert(
+        "slash_command.remove_reminder_id_argument".to_string(),
+        DictionaryMessage::new("L'ID du rappel à supprimer."),
+    );
 }
diff --git a/src/main.rs b/src/main.rs
@@ -11,6 +11,7 @@ use crate::commands::id::slash_command::id::IdCommand;
 use crate::commands::move_thread::slash_command::move_thread::MoveCommand;
 use crate::commands::new_thread::slash_command::new_thread::NewThreadCommand;
 use crate::commands::recover::slash_command::recover::RecoverCommand;
+use crate::commands::remove_reminder::slash_command::remove_reminder::RemoveReminderCommand;
 use crate::commands::remove_staff::slash_command::remove_staff::RemoveStaffCommand;
 use crate::commands::reply::slash_command::reply::ReplyCommand;
 use crate::handlers::guild_handler::GuildHandler;
@@ -82,6 +83,7 @@ async fn main() {
     registry.register_command(RemoveStaffCommand);
     registry.register_command(ReplyCommand);
     registry.register_command(AddReminderCommand);
+    registry.register_command(RemoveReminderCommand);
 
     let registry = Arc::new(registry);
 
diff --git a/src/modules/reminders.rs b/src/modules/reminders.rs

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ impl RegistrableCommand for AddReminderCommand {`
`199`	`199`	`)`
`200`	`200`	`.await;`
`201`	`201`
`202`		`- spawn_reminder(&reminder, &ctx, &config, &pool);`
	`202`	`+ spawn_reminder(&reminder, Some(reminder_id), &ctx, &config, &pool);`
`203`	`203`
`204`	`204`	`Ok(())`
`205`	`205`	`})`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ pub async fn add_reminder(ctx: &Context, msg: &Message, config: &Config) -> Modm`
`100`	`100`
`101`	`101`	`let _ = msg.delete(&ctx.http).await;`
`102`	`102`
`103`		`- spawn_reminder(&reminder, &ctx, &config, &pool);`
	`103`	`+ spawn_reminder(&reminder, Some(reminder_id), &ctx, &config, &pool);`
`104`	`104`
`105`	`105`	`Ok(())`
`106`	`106`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+pub mod slash_command;`
	`2`	`+pub mod text_command;`