fix(reminder): correctly handle errors

Author: Akinator31

crates/rustmail/src/commands/add_reminder/text_command/add_reminder.rs

@@ -241,11 +241,18 @@ async fn handle_subscription(
         }
     };
 
-    let role_name_lower = role_name.to_lowercase();
-    let role = guild
-        .roles
-        .values()
-        .find(|r| r.name.to_lowercase() == role_name_lower);
+    let mention_regex = Regex::new(r"<@&(\d+)>").unwrap();
+    let role = if let Some(caps) = mention_regex.captures(role_name) {
+        caps.get(1)
+            .and_then(|m| m.as_str().parse::<u64>().ok())
+            .and_then(|id| guild.roles.get(&RoleId::new(id)))
+    } else {
+        let role_name_lower = role_name.to_lowercase();
+        guild
+            .roles
+            .values()
+            .find(|r| r.name.to_lowercase() == role_name_lower)
+    };
 
     let role = match role {
         Some(r) => r,
@@ -282,9 +289,9 @@ async fn handle_subscription(
         .await?;
 
         if !was_opted_out {
-            return Err(ModmailError::Command(CommandError::ReminderAlreadySubscribed(
-                role.name.clone(),
-            )));
+            return Err(ModmailError::Command(
+                CommandError::ReminderAlreadySubscribed(role.name.clone()),
+            ));
         }
 
         let _ = MessageBuilder::system_message(ctx, config)
@@ -308,9 +315,9 @@ async fn handle_subscription(
         .await?;
 
         if is_already_opted_out {
-            return Err(ModmailError::Command(CommandError::ReminderAlreadyUnsubscribed(
-                role.name.clone(),
-            )));
+            return Err(ModmailError::Command(
+                CommandError::ReminderAlreadyUnsubscribed(role.name.clone()),
+            ));
         }
 
         insert_reminder_optout(

crates/rustmail/src/commands/reminder_subscription/slash_command/reminder_subscription.rs

@@ -179,7 +179,9 @@ impl RegistrableCommand for ReminderSubscriptionCommand {
                 let message_key = if was_opted_out {
                     "reminder_subscription.subscribed"
                 } else {
-                    "reminder_subscription.already_subscribed"
+                    return Err(ModmailError::Command(
+                        CommandError::ReminderAlreadySubscribed(role.name.clone()),
+                    ));
                 };
 
                 let _ = MessageBuilder::system_message(&ctx, &config)
@@ -203,17 +205,9 @@ impl RegistrableCommand for ReminderSubscriptionCommand {
                 .await?;
 
                 if is_already_opted_out {
-                    let _ = MessageBuilder::system_message(&ctx, &config)
-                        .translated_content(
-                            "reminder_subscription.already_unsubscribed",
-                            Some(&params),
-                            Some(command.user.id),
-                            command.guild_id.map(|g| g.get()),
-                        )
-                        .await
-                        .to_channel(command.channel_id)
-                        .send_interaction_followup(&command, true)
-                        .await;
+                    return Err(ModmailError::Command(
+                        CommandError::ReminderAlreadyUnsubscribed(role.name.clone()),
+                    ));
                 } else {
                     insert_reminder_optout(
                         guild_id as i64,