From 3ad89618b5268c305176359f10f3a4dd87d489da Mon Sep 17 00:00:00 2001 From: Aleksei Rybin <0xalekseirybin@gmail.com> Date: Sun, 17 Mar 2024 19:57:04 +0700 Subject: [PATCH] Move check_filters to a separate trait --- src/handler.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/handler.rs b/src/handler.rs index a4484cc..619aea6 100644 --- a/src/handler.rs +++ b/src/handler.rs @@ -21,10 +21,9 @@ pub struct Handler { pub hide_usernames: bool, } -#[async_trait] -impl EventHandler for Handler { - async fn message(&self, ctx: Context, msg: Message) { - if (!self +impl Handler { + fn check_filters(&self, msg: &Message) -> bool { + (!self .allowed_guilds_ids .contains(&msg.guild_id.unwrap_or_default().0) && !self.allowed_guilds_ids.is_empty()) @@ -39,7 +38,13 @@ impl EventHandler for Handler { || (!self.allowed_users_ids.contains(&msg.author.id.0) && !self.allowed_users_ids.is_empty()) || (self.muted_users_ids.contains(&msg.author.id.0) && !self.muted_users_ids.is_empty()) - { + } +} + +#[async_trait] +impl EventHandler for Handler { + async fn message(&self, ctx: Context, msg: Message) { + if self.check_filters(&msg) { return; }