Merge pull request #147 from Rustmail/convert_to_slash_commands

feat(commands): convert all text commands to slash commands

Author: Akinator31

…62b6fa777fdaec8a293806b1fd0ba0dc179.json …37cb134188aef7633582c9da2dfb1f74111.json.sqlx/query-b66e338803cb2416fc50708e8f76a62b6fa777fdaec8a293806b1fd0ba0dc179.json renamed to .sqlx/query-bfdec0459ceac78eb020cecca945937cb134188aef7633582c9da2dfb1f74111.json .sqlx/query-b66e338803cb2416fc50708e8f76a62b6fa777fdaec8a293806b1fd0ba0dc179.json renamed to .sqlx/query-bfdec0459ceac78eb020cecca945937cb134188aef7633582c9da2dfb1f74111.json

@@ -0,0 +1,43 @@
+use crate::config::Config;
+use crate::errors::ModmailResult;
+use serenity::all::{
+    ChannelId, Context, Message, PermissionOverwrite, PermissionOverwriteType, UserId,
+};
+use serenity::model::Permissions;
+
+pub async fn add_user_to_channel(
+    ctx: &Context,
+    channel_id: ChannelId,
+    user_id: UserId,
+) -> ModmailResult<()> {
+    let allow = Permissions::VIEW_CHANNEL | Permissions::SEND_MESSAGES;
+
+    channel_id
+        .create_permission(
+            &ctx.http,
+            PermissionOverwrite {
+                allow,
+                deny: Permissions::empty(),
+                kind: PermissionOverwriteType::Member(user_id),
+            },
+        )
+        .await?;
+
+    Ok(())
+}
+
+pub async fn extract_user_id(msg: &Message, config: &Config) -> String {
+    let content = msg.content.trim();
+    let prefix = &config.command.prefix;
+    let command_names = ["add_staff", "as"];
+
+    if command_names
+        .iter()
+        .any(|&name| content.starts_with(&format!("{}{}", prefix, name)))
+    {
+        let start = prefix.len() + command_names[0].len();
+        content[start..].trim().to_string()
+    } else {
+        String::new()
+    }
+}

package-lock.json

@@ -0,0 +1,3 @@
+pub mod common;
+pub mod slash_command;
+pub mod text_command;

src/commands/add_staff/common.rs

@@ -0,0 +1,96 @@
+use crate::commands::add_staff::common::add_user_to_channel;
+use crate::config::Config;
+use crate::db::thread_exists;
+use crate::errors::CommandError::InvalidFormat;
+use crate::errors::ThreadError::NotAThreadChannel;
+use crate::errors::{CommandError, 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 async fn register(config: &Config) -> CreateCommand {
+    let cmd_desc = get_translated_message(
+        config,
+        "slash_command.add_staff_command_description",
+        None,
+        None,
+        None,
+        None,
+    )
+    .await;
+    let user_id_desc = get_translated_message(
+        config,
+        "slash_command.add_staff_user_id_argument",
+        None,
+        None,
+        None,
+        None,
+    )
+    .await;
+
+    CreateCommand::new("add_staff")
+        .description(cmd_desc)
+        .add_option(
+            CreateCommandOption::new(CommandOptionType::User, "user_id", user_id_desc)
+                .required(true),
+        )
+}
+
+pub async fn run(
+    ctx: &Context,
+    command: &CommandInteraction,
+    _options: &[ResolvedOption<'_>],
+    config: &Config,
+) -> ModmailResult<()> {
+    let pool = config
+        .db_pool
+        .as_ref()
+        .ok_or_else(common::database_connection_failed)?;
+
+    defer_response(&ctx, &command).await?;
+
+    let user_id = match command
+        .data
+        .options
+        .iter()
+        .find(|opt| opt.name == "user_id")
+    {
+        Some(opt) => match &opt.value {
+            CommandDataOptionValue::User(user_id) => *user_id,
+            _ => {
+                return Err(ModmailError::Command(CommandError::InvalidArguments(
+                    "user_id".to_string(),
+                )));
+            }
+        },
+        None => return Err(ModmailError::Command(CommandError::MissingArguments)),
+    };
+
+    if thread_exists(command.user.id, pool).await {
+        match add_user_to_channel(ctx, command.channel_id, user_id).await {
+            Ok(_) => {
+                let mut params = HashMap::new();
+                params.insert("user".to_string(), format!("<@{}>", user_id));
+
+                let response = MessageBuilder::system_message(ctx, config)
+                    .translated_content("add_staff.add_success", Some(&params), None, None)
+                    .await
+                    .to_channel(command.channel_id)
+                    .build_interaction_message_followup()
+                    .await;
+
+                let _ = command.create_followup(&ctx.http, response).await;
+
+                Ok(())
+            }
+            Err(..) => Err(ModmailError::Command(InvalidFormat)),
+        }
+    } else {
+        Err(ModmailError::Thread(NotAThreadChannel))
+    }
+}

src/commands/add_staff/mod.rs

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

src/commands/add_staff/slash_command/add_staff.rs

@@ -1,52 +1,14 @@
+use crate::commands::add_staff::common::add_user_to_channel;
+use crate::commands::add_staff::common::extract_user_id;
 use crate::config::Config;
 use crate::db::thread_exists;
 use crate::errors::CommandError::InvalidFormat;
 use crate::errors::ThreadError::NotAThreadChannel;
 use crate::errors::{ModmailError, ModmailResult, common};
 use crate::utils::message::message_builder::MessageBuilder;
-use serenity::all::{
-    ChannelId, Context, Message, PermissionOverwrite, PermissionOverwriteType, UserId,
-};
-use serenity::model::Permissions;
+use serenity::all::{Context, Message, UserId};
 use std::collections::HashMap;
 
-async fn add_user_to_channel(
-    ctx: &Context,
-    channel_id: ChannelId,
-    user_id: UserId,
-) -> ModmailResult<()> {
-    let allow = Permissions::VIEW_CHANNEL | Permissions::SEND_MESSAGES;
-
-    channel_id
-        .create_permission(
-            &ctx.http,
-            PermissionOverwrite {
-                allow,
-                deny: Permissions::empty(),
-                kind: PermissionOverwriteType::Member(user_id),
-            },
-        )
-        .await?;
-
-    Ok(())
-}
-
-async fn extract_user_id(msg: &Message, config: &Config) -> String {
-    let content = msg.content.trim();
-    let prefix = &config.command.prefix;
-    let command_names = ["add_staff", "as"];
-
-    if command_names
-        .iter()
-        .any(|&name| content.starts_with(&format!("{}{}", prefix, name)))
-    {
-        let start = prefix.len() + command_names[0].len();
-        content[start..].trim().to_string()
-    } else {
-        String::new()
-    }
-}
-
 pub async fn add_staff(ctx: &Context, msg: &Message, config: &Config) -> ModmailResult<()> {
     let pool = config
         .db_pool

src/commands/add_staff/slash_command/mod.rs

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