Merge pull request #306 from Rustmail/297-change-bot-status-via-configuration-tab-on-panel

feat(status): change bot status via configuration tab on panel

Author: Akinator31

rustmail/src/api/handler/bot/status.rs

@@ -1,22 +1,115 @@
+use crate::commands::status::BotStatus as PresenceStatus;
+use crate::i18n::get_translated_message;
 use crate::prelude::types::*;
 use axum::Json;
 use axum::extract::State;
 use axum::http::StatusCode;
 use axum::response::IntoResponse;
+use serenity::all::ActivityData;
+use std::str::FromStr;
 use std::sync::Arc;
+use std::sync::atomic::Ordering;
 use tokio::sync::Mutex;
 
 pub async fn handle_status_bot(State(bot_state): State<Arc<Mutex<BotState>>>) -> impl IntoResponse {
     let state_lock = bot_state.lock().await;
+    let presence_status = state_lock.presence_status.read().await.clone();
 
     match state_lock.status {
         BotStatus::Running { .. } => (
             StatusCode::OK,
-            Json(serde_json::json!({"status": "running"})),
+            Json(serde_json::json!({
+                "status": "running",
+                "presence": presence_status
+            })),
         ),
         BotStatus::Stopped => (
             StatusCode::OK,
-            Json(serde_json::json!({"status": "stopped"})),
+            Json(serde_json::json!({
+                "status": "stopped",
+                "presence": presence_status
+            })),
         ),
     }
 }
+
+#[derive(serde::Deserialize)]
+pub struct PresenceStatusRequest {
+    pub status: String,
+}
+
+pub async fn handle_set_presence(
+    State(bot_state): State<Arc<Mutex<BotState>>>,
+    Json(payload): Json<PresenceStatusRequest>,
+) -> impl IntoResponse {
+    let presence = match PresenceStatus::from_str(&payload.status) {
+        Ok(s) => s,
+        Err(_) => {
+            return (
+                StatusCode::BAD_REQUEST,
+                Json(serde_json::json!({"error": "Invalid status value"})),
+            );
+        }
+    };
+
+    let state_lock = bot_state.lock().await;
+
+    let ctx_guard = state_lock.bot_context.read().await;
+    let ctx = match ctx_guard.as_ref() {
+        Some(c) => c,
+        None => {
+            return (
+                StatusCode::SERVICE_UNAVAILABLE,
+                Json(serde_json::json!({"error": "Bot is not running"})),
+            );
+        }
+    };
+
+    let config = match &state_lock.config {
+        Some(c) => c.clone(),
+        None => {
+            return (
+                StatusCode::INTERNAL_SERVER_ERROR,
+                Json(serde_json::json!({"error": "Config not loaded"})),
+            );
+        }
+    };
+
+    match presence {
+        PresenceStatus::Online => {
+            state_lock.maintenance_mode.store(false, Ordering::Relaxed);
+            ctx.set_activity(Some(ActivityData::playing(&config.bot.status)));
+            ctx.online();
+        }
+        PresenceStatus::Idle => {
+            ctx.idle();
+        }
+        PresenceStatus::Dnd => {
+            ctx.dnd();
+        }
+        PresenceStatus::Invisible => {
+            ctx.invisible();
+        }
+        PresenceStatus::Maintenance => {
+            state_lock.maintenance_mode.store(true, Ordering::Relaxed);
+            let maintenance_status = futures::executor::block_on(get_translated_message(
+                &config,
+                "status.maintenance_activity",
+                None,
+                None,
+                None,
+                None,
+            ));
+            ctx.set_activity(Some(ActivityData::playing(&maintenance_status)));
+            ctx.dnd();
+        }
+    }
+
+    let mut presence_guard = state_lock.presence_status.write().await;
+    *presence_guard = payload.status.clone();
+
+    (
+        StatusCode::OK,
+        Json(serde_json::json!({"status": payload.status})),
+    )
+}

rustmail/src/api/routes/bot.rs

@@ -11,6 +11,7 @@ pub fn create_bot_router(bot_state: Arc<Mutex<BotState>>) -> Router<Arc<Mutex<Bo
         .route("/start", post(handle_start_bot))
         .route("/stop", post(handle_stop_bot))
         .route("/restart", post(handle_restart_bot))
