aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--discord/ext/commands/converter.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/discord/ext/commands/converter.py b/discord/ext/commands/converter.py
index df34f47f..5e767c90 100644
--- a/discord/ext/commands/converter.py
+++ b/discord/ext/commands/converter.py
@@ -436,13 +436,5 @@ class clean_content(Converter):
pattern = re.compile('|'.join(transformations.keys()))
result = pattern.sub(replace, result)
- transformations = {
- '@everyone': '@\u200beveryone',
- '@here': '@\u200bhere'
- }
-
- def repl2(obj):
- return transformations.get(obj.group(0), '')
-
- pattern = re.compile('|'.join(transformations.keys()))
- return pattern.sub(repl2, result)
+ # Completely ensure no mentions escape:
+ return re.sub(r'@(everyone|here|[!&]?[0-9]{17,21})', '@\u200b\\1', result)