' in body:
- return body
-
- if not logged_user or logged_user == 'chat' or logged_user.slurreplacer:
- body = replace_re(body, slur_regex, slur_regex_title, slur_regex_upper, sub_matcher_slurs, sub_matcher_slurs_title, sub_matcher_slurs_upper)
-
- if SITE_NAME == 'rDrama':
- if not logged_user or logged_user == 'chat' or logged_user.profanityreplacer:
- body = replace_re(body, profanity_regex, profanity_regex_title, profanity_regex_upper, sub_matcher_profanities, sub_matcher_profanities_title, sub_matcher_profanities_upper)
-
- return body
-
commands = {
"fortune": FORTUNE_REPLIES,
"factcheck": FACTCHECK_REPLIES,
diff --git a/files/helpers/sharpen.py b/files/helpers/sharpen.py
index 6f52dfeb80..04903ec539 100644
--- a/files/helpers/sharpen.py
+++ b/files/helpers/sharpen.py
@@ -1,4 +1,3 @@
-import re
from files.helpers.regex import *
def sharpen(string):
diff --git a/files/helpers/slurs_and_profanities.py b/files/helpers/slurs_and_profanities.py
new file mode 100644
index 0000000000..eb121f9da9
--- /dev/null
+++ b/files/helpers/slurs_and_profanities.py
@@ -0,0 +1,167 @@
+import re
+from .config.const import *
+
+tranny = f'
'
+trannie = f''
+troon = f'
'
+
+def replace_train_html(body):
+ body = body.replace(tranny, ':marseytrain:')
+ body = body.replace(trannie, ':!marseytrain:')
+ body = body.replace(troon, ':marseytrain2:')
+ return body
+
+SLURS = {
+ "tranny": tranny,
+ "trannie": trannie,
+ "troon": troon,
+ "(?]*>|{slur_single_words}", flags=re.I|re.A)
+profanity_regex = re.compile(f"<[^>]*>|{profanity_single_words}", flags=re.I|re.A)
+
+SLURS_FOR_REPLACING = {}
+for k, val in SLURS.items():
+ newkey = k.split('(?!')[0]
+ if ')' in newkey:
+ newkey = newkey.split(')')[1]
+ SLURS_FOR_REPLACING[newkey] = val
+ SLURS_FOR_REPLACING[newkey.title()] = val.title()
+ SLURS_FOR_REPLACING[newkey.upper()] = val.upper()
+
+PROFANITIES_FOR_REPLACING = {}
+for k, val in PROFANITIES.items():
+ newkey = k.split('(?!')[0]
+ if ')' in newkey:
+ newkey = newkey.split(')')[1]
+ PROFANITIES_FOR_REPLACING[newkey] = val
+ PROFANITIES_FOR_REPLACING[newkey.title()] = val.title()
+ PROFANITIES_FOR_REPLACING[newkey.upper()] = val.upper()
+
+
+
+def sub_matcher(match, X_FOR_REPLACING):
+ group_num = 0
+ match_str = match.group(group_num)
+ if match_str.startswith('<'):
+ return match_str
+ else:
+ repl = X_FOR_REPLACING[match_str]
+ return repl
+
+def sub_matcher_slurs(match):
+ return sub_matcher(match, SLURS_FOR_REPLACING)
+
+def sub_matcher_profanities(match):
+ return sub_matcher(match, PROFANITIES_FOR_REPLACING)
+
+
+
+def censor_slurs_profanities(body, logged_user):
+ if not body: return ""
+
+ if '' in body or '' in body:
+ return body
+
+ if not logged_user or logged_user == 'chat' or logged_user.slurreplacer:
+ body = slur_regex.sub(sub_matcher_slurs, body)
+
+ if SITE_NAME == 'rDrama':
+ if not logged_user or logged_user == 'chat' or logged_user.profanityreplacer:
+ body = profanity_regex.sub(sub_matcher_profanities, body)
+
+ return body
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 8cb2e3a605..abeed62c91 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -11,6 +11,7 @@ from files.helpers.actions import *
from files.helpers.alerts import *
from files.helpers.cloudflare import *
from files.helpers.config.const import *
+from files.helpers.slurs_and_profanities import censor_slurs_profanities
from files.helpers.get import *
from files.helpers.media import *
from files.helpers.sanitize import *
@@ -909,7 +910,7 @@ def admin_title_change(user_id, v):
user.customtitleplain = new_name
new_name = filter_emojis_only(new_name)
- new_name = censor_slurs(new_name, None)
+ new_name = censor_slurs_profanities(new_name, None)
user = get_account(user.id)
user.customtitle=new_name
diff --git a/files/routes/awards.py b/files/routes/awards.py
index 9ff7694dd5..8e6500d072 100644
--- a/files/routes/awards.py
+++ b/files/routes/awards.py
@@ -9,6 +9,7 @@ from files.classes.userblock import UserBlock
from files.helpers.actions import *
from files.helpers.alerts import *
from files.helpers.config.const import *
+from files.helpers.slurs_and_profanities import censor_slurs_profanities
from files.helpers.config.awards import AWARDS_ENABLED, HOUSE_AWARDS, LOOTBOX_ITEM_COUNT, LOOTBOX_CONTENTS
from files.helpers.get import *
from files.helpers.marsify import marsify
@@ -394,7 +395,7 @@ def award_thing(v, thing_type, id):
else:
author.customtitleplain = new_name
new_name = filter_emojis_only(new_name)
- new_name = censor_slurs(new_name, None)
+ new_name = censor_slurs_profanities(new_name, None)
if len(new_name) > 1000: abort(403)
author.customtitle = new_name
author.flairchanged = int(time.time()) + 86400
diff --git a/files/routes/chat.py b/files/routes/chat.py
index 5ab422259d..d76466069d 100644
--- a/files/routes/chat.py
+++ b/files/routes/chat.py
@@ -9,6 +9,7 @@ from flask import request
from files.helpers.actions import *
from files.helpers.alerts import *
from files.helpers.config.const import *
+from files.helpers.slurs_and_profanities import censor_slurs_profanities
from files.helpers.regex import *
from files.helpers.media import *
from files.helpers.sanitize import *
@@ -167,9 +168,9 @@ def speak(data, v):
"namecolor": v.name_color,
"patron": v.patron,
"text": text,
- "text_censored": censor_slurs(text, 'chat'),
+ "text_censored": censor_slurs_profanities(text, 'chat'),
"text_html": text_html,
- "text_html_censored": censor_slurs(text_html, 'chat'),
+ "text_html_censored": censor_slurs_profanities(text_html, 'chat'),
"time": int(time.time()),
}
diff --git a/files/routes/settings.py b/files/routes/settings.py
index fcd27ba7d9..c0140aca92 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -12,6 +12,7 @@ from sqlalchemy.orm import load_only
from files.helpers.actions import *
from files.helpers.alerts import *
from files.helpers.config.const import *
+from files.helpers.slurs_and_profanities import censor_slurs_profanities
from files.helpers.get import *
from files.helpers.mail import *
from files.helpers.media import *
@@ -908,7 +909,7 @@ def settings_title_change(v):
if customtitleplain:
customtitle = filter_emojis_only(customtitleplain)
- customtitle = censor_slurs(customtitle, None)
+ customtitle = censor_slurs_profanities(customtitle, None)
if len(customtitle) > 1000:
abort(400, "Flair too long!")