From c2397bd5663acee00c984a06ced9f03dbbae5a87 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Fri, 14 Jun 2024 20:44:39 +0200 Subject: [PATCH] fix: Handle response whitelist and blacklist correctly --- src/utils/message_response.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/message_response.rs b/src/utils/message_response.rs index a828a2a..b62f02f 100644 --- a/src/utils/message_response.rs +++ b/src/utils/message_response.rs @@ -12,13 +12,13 @@ use crate::{ impl Trigger { fn matches(&self, new_message: &Message, member_roles: &[RoleId]) -> bool { if let Some(channels) = &self.channels { - if !channels.contains(&new_message.channel_id.get()) { + if channels.contains(&new_message.channel_id.get()) { return true; } } if let Some(roles) = &self.roles { - if !member_roles + if member_roles .iter() .any(|&member_role| roles.contains(&member_role.get())) { @@ -26,7 +26,7 @@ impl Trigger { } } - if !self.regex.iter().any(|r| r.is_match(&new_message.content)) { + if self.regex.iter().any(|r| r.is_match(&new_message.content)) { return true; } @@ -49,7 +49,7 @@ pub async fn handle_message_response( for response in &configuration.responses { if let Some(whitelist) = &response.whitelist { - if whitelist.matches(new_message, member_roles) { + if !whitelist.matches(new_message, member_roles) { continue; } }