Merge pull request #165 from Rustmail/157-extend-add_staff-command-to-work-with-user-context-menus

feat(commands): add user context to add_staff command

Author: Akinator31

src/commands/add_staff/slash_command/add_staff.rs

@@ -4,13 +4,13 @@ use crate::config::Config;
 use crate::db::thread_exists;
 use crate::errors::CommandError::InvalidFormat;
 use crate::errors::ThreadError::NotAThreadChannel;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult};
+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,
+    CommandDataOptionValue, CommandInteraction, CommandOptionType, CommandType, Context,
+    CreateCommand, CreateCommandOption, ResolvedOption,
 };
 use std::collections::HashMap;
 
@@ -52,6 +52,7 @@ impl RegistrableCommand for AddStaffCommand {
                         CreateCommandOption::new(CommandOptionType::User, "user_id", user_id_desc)
                             .required(true),
                     ),
+                CreateCommand::new("add_staff").kind(CommandType::User),
             ]
         })
     }
@@ -89,7 +90,15 @@ impl RegistrableCommand for AddStaffCommand {
                         )));
                     }
                 },
-                None => return Err(ModmailError::Command(CommandError::MissingArguments)),
+                None => {
+                    if let Some(user_id) = command.data.target_id {
+                        user_id.to_user_id()
+                    } else {
+                        return Err(ModmailError::Command(CommandError::InvalidArguments(
+                            "user_id".to_string(),
+                        )));
+                    }
+                }
             };
 
             if thread_exists(command.user.id, pool).await {

src/commands/alert/common.rs

@@ -2,7 +2,7 @@ use crate::config::Config;
 use crate::db::{cancel_alert_for_staff, get_user_id_from_channel_id, set_alert_for_staff};
 use crate::errors::DatabaseError::QueryFailed;
 use crate::errors::DiscordError::ApiError;
-use crate::errors::{common, ModmailError, ModmailResult};
+use crate::errors::{ModmailError, ModmailResult, common};
 use crate::utils::message::message_builder::MessageBuilder;
 use serenity::all::colours::branding::GREEN;
 use serenity::all::{CommandInteraction, Context, CreateInteractionResponse, Message};

src/commands/alert/slash_command/alert.rs

@@ -4,7 +4,7 @@ use crate::commands::alert::common::{
 };
 use crate::commands::{BoxFuture, RegistrableCommand};
 use crate::config::Config;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult};
+use crate::errors::{CommandError, ModmailError, ModmailResult, common};
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response;
 use serenity::all::{

src/commands/close/slash_command/close.rs

@@ -4,7 +4,7 @@ use crate::config::Config;
 use crate::db::{
     close_thread, delete_scheduled_closure, get_scheduled_closure, upsert_scheduled_closure,
 };
-use crate::errors::{common, CommandError, ModmailError, ModmailResult};
+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;

src/commands/delete/slash_command/delete.rs

@@ -4,7 +4,7 @@ use crate::commands::delete::common::{
 };
 use crate::commands::{BoxFuture, RegistrableCommand};
 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/edit/slash_command/edit.rs

@@ -4,7 +4,7 @@ use crate::commands::{BoxFuture, RegistrableCommand};
 use crate::config::Config;
 use crate::db::{get_thread_message_by_inbox_message_id, update_message_content};
 use crate::errors::common::message_not_found;
-use crate::errors::{common, ModmailResult};
+use crate::errors::{ModmailResult, common};
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response;
 use crate::utils::conversion::hex_string_to_int::hex_string_to_int;

src/commands/force_close/slash_command/force_close.rs

@@ -4,7 +4,7 @@ use crate::config::Config;
 use crate::db::threads::{is_a_ticket_channel, is_orphaned_thread_channel};
 use crate::errors::DatabaseError::QueryFailed;
 use crate::errors::ThreadError::{NotAThreadChannel, UserStillInServer};
-use crate::errors::{common, ModmailError, ModmailResult};
+use crate::errors::{ModmailError, ModmailResult, common};
 use crate::i18n::get_translated_message;
 use serenity::all::{CommandInteraction, Context, CreateCommand, ResolvedOption};
 

src/commands/new_thread/slash_command/new_thread.rs

@@ -3,7 +3,7 @@ use crate::commands::{BoxFuture, RegistrableCommand};
 use crate::config::Config;
 use crate::db::{create_thread_for_user, get_thread_channel_by_user_id, thread_exists};
 use crate::errors::{
-    common, CommandError, DatabaseError, DiscordError, ModmailError, ModmailResult,
+    CommandError, DatabaseError, DiscordError, ModmailError, ModmailResult, common,
 };
 use crate::i18n::get_translated_message;
 use crate::utils::command::defer_response::defer_response;

src/commands/recover/slash_command/recover.rs

@@ -1,6 +1,6 @@
 use crate::commands::{BoxFuture, RegistrableCommand};
 use crate::config::Config;
-use crate::errors::{common, ModmailResult};
+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;

src/commands/remove_staff/slash_command/remove_staff.rs

@@ -4,7 +4,7 @@ use crate::config::Config;
 use crate::db::thread_exists;
 use crate::errors::CommandError::InvalidFormat;
 use crate::errors::ThreadError::NotAThreadChannel;
-use crate::errors::{common, CommandError, ModmailError, ModmailResult};
+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;