gerudo
/
rDrama
forked from rDrama/rDrama
1
0
Fork 0
Code Pull Requests Activity

dont strip poll options

master
Aevann 2023-03-19 19:53:33 +02:00
parent e6a802f12d
commit 65542b5fac
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/helpers/actions.py
View File

@ -524,7 +524,7 @@ def process_poll_options(v:User, target:Union[Submission, Comment]):
else:
cls = CommentOption
body_html=filter_emojis_only(body)
body_html=filter_emojis_only(body, strip=False) #dont strip cuz ppl sometimes leave spaces before && or after it, which breaks the replacing logic
existing = g.db.query(cls).filter_by(
parent_id=target.id,

11
files/helpers/sanitize.py
View File

@ -546,13 +546,11 @@ def allowed_attributes_emojis(tag, name, value):
@with_sigalrm_timeout(1)
def filter_emojis_only(title, golden=True, count_emojis=False, graceful=False, torture=False):
title = title.strip()
def filter_emojis_only(title, golden=True, count_emojis=False, graceful=False, torture=False, strip=True):
if torture:
title = torture_ap(title, g.v.username)
title = title.replace('‎','').replace('​','').replace("\ufeff", "").replace("𒐪","").replace("\n", "").replace("\r", "").replace("\t", "").replace('<','&lt;').replace('>','&gt;').replace("﷽","").strip()
title = title.replace('‎','').replace('​','').replace("\ufeff", "").replace("𒐪","").replace("\n", "").replace("\r", "").replace("\t", "").replace('<','&lt;').replace('>','&gt;').replace("﷽","")
emojis_used = set()
@ -565,7 +563,10 @@ def filter_emojis_only(title, golden=True, count_emojis=False, graceful=False, t
title = strikethrough_regex.sub(r'\1<del>\2</del>', title)
title = bleach.clean(title, tags=['img','del','span'], attributes=allowed_attributes_emojis, protocols=['http','https']).replace('\n','').strip()
title = bleach.clean(title, tags=['img','del','span'], attributes=allowed_attributes_emojis, protocols=['http','https']).replace('\n','')
if strip:
title = title.strip()
if len(title) > POST_TITLE_HTML_LENGTH_LIMIT and not graceful: abort(400)
else: return title