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

Revert "Fix giant patting hand UI bug." 

This reverts commit 7915eb8390.
remotes/1693045480750635534/spooky-22
Aevann1 2022-06-13 20:31:28 +02:00
parent 48f80294fd
commit d8fff0bc72
2 changed files with 4 additions and 6 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','data-pat'] and not value: return True
if name in ['g','b'] and not value: return True
if name in ['alt','title']: return True
if name == 'referrpolicy' and value == 'no-referrer': return True
return False
@ -93,7 +93,6 @@ 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
@ -146,12 +145,11 @@ def render_emoji(html, regexp, edit, marseys_used, 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}:" data-pat><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}:"><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}:" data-pat><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}:"><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': 309,
'css/main.css': 310,
'css/4chan.css': 60,
'css/classic.css': 59,