rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests Packages Releases Wiki Activity

dont show <img loading="lazy" data-bs-toggle="tooltip" alt=":marseytrain2:" title=":marseytrain2:" src="https://i.rdrama.net/e/marseytrain2.webp"> when its not rendered

pull/210/head
Aevann 2023-09-26 18:37:07 +03:00
parent 5e8ddaafb2
commit 568f66e070
6 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/classes/comment.py
View File

@ -385,8 +385,7 @@ class Comment(Base):
if not body: return ""
if not (self.parent_post and self.post.sub == 'chudrama'):
body = censor_slurs_profanities(body, v)
body = replace_train_html(body)
body = censor_slurs_profanities(body, v, True)
return body

2
files/classes/hats.py
View File

@ -37,7 +37,7 @@ class HatDef(Base):
@lazy
def censored_description(self, v):
return censor_slurs_profanities(self.description, v)
return censor_slurs_profanities(self.description, v, True)
@property
@lazy

6
files/classes/post.py
View File

@ -316,8 +316,7 @@ class Post(Base):
if not body: return ""
if self.sub != 'chudrama':
body = censor_slurs_profanities(body, v)
body = replace_train_html(body)
body = censor_slurs_profanities(body, v, True)
body = normalize_urls_runtime(body, v)
@ -337,8 +336,7 @@ class Post(Base):
title = self.title
if self.sub != 'chudrama':
title = censor_slurs_profanities(title, v)
title = replace_train_html(title)
title = censor_slurs_profanities(title, v, True)
return title

2
files/helpers/alerts.py
View File

@ -238,7 +238,7 @@ def push_notif(uids, title, body, url_or_comment):
if len(body) > PUSH_NOTIF_LIMIT:
body = body[:PUSH_NOTIF_LIMIT] + "..."
body = censor_slurs_profanities(body, None)
body = censor_slurs_profanities(body, None, True)
subscriptions = g.db.query(PushSubscription.subscription_json).filter(PushSubscription.user_id.in_(uids)).all()
subscriptions = [x[0] for x in subscriptions]

13
files/helpers/slurs_and_profanities.py
View File

@ -5,12 +5,6 @@ tranny = f'<img loading="lazy" data-bs-toggle="tooltip" alt=":marseytrain:" titl
trannie = f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!marseytrain:" title=":!marseytrain:" src="{SITE_FULL_IMAGES}/e/marseytrain.webp">'
troon = f'<img loading="lazy" data-bs-toggle="tooltip" alt=":marseytrain2:" title=":marseytrain2:" src="{SITE_FULL_IMAGES}/e/marseytrain2.webp">'
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,
@ -152,7 +146,7 @@ def sub_matcher_profanities(match):
def censor_slurs_profanities(body, logged_user):
def censor_slurs_profanities(body, logged_user, is_plain=False):
if not body: return ""
if '<pre>' in body or '<code>' in body:
@ -165,4 +159,9 @@ def censor_slurs_profanities(body, logged_user):
if not logged_user or logged_user == 'chat' or logged_user.profanityreplacer:
body = profanity_regex.sub(sub_matcher_profanities, body)
if is_plain:
body = body.replace(tranny, ':marseytrain:')
body = body.replace(trannie, ':!marseytrain:')
body = body.replace(troon, ':marseytrain2:')
return body

2
files/routes/chat.py
View File

@ -155,7 +155,7 @@ def speak(data, v):
"namecolor": v.name_color,
"patron": v.patron,
"text": text,
"text_censored": censor_slurs_profanities(text, 'chat'),
"text_censored": censor_slurs_profanities(text, 'chat', True),
"text_html": text_html,
"text_html_censored": censor_slurs_profanities(text_html, 'chat'),
"time": int(time.time()),