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

Fix giant patting hand UI bug. 

Despite being very fun, this fixes the recently discovered bug where
placing '#' or '!' within the 'pat:' suffix of a patted emoji causes
the enclosing <span> to not be given the proper CSS `display` or
`position`, leading to the hand being sized relative to the comment
bounding box rather than the emoji box.

This should be backward compatible. The only posts it wont fix are
existing ones with the giant hands. Main example being:
https://rdrama.net/h/slackernews/post/76302/
master
Snakes 2022-06-12 02:22:38 -04:00
parent 1350cfbe50
commit 7915eb8390
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
files/helpers/sanitize.py
View File

@ -63,7 +63,7 @@ def allowed_attributes(tag, name, value):
if name in ['src','data-src']: return is_safe_url(value)
if name == 'loading' and value == 'lazy': return True
if name == 'data-bs-toggle' and value == 'tooltip': return True
if name in ['g','b'] and not value: return True
if name in ['g','b','data-pat'] and not value: return True
if name in ['alt','title']: return True
if name == 'referrpolicy' and value == 'no-referrer': return True
return False
@ -93,6 +93,7 @@ def allowed_attributes(tag, name, value):
if tag == 'span':
if name == 'data-bs-toggle' and value == 'tooltip': return True
if name == 'data-pat' and not value: return True
if name == 'title': return True
if name == 'alt': return True
return False
@ -145,11 +146,12 @@ def render_emoji(html, regexp, edit, marseys_used=set(), b=False):
emoji_html = None
if emoji.endswith('pat'):
attrs += ' data-pat'
if path.isfile(f"files/assets/images/emojis/{emoji.replace('pat','')}.webp"):
emoji_html = f'<span data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:"><img src="/assets/images/hand.webp">{emoji_partial_pat.format(old, f"/e/{emoji[:-3]}.webp", attrs)}</span>'
emoji_html = f'<span data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" data-pat><img src="/assets/images/hand.webp">{emoji_partial_pat.format(old, f"/e/{emoji[:-3]}.webp", attrs)}</span>'
elif emoji.startswith('@'):
if u := get_user(emoji[1:-3], graceful=True):
emoji_html = f'<span data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:"><img src="/assets/images/hand.webp">{emoji_partial_pat.format(old, f"/pp/{u.id}", attrs)}</span>'
emoji_html = f'<span data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" data-pat><img src="/assets/images/hand.webp">{emoji_partial_pat.format(old, f"/pp/{u.id}", attrs)}</span>'
elif path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
emoji_html = emoji_partial.format(old, f'/e/{emoji}.webp', attrs)

2
files/templates/util/assetcache.html
View File

@ -1,6 +1,6 @@
{%-
set CACHE_VER = {
'css/main.css': 234,
'css/main.css': 301,
'css/4chan.css': 60,
'css/classic.css': 59,