klemek/discord-analyst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing mentions ffs

Browse Source
This commit is contained in:
klemek
2021-01-11 22:25:01 +01:00
parent dd2597a926
commit 08c1581f0e
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/scanners/scanner.py
+6 -8
View File
@@ -44,15 +44,13 @@ class Scanner(ABC):
return return
# check args validity # check args validity
str_channel_mentions = [channel.mention for channel in message.channel_mentions] str_channel_mentions = [channel.id for channel in message.channel_mentions]
str_mentions = [member.mention for member in message.mentions] str_mentions = [member.id for member in message.mentions]
for i, arg in enumerate(args[1:]): for i, arg in enumerate(args[1:]):
if re.match(r"^<@!\d+>$", arg): if re.match(r"^<@!?\d+>$", arg):
arg = mention(arg[3:-1]) arg = arg[3:-1] if "!" in arg else arg[2:-1]
args[i + 1] = arg if re.match(r"^<#!?\d+>$", arg):
if re.match(r"^<#!\d+>$", arg): arg = arg[3:-1] if "!" in arg else arg[2:-1]
arg = channel_mention(arg[3:-1])
args[i + 1] = arg
if ( if (
arg not in self.valid_args + ["me", "here", "fast"] arg not in self.valid_args + ["me", "here", "fast"]
and (not arg.isdigit() or not self.has_digit_args) and (not arg.isdigit() or not self.has_digit_args)