+        .route("/presence", post(handle_set_presence))
         .layer(axum::middleware::from_fn_with_state(
             bot_state.clone(),
             move |state, jar, req, next| {

rustmail/src/bot.rs

@@ -38,6 +38,7 @@ pub async fn init_bot_state() -> Arc<Mutex<BotState>> {
         bot_http: None,
         bot_context: Arc::new(tokio::sync::RwLock::new(None)),
         maintenance_mode: Arc::new(AtomicBool::new(false)),
+        presence_status: Arc::new(tokio::sync::RwLock::new("online".to_string())),
     };
 
     Arc::new(Mutex::new(bot_state))

rustmail/src/types/bot.rs

@@ -28,4 +28,5 @@ pub struct BotState {
     pub bot_http: Option<Arc<Http>>,
     pub bot_context: Arc<RwLock<Option<Context>>>,
     pub maintenance_mode: Arc<AtomicBool>,
+    pub presence_status: Arc<RwLock<String>>,
 }

rustmail_panel/src/components/configuration.rs

@@ -12,6 +12,7 @@ pub fn configuration_page() -> Html {
     let (i18n, _set_language) = use_translation();
 
     let bot_status = use_state(|| "running".to_string());
+    let presence_status = use_state(|| "online".to_string());
     let is_loading = use_state(|| false);
     let config = use_state(|| None::<ConfigResponse>);
     let config_loading = use_state(|| true);
@@ -52,6 +53,7 @@ pub fn configuration_page() -> Html {
 
     {
         let bot_status = bot_status.clone();
+        let presence_status = presence_status.clone();
         let is_loading = is_loading.clone();
 
         use_effect_with((), move |_| {
@@ -63,6 +65,9 @@ pub fn configuration_page() -> Html {
                             if let Some(status) = json["status"].as_str() {
                                 bot_status.set(status.to_string());
                             }
+                            if let Some(presence) = json["presence"].as_str() {
+                                presence_status.set(presence.to_string());
+                            }
                         }
                     }
                 }
@@ -117,6 +122,30 @@ pub fn configuration_page() -> Html {
         })
     };
 
+    let handle_presence_change = {
+        let presence_status = presence_status.clone();
+        let is_loading = is_loading.clone();
+
+        Callback::from(move |new_presence: String| {
+            let presence_status = presence_status.clone();
+            let is_loading = is_loading.clone();
+
+            spawn_local(async move {
+                is_loading.set(true);
+                if let Ok(req) = Request::post("/api/bot/presence")
+                    .json(&serde_json::json!({"status": new_presence}))
+                {
+                    if let Ok(resp) = req.send().await {
+                        if resp.ok() {
+                            presence_status.set(new_presence);
+                        }
+                    }
+                }
+                is_loading.set(false);
+            });
+        })
+    };
+
     let handle_save = {
         let show_restart_modal = show_restart_modal.clone();
         let save_message = save_message.clone();
@@ -212,7 +241,7 @@ pub fn configuration_page() -> Html {
                         </div>
                     </div>
 
-                    <div class="flex flex-wrap gap-3">
+                    <div class="flex flex-wrap gap-3 mb-4">
                         <button
                             onclick={{
                                 let handle_bot_action = handle_bot_action.clone();
@@ -256,6 +285,41 @@ pub fn configuration_page() -> Html {
                             {i18n.t("panel.configuration.restart_bot")}
                         </button>
                     </div>
+
+                    <div class="border-t border-slate-600 pt-4">
+                        <label class="block text-sm text-gray-300 mb-2">{i18n.t("panel.configuration.presence_status")}</label>
+                        <div class="flex items-center gap-3">
+                            <select
+                                value={(*presence_status).clone()}
+                                disabled={*is_loading || *bot_status == "stopped"}
+                                onchange={{
+                                    let handle_presence_change = handle_presence_change.clone();
+                                    move |e: Event| {
+                                        if let Some(select) = e.target_dyn_into::<web_sys::HtmlSelectElement>() {
+                                            handle_presence_change.emit(select.value());
+                                        }
+                                    }
+                                }}
+                                class="px-4 py-2 bg-slate-900/50 border border-slate-600 rounded-md text-white focus:outline-none focus:ring-2 focus:ring-blue-500 disabled:opacity-50 disabled:cursor-not-allowed"
+                            >
+                                <option value="online" selected={*presence_status == "online"}>{i18n.t("panel.configuration.presence.online")}</option>
+                                <option value="idle" selected={*presence_status == "idle"}>{i18n.t("panel.configuration.presence.idle")}</option>
+                                <option value="dnd" selected={*presence_status == "dnd"}>{i18n.t("panel.configuration.presence.dnd")}</option>
+                                <option value="invisible" selected={*presence_status == "invisible"}>{i18n.t("panel.configuration.presence.invisible")}</option>
+                                <option value="maintenance" selected={*presence_status == "maintenance"}>{i18n.t("panel.configuration.presence.maintenance")}</option>
+                            </select>
+                            <div class={classes!(
+                                "w-3", "h-3", "rounded-full",
+                                match (*presence_status).as_str() {
+                                    "online" => "bg-green-500",
+                                    "idle" => "bg-yellow-500",
+                                    "dnd" | "maintenance" => "bg-red-500",
+                                    "invisible" => "bg-gray-500",
+                                    _ => "bg-green-500"
+                                }
+                            )}></div>
+                        </div>
+                    </div>
                 </div>
 
                 <div class="bg-slate-800/50 border border-slate-700 rounded-lg p-6">

rustmail_panel/src/i18n/en/en.json

@@ -131,6 +131,14 @@
         "message": "The changes have been saved. Would you like to restart the bot now to apply the changes?",
         "yes": "Yes, restart",
         "later": "Later"
+      },
+      "presence_status": "Presence Status",
+      "presence": {
+        "online": "Online",
+        "idle": "Idle",
+        "dnd": "Do Not Disturb",
+        "invisible": "Invisible",
+        "maintenance": "Maintenance"
       }
     },
     "tickets": {

rustmail_panel/src/i18n/fr/fr.json

@@ -131,6 +131,14 @@
         "message": "Les modifications ont été sauvegardées. Voulez-vous redémarrer le bot maintenant pour appliquer les changements ?",
         "yes": "Oui, redémarrer",
         "later": "Plus tard"
+      },
+      "presence_status": "Statut de présence",
+      "presence": {
+        "online": "En ligne",
+        "idle": "Inactif",
+        "dnd": "Ne pas déranger",
+        "invisible": "Invisible",
+        "maintenance": "Maintenance"
       }
     },
     "tickets": {