From 47187c8b34a9b0035a6b9d39a70959793aa6cf10 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 5 Nov 2020 10:39:57 -0800 Subject: fix: mention parsing --- src/core/utils.rs | 6 +++++- src/modules/commands/general/fun.rs | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/core/utils.rs b/src/core/utils.rs index 2a79366..88b6197 100644 --- a/src/core/utils.rs +++ b/src/core/utils.rs @@ -159,10 +159,14 @@ pub fn check_rank>>(roles: Vec, member: T) -> bool { false } +/// Check if the passed message mentions someone other than the bot. +/// If multiple mentions occur, return `true`. pub fn check_mentions(message: &Message) -> bool { // Result<(), CommandError> + if message.content.contains("@everyone") + || message.content.contains("@here") { return true } if message.mentions.len() >= 1 { if message.mentions.len() == 1 { - if !message.mentions_user_id(BOT_ID) { return true } + if !message.mentions_user_id(BOT_BETA_ID) { return true } } else { return true } } false diff --git a/src/modules/commands/general/fun.rs b/src/modules/commands/general/fun.rs index eb3c1e1..fbcd7d5 100644 --- a/src/modules/commands/general/fun.rs +++ b/src/modules/commands/general/fun.rs @@ -34,6 +34,8 @@ impl Command for Clapify { message.channel_id.say(MENTION_FAIL)?; return Ok(()) } + // let mentions = message.mentions.len().to_owned(); + // println!("Mentions: {:?}, Content: {:?}", mentions, message.content); let to_say = args; let clapped = to_say.replace(" ", "🙏"); -- cgit v1.2.3