Merge pull request #340 from Rustmail/329-ensure-that-discord-logs-can-be-disabled-independently-of-rustmail-logs

Akinator31 · web-flow · commit dd3fa8804f71 · 2026-01-14T09:37:29.000+01:00
refactor(logs): ensure that discord logs can be disabled independently of rustmail logs
diff --git a/crates/rustmail/src/commands/close/slash_command/close.rs b/crates/rustmail/src/commands/close/slash_command/close.rs
@@ -344,7 +344,7 @@ impl RegistrableCommand for CloseCommand {
             .await?;
             let _ = delete_scheduled_closure(&thread.id, db_pool).await;
 
-            if config.bot.enable_logs {
+            if config.bot.enable_rustmail_logs {
                 if let Some(logs_channel_id) = config.bot.logs_channel_id {
                     let base_url = config
                         .bot
diff --git a/crates/rustmail/src/commands/close/text_command/close.rs b/crates/rustmail/src/commands/close/text_command/close.rs
@@ -284,7 +284,7 @@ pub async fn close(
     .await?;
     let _ = delete_scheduled_closure(&thread.id, db_pool).await;
 
-    if config.bot.enable_logs {
+    if config.bot.enable_rustmail_logs {
         if let Some(logs_channel_id) = config.bot.logs_channel_id {
             let base_url = config
                 .bot
diff --git a/crates/rustmail/src/commands/edit/common.rs b/crates/rustmail/src/commands/edit/common.rs
@@ -26,7 +26,8 @@ mod tests {
                 close_message: "Thank you for your message!".to_string(),
                 typing_proxy_from_user: false,
                 typing_proxy_from_staff: false,
-                enable_logs: true,
+                enable_rustmail_logs: true,
+                enable_discord_logs: true,
                 enable_features: true,
                 enable_panel: false,
                 features_channel_id: Some(12345),
diff --git a/crates/rustmail/src/commands/force_close/slash_command/force_close.rs b/crates/rustmail/src/commands/force_close/slash_command/force_close.rs
@@ -94,7 +94,7 @@ impl RegistrableCommand for ForceCloseCommand {
                     }
 
                     if let Some(thread_info) = thread {
-                        if config.bot.enable_logs {
+                        if config.bot.enable_rustmail_logs {
                             if let Some(logs_channel_id) = config.bot.logs_channel_id {
                                 let base_url = config
                                     .bot
diff --git a/crates/rustmail/src/commands/force_close/text_command/force_close.rs b/crates/rustmail/src/commands/force_close/text_command/force_close.rs
@@ -36,7 +36,7 @@ pub async fn force_close(
             }
 
             if let Some(thread_info) = thread {
-                if config.bot.enable_logs {
+                if config.bot.enable_rustmail_logs {
                     if let Some(logs_channel_id) = config.bot.logs_channel_id {
                         let base_url = config
                             .bot
diff --git a/crates/rustmail/src/handlers/guild_moderation_handler.rs b/crates/rustmail/src/handlers/guild_moderation_handler.rs
@@ -110,7 +110,7 @@ impl EventHandler for GuildModerationHandler {
             }
         }
 
-        if !self.config.bot.enable_logs {
+        if !self.config.bot.enable_discord_logs {
             return;
         }
 
diff --git a/crates/rustmail/src/modules/scheduled_closures.rs b/crates/rustmail/src/modules/scheduled_closures.rs
@@ -34,7 +34,7 @@ pub fn schedule_one(ctx: &Context, config: &Config, thread_id: String, close_at:
                         .await;
                         let _ = delete_scheduled_closure(&thread_id, pool).await;
 
-                        if config_clone.bot.enable_logs {
+                        if config_clone.bot.enable_rustmail_logs {
                             if let Some(logs_channel_id) = config_clone.bot.logs_channel_id {
                                 let base_url = config_clone
                                     .bot
@@ -116,7 +116,7 @@ pub async fn hydrate_scheduled_closures(ctx: &Context, config: &Config) {
                 .await;
                 let _ = delete_scheduled_closure(&thread.id, pool).await;
 
-                if config.bot.enable_logs {
+                if config.bot.enable_rustmail_logs {
                     if let Some(logs_channel_id) = config.bot.logs_channel_id {
                         let base_url = config
                             .bot
diff --git a/crates/rustmail_panel/src/components/configuration.rs b/crates/rustmail_panel/src/components/configuration.rs
@@ -889,13 +889,26 @@ fn bot_section(props: &BotSectionProps) -> Html {
 
             <div class="grid grid-cols-3 gap-4">
                 <CheckboxInput
-                    label={i18n.t("panel.configuration.bot.enable_logs")}
-                    checked={config.bot.enable_logs}
+                    label={i18n.t("panel.configuration.bot.enable_rustmail_logs")}
+                    checked={config.bot.enable_rustmail_logs}
                     on_change={{
                         let config = config.clone();
                         Callback::from(move |val: bool| {
                             let mut cfg = (*config).clone();
-                            cfg.bot.enable_logs = val;
+                            cfg.bot.enable_rustmail_logs = val;
+                            config.set(cfg);
+                        })
+                    }}
+                />
+
+                <CheckboxInput
+                    label={i18n.t("panel.configuration.bot.enable_discord_logs")}
+                    checked={config.bot.enable_discord_logs}
+                    on_change={{
+                        let config = config.clone();
+                        Callback::from(move |val: bool| {
+                            let mut cfg = (*config).clone();
+                            cfg.bot.enable_discord_logs = val;
                             config.set(cfg);
                         })
                     }}
diff --git a/crates/rustmail_panel/src/i18n/fr/fr.json b/crates/rustmail_panel/src/i18n/fr/fr.json
@@ -51,7 +51,8 @@
         "close_message": "Message de fermeture",
         "typing_proxy_user": "Proxy de frappe (utilisateur)",
         "typing_proxy_staff": "Proxy de frappe (staff)",
-        "enable_logs": "Activer les logs",
+        "enable_rustmail_logs": "Activer les logs rustmail",
+        "enable_discord_logs": "Activer les logs discord",
         "enable_features": "Activer les features",
         "enable_panel": "Activer le panel",
         "client_id": "Client ID",
diff --git a/crates/rustmail_panel/src/pages/panel.rs b/crates/rustmail_panel/src/pages/panel.rs
@@ -57,11 +57,7 @@ pub fn panel() -> Html {
     use_effect_with((*authorized).clone(), move |auth| {
         if matches!(auth, Some(false)) {
             let win = window();
-            if let Ok(pathname) = win.location().pathname() {
-                let _ = win.location().set_href("/error?message=Access+Denied");
-            } else {
-                let _ = win.location().set_href("/api/auth/login");
-            }
+            let _ = win.location().set_href("/error?message=Access+Denied");
         }
         || ()
     });
diff --git a/crates/rustmail_types/src/config/bot.rs b/crates/rustmail_types/src/config/bot.rs
@@ -10,7 +10,8 @@ pub struct BotConfig {
     pub close_message: String,
     pub typing_proxy_from_user: bool,
     pub typing_proxy_from_staff: bool,
-    pub enable_logs: bool,
+    pub enable_rustmail_logs: bool,
+    pub enable_discord_logs: bool,
     pub enable_features: bool,
     pub enable_panel: bool,
     pub client_id: u64,
@@ -68,15 +69,18 @@ impl BotConfig {
     }
 
     pub fn validate_logs_config(&self) -> Result<(), String> {
-        match (self.enable_logs, self.logs_channel_id) {
-            (true, None) => {
+        match (
+            self.enable_rustmail_logs,
+            self.enable_discord_logs,
+            self.logs_channel_id,
+        ) {
+            (true, _, None) => {
                 Err("'logs_channel_id' field is required if 'enable_logs' is true".to_string())
             }
-            (false, Some(_)) => {
-                Err("'logs_channel_id' must not be filled in if 'enable_logs' is false".to_string())
+            (_, true, None) => {
+                Err("'logs_channel_id' field is required if 'enable_logs' is true".to_string())
             }
-            (true, Some(_)) => Ok(()),
-            (false, None) => Ok(()),
+            _ => Ok(()),
         }
     }
 
diff --git a/docs/reference/configuration.md b/docs/reference/configuration.md
@@ -28,18 +28,19 @@ Complete reference for all `config.toml` options.
 
 ### Feature Toggles
 
-| Option            | Type | Required | Default | Description                     |
-|-------------------|------|----------|---------|---------------------------------|
-| `enable_logs`     | bool | Yes      | -       | Enable logging to a channel     |
-| `enable_features` | bool | Yes      | -       | Enable feature request tracking |
-| `enable_panel`    | bool | Yes      | -       | Enable web administration panel |
+| Option                 | Type | Required | Default | Description                          |
+|------------------------|------|----------|---------|--------------------------------------|
+| `enable_rustmail_logs` | bool | Yes      | -       | Enable rustmail logging to a channel |
+| `enable_discord_logs`  | bool | Yes      | -       | Enable discord logging to a channel  |
+| `enable_features`      | bool | Yes      | -       | Enable feature request tracking      |
+| `enable_panel`         | bool | Yes      | -       | Enable web administration panel      |
 
 ### Channel Configuration
 
-| Option                | Type | Required    | Default | Description                                                        |
-|-----------------------|------|-------------|---------|--------------------------------------------------------------------|
-| `logs_channel_id`     | u64  | Conditional | -       | Channel for bot logs. Required if `enable_logs = true`             |
-| `features_channel_id` | u64  | Conditional | -       | Channel for feature requests. Required if `enable_features = true` |
+| Option                | Type | Required    | Default | Description                                                                                         |
+|-----------------------|------|-------------|---------|-----------------------------------------------------------------------------------------------------|
+| `logs_channel_id`     | u64  | Conditional | -       | Channel for bot logs. Required if `enable_rustmail_logs = true` or/and `enable_discord_logs = true` |
+| `features_channel_id` | u64  | Conditional | -       | Channel for feature requests. Required if `enable_features = true`                                  |
 
 ### OAuth2 (Panel)
 

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ impl RegistrableCommand for ForceCloseCommand {`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`if let Some(thread_info) = thread {`
`97`		`- if config.bot.enable_logs {`
	`97`	`+ if config.bot.enable_rustmail_logs {`
`98`	`98`	`if let Some(logs_channel_id) = config.bot.logs_channel_id {`
`99`	`99`	`let base_url = config`
`100`	`100`	`.bot`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ pub async fn force_close(`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`if let Some(thread_info) = thread {`
`39`		`- if config.bot.enable_logs {`
	`39`	`+ if config.bot.enable_rustmail_logs {`
`40`	`40`	`if let Some(logs_channel_id) = config.bot.logs_channel_id {`
`41`	`41`	`let base_url = config`
`42`	`42`	`.bot`
Original file line number	Diff line number	Diff line change
`@@ -110,7 +110,7 @@ impl EventHandler for GuildModerationHandler {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`- if !self.config.bot.enable_logs {`
	`113`	`+ if !self.config.bot.enable_discord_logs {`
`114`	`114`	`return;`
`115`	`115`	`}`
`116`	`116`