moved permission check outside

marcelropos · Feb 18, 2024 · bc99d18 · bc99d18
1 parent 63d77cc
commit bc99d18
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/bot/commands.rs b/src/bot/commands.rs
@@ -110,5 +110,11 @@ pub async fn setup(
     number: Option<u32>,
     #[rest] rest: Option<String>,
 ) -> Result<(), Error> {
+    // Check permissions
+    if !checks::is_owner(ctx).await && !checks::is_admin(ctx).await {
+        ctx.say("Missing permissions, requires admin permissions")
+            .await?;
+        return Ok(());
+    }
     setup_command::setup(ctx, role_mention, channel_mention, flag, number, rest).await
 }
diff --git a/src/bot/setup_command.rs b/src/bot/setup_command.rs
@@ -1,7 +1,7 @@
 use poise::serenity_prelude::{GuildChannel, GuildId, Mentionable, Role};
 use time::Time;
 
-use crate::bot::{checks, Context, Error};
+use crate::bot::{Context, Error};
 use crate::mysql_lib;
 use crate::mysql_lib::{DatabaseGuild, NewGuild};
 
@@ -1480,13 +1480,6 @@ pub async fn setup(
             number = Some(flag.into());
         }
     }
-    // Check permissions
-    if !checks::is_owner(ctx).await && !checks::is_admin(ctx).await {
-        ctx.say("Missing permissions, requires admin permissions")
-            .await?;
-        return Ok(());
-    }
-
     let guild_id = ctx.guild_id().unwrap();
 
     let db = &ctx.data().database_pool;