diff options
| author |  Mark <[email protected]> | 2020-09-03 11:35:49 -0700 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2020-09-03 11:35:49 -0700 |
| commit | 07b5f23451a6dd6c4c7e07b304d21429f47aaa16 (patch) | |
| tree | 0e2c6730163e625c20ce4c81a7b19f310fa6545f | |
| parent | Merge pull request #1135 from MrAwesomeRocks/feat/filter/1131/everyone-ping-r... (diff) | |
| parent | AntiSpam: ignore custom emojis in code blocks (diff) | |
Merge pull request #1132 from python-discord/bug/filters/1130/ignore-codeblock-emoji
AntiSpam: ignore custom emojis in code blocks
| -rw-r--r-- | bot/rules/discord_emojis.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bot/rules/discord_emojis.py b/bot/rules/discord_emojis.py index 5bab514f2..6e47f0197 100644 --- a/bot/rules/discord_emojis.py +++ b/bot/rules/discord_emojis.py @@ -5,6 +5,7 @@ from discord import Member, Message DISCORD_EMOJI_RE = re.compile(r"<:\w+:\d+>") +CODE_BLOCK_RE = re.compile(r"```.*?```", flags=re.DOTALL) async def apply( @@ -17,8 +18,9 @@ async def apply( if msg.author == last_message.author ) + # Get rid of code blocks in the message before searching for emojis. total_emojis = sum( - len(DISCORD_EMOJI_RE.findall(msg.content)) + len(DISCORD_EMOJI_RE.findall(CODE_BLOCK_RE.sub("", msg.content))) for msg in relevant_messages ) |