Merge pull request #305 from Rustmail/298-change-bot-status-with-a-command

feat(status): add command to change bot status and maintenance mode

Author: Akinator31

Cargo.lock

@@ -29,10 +29,11 @@ sha2 = "0.10.9"
 hex = "0.4.3"
 moka = { version = "0.12.11", features = ["future"] }
 tower-http = { version = "0.6.8", features = ["compression-gzip", "compression-br"] }
+strum = { version = "0.27.2", features = ["derive"] }
 
 [dependencies.uuid]
 version = "1.19.0"
 features = ["v4"]
 
 [dev-dependencies]
-cargo-husky = { version = "1.5.0", default-features = false, features = ["run-for-all", "run-cargo-fmt", "precommit-hook", "run-cargo-test", "run-cargo-check"] }
+cargo-husky = { version = "1.5.0", default-features = false, features = ["run-for-all", "run-cargo-fmt", "precommit-hook", "run-cargo-test", "run-cargo-check"] }

rustmail/Cargo.toml

@@ -134,7 +134,7 @@ pub async fn handle_external_ticket_create(
         ));
     }
 
-    if thread_exists(user_id, &db_pool).await {
+    if thread_exists_by_user(user_id, &db_pool).await {
         return if let Some(channel_id_str) = get_thread_channel_by_user_id(user_id, &db_pool).await
         {
             Err((

rustmail/src/api/handler/externals/tickets/create.rs

@@ -11,6 +11,7 @@ use serenity::prelude::TypeMapKey;
 use std::collections::HashMap;
 use std::process;
 use std::sync::Arc;
+use std::sync::atomic::AtomicBool;
 use std::time::Duration;
 use tokio::sync::Mutex;
 use tokio::{select, spawn};
@@ -36,6 +37,7 @@ pub async fn init_bot_state() -> Arc<Mutex<BotState>> {
         command_tx: command_tx.clone(),
         bot_http: None,
         bot_context: Arc::new(tokio::sync::RwLock::new(None)),
+        maintenance_mode: Arc::new(AtomicBool::new(false)),
     };
 
     Arc::new(Mutex::new(bot_state))
@@ -90,12 +92,15 @@ pub async fn run_bot(
         state_lock.db_pool.clone().expect("Database pool not set")
     };
 
-    let mut config = {
+    let (mut config, maintenance_mode) = {
         let state_lock = bot_state.lock().await;
         if state_lock.config.is_none() {
             panic!("Config not set before starting rustmail!");
         }
-        state_lock.config.clone().expect("Config not set")
+        (
+            state_lock.config.clone().expect("Config not set"),
+            state_lock.maintenance_mode.clone(),
+        )
     };
 
     let pagination = Arc::new(Mutex::new(HashMap::<String, PaginationContext>::new()));
@@ -139,6 +144,7 @@ pub async fn run_bot(
     registry.register_command(ReleaseCommand);
     registry.register_command(PingCommand);
     registry.register_command(SnippetCommand);
+    registry.register_command(StatusCommand);
 
     let registry = Arc::new(registry);
 
@@ -156,6 +162,7 @@ pub async fn run_bot(
                 registry.clone(),
                 shutdown_rx.clone(),
                 pagination.clone(),
+                maintenance_mode.clone(),
             )
             .await,
         )
@@ -168,6 +175,7 @@ pub async fn run_bot(
             registry.clone(),
             shutdown_rx,
             pagination,
+            maintenance_mode,
         ))
         .event_handler(GuildHandler::new(&config))
         .await

rustmail/src/bot.rs

@@ -105,7 +105,7 @@ impl RegistrableCommand for AddStaffCommand {
                 }
             };
 
-            if thread_exists(command.user.id, pool).await {
+            if thread_exists_by_channel(command.channel_id, pool).await {
                 match add_user_to_channel(&ctx, command.channel_id, user_id).await {
                     Ok(_) => {
                         let mut params = HashMap::new();

rustmail/src/commands/add_staff/slash_command/add_staff.rs

@@ -30,7 +30,7 @@ pub async fn add_staff(
         Err(_) => return Err(ModmailError::Command(CommandError::InvalidFormat)),
     };
 
-    if thread_exists(msg.author.id, pool).await {
+    if thread_exists_by_channel(msg.channel_id, pool).await {
         match add_user_to_channel(&ctx, msg.channel_id, user_id).await {
             Ok(_) => {
                 let mut params = HashMap::new();

rustmail/src/commands/add_staff/text_command/add_staff.rs

@@ -29,6 +29,7 @@ pub mod remove_reminder;
 pub mod remove_staff;
 pub mod reply;
 pub mod snippet;
+pub mod status;
 pub mod take;
 
 pub use add_reminder::*;
@@ -51,6 +52,7 @@ pub use remove_reminder::*;
 pub use remove_staff::*;
 pub use reply::*;
 pub use snippet::*;
+pub use status::*;
 pub use take::*;
 
 pub type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;

rustmail/src/commands/mod.rs

@@ -121,7 +121,7 @@ impl RegistrableCommand for NewThreadCommand {
                 return Err(ModmailError::Discord(DiscordError::UserIsABot));
             }
 
-            if thread_exists(user_id, pool).await {
+            if thread_exists_by_user(user_id, pool).await {
                 return if let Some(channel_id_str) =
                     get_thread_channel_by_user_id(user_id, pool).await
                 {

rustmail/src/commands/new_thread/slash_command/new_thread.rs

@@ -37,7 +37,7 @@ pub async fn new_thread(
         return Err(ModmailError::Discord(DiscordError::UserIsABot));
     }
 
-    if thread_exists(user_id, pool).await {
+    if thread_exists_by_user(user_id, pool).await {
         if let Some(channel_id_str) = get_thread_channel_by_user_id(user_id, pool).await {
             let mut params = HashMap::new();
             params.insert("user".to_string(), user.name.clone());

rustmail/src/commands/new_thread/text_command/new_thread.rs

@@ -107,7 +107,7 @@ impl RegistrableCommand for RemoveStaffCommand {
                 }
             };
 
-            if thread_exists(command.user.id, pool).await {
+            if thread_exists_by_channel(command.channel_id, pool).await {
                 match remove_user_from_channel(&ctx, command.channel_id, user_id).await {
                     Ok(_) => {
                         let mut params = HashMap::new();