Make permissions checking and notification separate functions

src/framework/commands/permissions.rs

@@ -7,4 +7,8 @@ use crate::framework::commands::{CommandError, context::CommandContext};
 #[async_trait]
 pub trait Permission<S: Send + Sync + 'static>: Debug {
     async fn check(&self, ctx: &CommandContext<S>) -> Result<bool, CommandError>;
+    
+    async fn on_handle_denied(&self, _ctx: &CommandContext<S>) -> Result<(), CommandError> {
+        Ok(())
+    }
 }

src/framework/commands/runner.rs

@@ -39,6 +39,7 @@ impl<T: Send + Sync + 'static> OnMessageHandler<T> for CommandRunner {
                             .await
                             .inspect_err(|e| log::error!("Permission check failed: {e}"))?
                         {
+                            permission.on_handle_denied(&ctx).await?;
                             return Ok(());
                         }
                     }

src/groups/calls/permissions.rs

@@ -19,6 +19,13 @@ impl Permission<State> for NotBannedPermission {
             .map_err(|_| CommandError::DatabaseQueryFailed)?;
 
         if incidents.iter().any(|i| i.is_active()) {
+            Ok(false)
+        } else {
+            Ok(true)
+        }
+    }
+
+    async fn on_handle_denied(&self, ctx: &CommandContext<State>) -> Result<(), CommandError> {
         ctx.send()
             .content("❌ You've been banned from Payphone.")
             .component(CodeOfConductButton, 1)
@@ -29,9 +36,6 @@ impl Permission<State> for NotBannedPermission {
             })
             .map_err(|_| CommandError::MessageSendingFailed)?;
 
-            Ok(false)
+        Ok(())
-        } else {
-            Ok(true)
-        }
     }
 }

src/groups/mod.rs

@@ -18,3 +18,4 @@ pub mod about;
 pub mod calls;
 pub mod gateway;
 pub mod servers;
+pub mod moderation;

src/groups/servers/permissions.rs

@@ -20,17 +20,7 @@ pub struct ServerModeratorPermission;
 
 #[async_trait]
 impl Permission<State> for ServerModeratorPermission {
-    async fn check(&self, ctx: &CommandContext<State>) -> Result<bool, CommandError> {
+    async fn check(&self, _ctx: &CommandContext<State>) -> Result<bool, CommandError> {
-        let member = ctx
-            .rt
-            .http
-            .guild_member(ctx.event.guild_id.unwrap(), ctx.event.author.id)
-            .await
-            .map_err(CommandError::DiscordAPIFailed)?
-            .model()
-            .await
-            .map_err(CommandError::DiscordDeserializationFailed)?;
-
         Ok(true)
     }
 }