From 08c1581f0ec253a26d6b2e4887b9ae1e1f7e920d Mon Sep 17 00:00:00 2001 From: klemek Date: Mon, 11 Jan 2021 22:25:01 +0100 Subject: [PATCH] fixing mentions ffs --- src/scanners/scanner.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/scanners/scanner.py b/src/scanners/scanner.py index bf25fcb..53d6970 100644 --- a/src/scanners/scanner.py +++ b/src/scanners/scanner.py @@ -44,15 +44,13 @@ class Scanner(ABC): return # check args validity - str_channel_mentions = [channel.mention for channel in message.channel_mentions] - str_mentions = [member.mention for member in message.mentions] + str_channel_mentions = [channel.id for channel in message.channel_mentions] + str_mentions = [member.id for member in message.mentions] for i, arg in enumerate(args[1:]): - if re.match(r"^<@!\d+>$", arg): - arg = mention(arg[3:-1]) - args[i + 1] = arg - if re.match(r"^<#!\d+>$", arg): - arg = channel_mention(arg[3:-1]) - args[i + 1] = arg + if re.match(r"^<@!?\d+>$", arg): + arg = arg[3:-1] if "!" in arg else arg[2:-1] + if re.match(r"^<#!?\d+>$", arg): + arg = arg[3:-1] if "!" in arg else arg[2:-1] if ( arg not in self.valid_args + ["me", "here", "fast"] and (not arg.isdigit() or not self.has_digit_args)