CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 11:18:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Mod] Account for roles in mention spam (#5388)

Browse Source 
Co-authored-by: Kowlin <10947836+Kowlin@users.noreply.github.com>
This commit is contained in:
Vexed 2022-10-20 17:56:40 +01:00 committed by GitHub
parent a90974d659
commit 3be22b683c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
redbot/cogs/mod/events.py
View File

@ -46,12 +46,12 @@ class Events(MixinMeta):
mention_spam = await self.config.guild(guild).mention_spam.all() mention_spam = await self.config.guild(guild).mention_spam.all()
if mention_spam["strict"]: # if strict is enabled if mention_spam["strict"]: # if strict is enabled
mentions = message.raw_mentions mentions = len(message.raw_mentions) + len(message.raw_role_mentions)
else: # if not enabled else: # if not enabled
mentions = set(message.mentions) mentions = len(set(message.mentions)) + len(set(message.role_mentions))
if mention_spam["ban"]: if mention_spam["ban"]:
if len(mentions) >= mention_spam["ban"]: if mentions >= mention_spam["ban"]:
try: try:
await guild.ban(author, reason=_("Mention spam (Autoban)")) await guild.ban(author, reason=_("Mention spam (Autoban)"))
except discord.HTTPException: except discord.HTTPException:
@ -75,7 +75,7 @@ class Events(MixinMeta):
return True return True
if mention_spam["kick"]: if mention_spam["kick"]:
if len(mentions) >= mention_spam["kick"]: if mentions >= mention_spam["kick"]:
try: try:
await guild.kick(author, reason=_("Mention Spam (Autokick)")) await guild.kick(author, reason=_("Mention Spam (Autokick)"))
except discord.HTTPException: except discord.HTTPException:
@ -99,7 +99,7 @@ class Events(MixinMeta):
return True return True
if mention_spam["warn"]: if mention_spam["warn"]:
if len(mentions) >= mention_spam["warn"]: if mentions >= mention_spam["warn"]:
try: try:
await author.send(_("Please do not mass mention people!")) await author.send(_("Please do not mass mention people!"))
except (discord.HTTPException, discord.Forbidden): except (discord.HTTPException, discord.Forbidden):