skorotkiewicz/rDrama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

emoji

Browse source
This commit is contained in:
Aevann1 2022-02-25 14:43:25 +02:00
parent 078c2f26cf
commit 89d3f73881
24 changed files with 56 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

10
files/assets/js/emoji_modal.js
View file

@ -59,7 +59,7 @@ function loadEmojis(form) {
); );
for (const emoji of Object.keys(sortable).slice(0, 25)) for (const emoji of Object.keys(sortable).slice(0, 25))
str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${emoji}')" data-bs-toggle="tooltip" title=":${emoji}:" delay:="0"><img loading="lazy" width=50 src="/e/${emoji}" alt="${emoji}-emoji"></button>` str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${emoji}')" data-bs-toggle="tooltip" title=":${emoji}:" delay:="0"><img loading="lazy" width=50 src="/e/${emoji}.webp" alt="${emoji}-emoji"></button>`
fav.innerHTML = str fav.innerHTML = str
} }
@ -76,12 +76,12 @@ function loadEmojis(form) {
{ {
for (const e of v) { for (const e of v) {
let k = e.toLowerCase().split(" : ")[0]; let k = e.toLowerCase().split(" : ")[0];
str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${k}')" style="background: None!important; width:60px; overflow: hidden; border: none" data-bs-toggle="tooltip" title=":${k}:" delay:="0"><img loading="lazy" width=50 src="/e/${k}" alt="${k}-emoji"></button>`; str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${k}')" style="background: None!important; width:60px; overflow: hidden; border: none" data-bs-toggle="tooltip" title=":${k}:" delay:="0"><img loading="lazy" width=50 src="/e/${k}.webp" alt="${k}-emoji"></button>`;
} }
} }
else { else {
for (const e of v) { for (const e of v) {
str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${e}')" style="background: None!important; width:60px; overflow: hidden; border: none" data-bs-toggle="tooltip" title=":${e}:" delay:="0"><img loading="lazy" width=50 src="/e/${e}" alt="${e}-emoji"></button>`; str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${e}')" style="background: None!important; width:60px; overflow: hidden; border: none" data-bs-toggle="tooltip" title=":${e}:" delay:="0"><img loading="lazy" width=50 src="/e/${e}.webp" alt="${e}-emoji"></button>`;
} }
} }
@ -100,7 +100,7 @@ function loadEmojis(form) {
let v = arr[1]; let v = arr[1];
if (str.includes(`'${k}'`)) continue; if (str.includes(`'${k}'`)) continue;
if (k.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(k) || v.match(search_bar.value.toLowerCase())) { if (k.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(k) || v.match(search_bar.value.toLowerCase())) {
str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${k}')" data-bs-toggle="tooltip" title=":${k}:" delay:="0"><img loading="lazy" width=50 src="/e/${k}" alt="${k}-emoji"></button>`; str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${k}')" data-bs-toggle="tooltip" title=":${k}:" delay:="0"><img loading="lazy" width=50 src="/e/${k}.webp" alt="${k}-emoji"></button>`;
} }
} }
} }
@ -108,7 +108,7 @@ function loadEmojis(form) {
{ {
for (const e of value) { for (const e of value) {
if (e.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(e)) { if (e.match(search_bar.value.toLowerCase()) || search_bar.value.toLowerCase().match(e)) {
str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${e}')" style="background: None!important; width:60px; overflow: hidden; border: none" data-bs-toggle="tooltip" title=":${e}:" delay:="0"><img loading="lazy" width=50 src="/e/${e}" alt="${e}-emoji"></button>`; str += `<button class="btn m-1 px-0 emoji2" onclick="getEmoji('${e}')" style="background: None!important; width:60px; overflow: hidden; border: none" data-bs-toggle="tooltip" title=":${e}:" delay:="0"><img loading="lazy" width=50 src="/e/${e}.webp" alt="${e}-emoji"></button>`;
} }
} }
} }

8
files/assets/js/marked.js
View file

@ -12,15 +12,15 @@ function markdown(first, second) {
var remoji = emoji.replace(/:/g,''); var remoji = emoji.replace(/:/g,'');
if (remoji.startsWith("!#") || remoji.startsWith("#!")) if (remoji.startsWith("!#") || remoji.startsWith("#!"))
{ {
input = input.replace(emoji, "<img class='emoji-lg mirrored' src='/e/" + remoji.substring(2) + "'>") input = input.replace(emoji, "<img class='emoji-lg mirrored' src='/e/" + remoji.substring(2) + ".webp'>")
} else if (remoji.startsWith("#")) } else if (remoji.startsWith("#"))
{ {
input = input.replace(emoji, "<img class='emoji-lg' src='/e/" + remoji.substring(1) + "'>") input = input.replace(emoji, "<img class='emoji-lg' src='/e/" + remoji.substring(1) + ".webp'>")
} else if (remoji.startsWith("!")) } else if (remoji.startsWith("!"))
{ {
input = input.replace(emoji, "<img height=30 class='emoji mirrored' src='/e/" + remoji.substring(1) + "'>") input = input.replace(emoji, "<img height=30 class='emoji mirrored' src='/e/" + remoji.substring(1) + ".webp'>")
} else { } else {
input = input.replace(emoji, "<img height=30 class='emoji' src='/e/" + remoji + "'>") input = input.replace(emoji, "<img height=30 class='emoji' src='/e/" + remoji + ".webp'>")
} }
} }
} }

10
files/helpers/sanitize.py
View file

@ -227,7 +227,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
if remoji == 'marseyrandom': remoji = choice(marseys) if remoji == 'marseyrandom': remoji = choice(marseys)
if path.isfile(f'files/assets/images/emojis/{remoji}.webp'): if path.isfile(f'files/assets/images/emojis/{remoji}.webp'):
new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" class="{classes}" src="/e/{remoji}" >', new, flags=re.I) new = re.sub(f'(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" class="{classes}" src="/e/{remoji}.webp" >', new, flags=re.I)
if comment: marseys_used.add(emoji) if comment: marseys_used.add(emoji)
sanitized = sanitized.replace(old, new) sanitized = sanitized.replace(old, new)
@ -251,7 +251,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
else: emoji = old else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
sanitized = re.sub(f'(?<!"):{i.group(1).lower()}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{old}:" title=":!{old}:" class="{classes}" src="/e/{emoji}">', sanitized, flags=re.I) sanitized = re.sub(f'(?<!"):{i.group(1).lower()}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{old}:" title=":!{old}:" class="{classes}" src="/e/{emoji}.webp">', sanitized, flags=re.I)
if comment: marseys_used.add(emoji) if comment: marseys_used.add(emoji)
else: else:
classes = 'emoji' classes = 'emoji'
@ -262,7 +262,7 @@ def sanitize(sanitized, noimages=False, alert=False, comment=False, edit=False):
else: emoji = old else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
sanitized = re.sub(f'(?<!"):{i.group(1).lower()}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" class="{classes}" src="/e/{emoji}">', sanitized, flags=re.I) sanitized = re.sub(f'(?<!"):{i.group(1).lower()}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" class="{classes}" src="/e/{emoji}.webp">', sanitized, flags=re.I)
if comment: marseys_used.add(emoji) if comment: marseys_used.add(emoji)
sanitized = sanitized.replace("https://youtu.be/", "https://youtube.com/watch?v=").replace("https://music.youtube.com/watch?v=", "https://youtube.com/watch?v=").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/watch?v=").replace("https://mobile.twitter", "https://twitter").replace("https://m.facebook", "https://facebook").replace("m.wikipedia.org", "wikipedia.org").replace("https://m.youtube", "https://youtube").replace("https://www.youtube", "https://youtube") sanitized = sanitized.replace("https://youtu.be/", "https://youtube.com/watch?v=").replace("https://music.youtube.com/watch?v=", "https://youtube.com/watch?v=").replace("https://streamable.com/", "https://streamable.com/e/").replace("https://youtube.com/shorts/", "https://youtube.com/watch?v=").replace("https://mobile.twitter", "https://twitter").replace("https://m.facebook", "https://facebook").replace("m.wikipedia.org", "wikipedia.org").replace("https://m.youtube", "https://youtube").replace("https://www.youtube", "https://youtube")
@ -339,7 +339,7 @@ def filter_emojis_only(title, edit=False, graceful=False):
else: emoji = old else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
title = re.sub(f'(?<!"):!{old}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{old}:" title=":!{old}:" src="/e/{emoji}" class="{classes}">', title, flags=re.I) title = re.sub(f'(?<!"):!{old}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":!{old}:" title=":!{old}:" src="/e/{emoji}.webp" class="{classes}">', title, flags=re.I)
else: else:
classes = 'emoji' classes = 'emoji'
@ -350,7 +350,7 @@ def filter_emojis_only(title, edit=False, graceful=False):
else: emoji = old else: emoji = old
if path.isfile(f'files/assets/images/emojis/{emoji}.webp'): if path.isfile(f'files/assets/images/emojis/{emoji}.webp'):
title = re.sub(f'(?<!"):{old}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" class="{classes}" src="/e/{emoji}">', title, flags=re.I) title = re.sub(f'(?<!"):{old}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{old}:" title=":{old}:" class="{classes}" src="/e/{emoji}.webp">', title, flags=re.I)
title = re.sub('~~(.*?)~~', r'<del>\1</del>', title) title = re.sub('~~(.*?)~~', r'<del>\1</del>', title)

2
files/routes/comments.py
View file

@ -281,7 +281,7 @@ def api_comment(v):
filename = f'files/assets/images/emojis/{name}.webp' filename = f'files/assets/images/emojis/{name}.webp'
copyfile(oldname, filename) copyfile(oldname, filename)
process_image(filename, 200) process_image(filename, 200)
requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{name}"]}, timeout=5) requests.post(f'https://api.cloudflare.com/client/v4/zones/{CF_ZONE}/purge_cache', headers=CF_HEADERS, data={'files': [f"https://{request.host}/e/{name}.webp"]}, timeout=5)
cache.delete_memoized(marsey_list) cache.delete_memoized(marsey_list)
except Exception as e: except Exception as e:
return {"error": str(e)}, 400 return {"error": str(e)}, 400

3
files/routes/static.py
View file

@ -336,7 +336,8 @@ def archives(path):
@app.get('/e/<emoji>') @app.get('/e/<emoji>')
@limiter.exempt @limiter.exempt
def emoji(emoji): def emoji(emoji):
resp = make_response(send_from_directory('assets/images/emojis', f'{emoji}.webp')) if not emoji.endswith('.webp'): emoji += '.webp'
resp = make_response(send_from_directory('assets/images/emojis', emoji))
resp.headers.remove("Cache-Control") resp.headers.remove("Cache-Control")
resp.headers.add("Cache-Control", "public, max-age=3153600") resp.headers.add("Cache-Control", "public, max-age=3153600")
resp.headers.remove("Content-Type") resp.headers.remove("Content-Type")

2
files/templates/comments.html
View file

@ -873,7 +873,7 @@
{% endif %} {% endif %}
{% if v %} {% if v %}
<script src="/static/assets/js/marked.js?a=243"></script> <script src="/static/assets/js/marked.js?a=244"></script>
<script src="/static/assets/js/comments_v.js?a=261"></script> <script src="/static/assets/js/comments_v.js?a=261"></script>
{% endif %} {% endif %}

2
files/templates/emoji_modal.html
View file

@ -106,4 +106,4 @@
</div> </div>
</div> </div>
<script data-cfasync="false" src="/static/assets/js/emoji_modal.js?a=252"></script> <script data-cfasync="false" src="/static/assets/js/emoji_modal.js?a=253"></script>

2
files/templates/errors/400.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseybrainlet:" loading="lazy" src="/e/marseybrainlet?a=1008"> <img alt=":#marseybrainlet:" loading="lazy" src="/e/marseybrainlet.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">400 Bad Request</h1> <h1 class="h5">400 Bad Request</h1>
<p class="text-muted mb-5">That request was bad and you should feel bad.</p> <p class="text-muted mb-5">That request was bad and you should feel bad.</p>

2
files/templates/errors/401.html
View file

@ -11,7 +11,7 @@
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseydead:" loading="lazy" src="/e/marseydead?a=1008"> <img alt=":#marseydead:" loading="lazy" src="/e/marseydead.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">401 Not Authorized</h1> <h1 class="h5">401 Not Authorized</h1>

2
files/templates/errors/403.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseytroll:" loading="lazy" src="/e/marseytroll?a=1008"> <img alt=":#marseytroll:" loading="lazy" src="/e/marseytroll.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">403 Forbidden</h1> <h1 class="h5">403 Forbidden</h1>
<p class="text-muted mb-5">YOU AREN'T WELCOME HERE GO AWAY</p> <p class="text-muted mb-5">YOU AREN'T WELCOME HERE GO AWAY</p>

2
files/templates/errors/404.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseyconfused" loading="lazy" src="/e/marseyconfused?a=1008"> <img alt=":#marseyconfused" loading="lazy" src="/e/marseyconfused.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">404 Page Not Found</h1> <h1 class="h5">404 Page Not Found</h1>
<p class="text-muted mb-5">Someone typed something wrong and it was probably you, please do better.</p> <p class="text-muted mb-5">Someone typed something wrong and it was probably you, please do better.</p>

2
files/templates/errors/405.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseyretard:" loading="lazy" src="/e/marseyretard?a=1008"> <img alt=":#marseyretard:" loading="lazy" src="/e/marseyretard.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">405 Method Not Allowed</h1> <h1 class="h5">405 Method Not Allowed</h1>
<p class="text-muted mb-5">idk how anyone gets this error but if you see this, remember to follow @carpathianflorist<BR>the original error text here talked about internet gremlins and wtf</p> <p class="text-muted mb-5">idk how anyone gets this error but if you see this, remember to follow @carpathianflorist<BR>the original error text here talked about internet gremlins and wtf</p>

2
files/templates/errors/429.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseyrentfree:" loading="lazy" src="/e/marseyrentfree?a=1008"> <img alt=":#marseyrentfree:" loading="lazy" src="/e/marseyrentfree.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">429 Too Many Requests</h1> <h1 class="h5">429 Too Many Requests</h1>
<p class="text-muted mb-5">go spam somewhere else nerd</p> <p class="text-muted mb-5">go spam somewhere else nerd</p>

2
files/templates/errors/500.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseydead:" loading="lazy" src="/e/marseydead?a=1008"> <img alt=":#marseydead:" loading="lazy" src="/e/marseydead.webp?a=1008">
<pre></pre> <pre></pre>
<h1 class="h5">500 Internal Server Error</h1> <h1 class="h5">500 Internal Server Error</h1>
<p class="text-muted mb-5">Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page <I>but not other pages</I>, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3</p> <p class="text-muted mb-5">Hiiiii it's carp! I think this error means that there's a timeout error. And I think that means something took too long to load so it decided not to work at all. If you keep seeing this on the same page <I>but not other pages</I>, then something is probably wrong with that specific function. It may not be called a function, but that sounds right to me. Anyway, ping me and I'll whine to someone smarter to fix it. Don't bother them. Thanks ily <3</p>

2
files/templates/errors/nsfw.html
View file

@ -10,7 +10,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col col-md-5"> <div class="col col-md-5">
<div class="text-center px-3 mt-5"> <div class="text-center px-3 mt-5">
<img alt=":#marseytwerking:" loading="lazy" src="/e/marseytwerking?a=1008"> <img alt=":#marseytwerking:" loading="lazy" src="/e/marseytwerking.webp?a=1008">
<h1 class="h5">Are you over 18?</h1> <h1 class="h5">Are you over 18?</h1>
<p class="mb-5">This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?</p> <p class="mb-5">This post is rated +18 (Adult-Only). You must be 18 or older to continue. Are you sure you want to proceed?</p>
<div class="btn-toolbar justify-content-center mb-4"> <div class="btn-toolbar justify-content-center mb-4">

2
files/templates/errors/patron.html
View file

@ -11,7 +11,7 @@
<div class="row justify-content-center"> <div class="row justify-content-center">
<div class="col-10 col-md-5"> <div class="col-10 col-md-5">
<div class="text-center px-3 my-8"> <div class="text-center px-3 my-8">
<img alt=":#marseymerchant:" loading="lazy" class="mb-2" src="/e/marseymerchant?a=1008"> <img alt=":#marseymerchant:" loading="lazy" class="mb-2" src="/e/marseymerchant.webp?a=1008">
<h1 class="h5">401 Not Authorized</h1> <h1 class="h5">401 Not Authorized</h1>
<p class="text-muted">This page is only available to {% if SITE_NAME == 'Drama' %}paypigs{% else %}patrons{% endif %}:</p> <p class="text-muted">This page is only available to {% if SITE_NAME == 'Drama' %}paypigs{% else %}patrons{% endif %}:</p>
<a rel="nofollow noopener noreferrer" href="{{config('GUMROAD_LINK')}}">{{config('GUMROAD_LINK')}}</a> <a rel="nofollow noopener noreferrer" href="{{config('GUMROAD_LINK')}}">{{config('GUMROAD_LINK')}}</a>

8
files/templates/formatting.html
View file

@ -69,22 +69,22 @@ You can use Markdown formatting:
<tr> <tr>
<td>Emojis</td> <td>Emojis</td>
<td>:marseylove:</td> <td>:marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emoji" alt=":marseylove:" title=":marseylove:" height="30" src="/e/marseylove?a=1008"></td> <td><img loading="lazy" data-bs-toggle="tooltip" class="emoji" alt=":marseylove:" title=":marseylove:" height="30" src="/e/marseylove.webp?a=1008"></td>
</tr> </tr>
<tr> <tr>
<td>Mirrored Emojis</td> <td>Mirrored Emojis</td>
<td>:!marseylove:</td> <td>:!marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emoji mirrored" alt=":!marseylove:" title=":!marseylove:" height="30" src="/e/marseylove?a=1008"></td> <td><img loading="lazy" data-bs-toggle="tooltip" class="emoji mirrored" alt=":!marseylove:" title=":!marseylove:" height="30" src="/e/marseylove.webp?a=1008"></td>
</tr> </tr>
<tr> <tr>
<td>Large Emojis</td> <td>Large Emojis</td>
<td>:#marseylove:</td> <td>:#marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emoji-lg" alt=":!marseylove:" title=":!marseylove:" src="/e/marseylove?a=1008"></td> <td><img loading="lazy" data-bs-toggle="tooltip" class="emoji-lg" alt=":!marseylove:" title=":!marseylove:" src="/e/marseylove.webp?a=1008"></td>
</tr> </tr>
<tr> <tr>
<td>Large Mirrored Emojis</td> <td>Large Mirrored Emojis</td>
<td>:#!marseylove:</td> <td>:#!marseylove:</td>
<td><img loading="lazy" data-bs-toggle="tooltip" class="emoji-lg mirrored" alt=":!marseylove:" title=":!marseylove:" src="/e/marseylove?a=1008"></td> <td><img loading="lazy" data-bs-toggle="tooltip" class="emoji-lg mirrored" alt=":!marseylove:" title=":!marseylove:" src="/e/marseylove.webp?a=1008"></td>
</tr> </tr>
<tr> <tr>
<td>Random Marsey</td> <td>Random Marsey</td>

2
files/templates/header.html
View file

@ -33,7 +33,7 @@
<a href="/" class="navbar-brand mr-auto"> <a href="/" class="navbar-brand mr-auto">
{% if SITE_NAME == 'Drama' %} {% if SITE_NAME == 'Drama' %}
{% set icon = ('marseyblm','marseykween','marseydynamite','marseyblack','marseymyeisha','marseyetika','marseyobama','marseyblackcop','marseysosa','marseyblackface')|random() %} {% set icon = ('marseyblm','marseykween','marseydynamite','marseyblack','marseymyeisha','marseyetika','marseyobama','marseyblackcop','marseysosa','marseyblackface')|random() %}
<img alt="header icon" height=33 src="/e/{{icon}}?a=1008"> <img alt="header icon" height=33 src="/e/{{icon}}.webp?a=1008">
{% else %} {% else %}
<img alt="header icon" height=33 src="/static/assets/images/{{SITE_NAME}}/headericon.webp?a=1015"> <img alt="header icon" height=33 src="/static/assets/images/{{SITE_NAME}}/headericon.webp?a=1015">
{% endif %} {% endif %}

4
files/templates/log.html
View file

@ -56,10 +56,10 @@
<div class="dropdown dropdown-actions"> <div class="dropdown dropdown-actions">
<button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button class="btn btn-secondary dropdown-toggle" role="button" id="dropdownMenuButton" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
{% if admin %}<img src="/@{{admin}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{admin}}{% else %}<img src="/e/marseyjanny?a=1008" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All{% endif %} {% if admin %}<img src="/@{{admin}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{admin}}{% else %}<img src="/e/marseyjanny.webp?a=1008" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All{% endif %}
</button> </button>
<div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);"> <div class="dropdown-menu" aria-labelledby="dropdownMenuButton" x-placement="bottom-start" style="position: absolute; will-change: transform; top: 0px; left: 0px; transform: translate3d(0px, 31px, 0px);">
<a class="dropdown-item" href="/log{% if type %}?kind={{type}}{% endif %}"><img src="/e/marseyjanny?a=1008" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All</a> <a class="dropdown-item" href="/log{% if type %}?kind={{type}}{% endif %}"><img src="/e/marseyjanny.webp?a=1008" alt="avatar" width=20 height=20 class="rounded-circle mr-2">All</a>
{% for a in admins %} {% for a in admins %}
<a class="dropdown-item" href="?admin={{a}}{% if type %}&kind={{type}}{% endif %}"><img loading="lazy" src="/@{{a}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{a}}</a> <a class="dropdown-item" href="?admin={{a}}{% if type %}&kind={{type}}{% endif %}"><img loading="lazy" src="/@{{a}}/pic" alt="avatar" width=20 height=20 class="rounded-circle mr-2">{{a}}</a>
{% endfor %} {% endfor %}

4
files/templates/marseys.html
View file

@ -20,7 +20,7 @@
<tr> <tr>
<td>{{loop.index}}</td> <td>{{loop.index}}</td>
<td>{{marsey.name}}</td> <td>{{marsey.name}}</td>
<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}?a=1010" ></td> <td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}.webp?a=1010" ></td>
<td>{{marsey.count}}</td> <td>{{marsey.count}}</td>
<td><a style="color:#{{author.namecolor}};font-weight:bold" href="/@{{author.username}}"><img loading="lazy" src="{{author.profile_url}}" class="pp20"><span {% if author.patron %}class="patron" style="background-color:#{{author.namecolor}}"{% endif %}>{{author.username}}</span></a></td> <td><a style="color:#{{author.namecolor}};font-weight:bold" href="/@{{author.username}}"><img loading="lazy" src="{{author.profile_url}}" class="pp20"><span {% if author.patron %}class="patron" style="background-color:#{{author.namecolor}}"{% endif %}>{{author.username}}</span></a></td>
</tr> </tr>
@ -30,7 +30,7 @@
<tr> <tr>
<td>{{loop.index}}</td> <td>{{loop.index}}</td>
<td>{{marsey.name}}</td> <td>{{marsey.name}}</td>
<td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}?a=1010" ></td> <td><img class="marsey" loading="lazy" data-bs-toggle="tooltip" alt=":{{marsey.name}}:" title=":{{marsey.name}}:" src="/e/{{marsey.name}}.webp?a=1010" ></td>
<td>{{marsey.count}}</td> <td>{{marsey.count}}</td>
</tr> </tr>
{% endfor %} {% endfor %}

32
files/templates/submission.html
View file

@ -77,7 +77,7 @@
} }
</style> </style>
<div class="seal seal1" height="100%" width="100%"> <div class="seal seal1" height="100%" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</div> </div>
{% if p.award_count("wholesome") > 1 %} {% if p.award_count("wholesome") > 1 %}
@ -88,7 +88,7 @@
} }
</style> </style>
<div class="seal seal2" height="100%" width="100%"> <div class="seal seal2" height="100%" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</div> </div>
{% endif %} {% endif %}
@ -100,7 +100,7 @@
} }
</style> </style>
<div class="seal seal3" height="100%" width="100%"> <div class="seal seal3" height="100%" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</div> </div>
{% endif %} {% endif %}
@ -112,7 +112,7 @@
} }
</style> </style>
<div class="seal seal4" height="100%" width="100%"> <div class="seal seal4" height="100%" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</div> </div>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -215,7 +215,7 @@
<div class="seal" height="100%" width="100%"> <div class="seal" height="100%" width="100%">
<marquee class="seal" scrollamount=10 behavior="alternate" direction="up" height="100%" width="100%"> <marquee class="seal" scrollamount=10 behavior="alternate" direction="up" height="100%" width="100%">
<marquee direction="right" scrollamount=10 behavior="alternate" height="100%" width="100%"> <marquee direction="right" scrollamount=10 behavior="alternate" height="100%" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</marquee> </marquee>
</marquee> </marquee>
</div> </div>
@ -223,7 +223,7 @@
{% if p.award_count("wholesome") > 1 %} {% if p.award_count("wholesome") > 1 %}
<marquee class="seal" scrollamount=10 behavior="alternate" direction="down" height="100%"> <marquee class="seal" scrollamount=10 behavior="alternate" direction="down" height="100%">
<marquee direction="right" scrollamount=10 behavior="alternate" width="100%"> <marquee direction="right" scrollamount=10 behavior="alternate" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</marquee> </marquee>
</marquee> </marquee>
{% endif %} {% endif %}
@ -231,7 +231,7 @@
{% if p.award_count("wholesome") > 2 %} {% if p.award_count("wholesome") > 2 %}
<marquee class="seal" scrollamount=10 behavior="alternate" direction="up" height="100%"> <marquee class="seal" scrollamount=10 behavior="alternate" direction="up" height="100%">
<marquee direction="left" scrollamount=10 behavior="alternate" width="100%"> <marquee direction="left" scrollamount=10 behavior="alternate" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</marquee> </marquee>
</marquee> </marquee>
{% endif %} {% endif %}
@ -239,7 +239,7 @@
{% if p.award_count("wholesome") > 3 %} {% if p.award_count("wholesome") > 3 %}
<marquee class="seal" scrollamount=10 behavior="alternate" direction="down" height="100%"> <marquee class="seal" scrollamount=10 behavior="alternate" direction="down" height="100%">
<marquee direction="left" scrollamount=10 behavior="alternate" width="100%"> <marquee direction="left" scrollamount=10 behavior="alternate" width="100%">
<img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome?a=1008"> <img alt=":#marseywholesome:" class="sealimg" src="/e/marseywholesome.webp?a=1008">
</marquee> </marquee>
</marquee> </marquee>
{% endif %} {% endif %}
@ -340,24 +340,24 @@
</style> </style>
<marquee class="train train1" direction="left" scrollamount=10 width="100%"> <marquee class="train train1" direction="left" scrollamount=10 width="100%">
<img alt=":#marseytrain:" class="trainimg mirrored" src="/e/marseytrain?a=1008"> <img alt=":#marseytrain:" class="trainimg mirrored" src="/e/marseytrain.webp?a=1008">
</marquee> </marquee>
{% if p.award_count("train") > 1 %} {% if p.award_count("train") > 1 %}
<marquee class="train train2" direction="right" scrollamount=10 width="100%"> <marquee class="train train2" direction="right" scrollamount=10 width="100%">
<img alt=":#marseytrain:" class="trainimg" src="/e/marseytrain?a=1008"> <img alt=":#marseytrain:" class="trainimg" src="/e/marseytrain.webp?a=1008">
</marquee> </marquee>
{% endif %} {% endif %}
{% if p.award_count("train") > 2 %} {% if p.award_count("train") > 2 %}
<marquee class="train train3" direction="left" scrollamount=10 width="100%"> <marquee class="train train3" direction="left" scrollamount=10 width="100%">
<img alt=":#marseytrain:" class="trainimg mirrored" src="/e/marseytrain?a=1008"> <img alt=":#marseytrain:" class="trainimg mirrored" src="/e/marseytrain.webp?a=1008">
</marquee> </marquee>
{% endif %} {% endif %}
{% if p.award_count("train") > 3 %} {% if p.award_count("train") > 3 %}
<marquee class="train train4" direction="right" scrollamount=10 width="100%"> <marquee class="train train4" direction="right" scrollamount=10 width="100%">
<img alt=":#marseytrain:" class="trainimg" src="/e/marseytrain?a=1008"> <img alt=":#marseytrain:" class="trainimg" src="/e/marseytrain.webp?a=1008">
</marquee> </marquee>
{% endif %} {% endif %}
{% endif %} {% endif %}
@ -432,24 +432,24 @@
} }
</style> </style>
<marquee class="train train3" direction="right" scrollamount=10 width="100%"> <marquee class="train train3" direction="right" scrollamount=10 width="100%">
<img alt=":#marseyscooter:" class="scooterimg" src="/e/marseyscooter?a=1008"> <img alt=":#marseyscooter:" class="scooterimg" src="/e/marseyscooter.webp?a=1008">
</marquee> </marquee>
{% if p.award_count("scooter") > 1 %} {% if p.award_count("scooter") > 1 %}
<marquee class="train train4" direction="left" scrollamount=10 width="100%"> <marquee class="train train4" direction="left" scrollamount=10 width="100%">
<img alt=":#marseyscooter:" class="scooterimg mirrored" src="/e/marseyscooter?a=1008"> <img alt=":#marseyscooter:" class="scooterimg mirrored" src="/e/marseyscooter.webp?a=1008">
</marquee> </marquee>
{% endif %} {% endif %}
{% if p.award_count("scooter") > 2 %} {% if p.award_count("scooter") > 2 %}
<marquee class="train train1" direction="right" scrollamount=10 width="100%"> <marquee class="train train1" direction="right" scrollamount=10 width="100%">
<img alt=":#marseyscooter:" class="scooterimg" src="/e/marseyscooter?a=1008"> <img alt=":#marseyscooter:" class="scooterimg" src="/e/marseyscooter.webp?a=1008">
</marquee> </marquee>
{% endif %} {% endif %}
{% if p.award_count("scooter") > 3 %} {% if p.award_count("scooter") > 3 %}
<marquee class="train train2" direction="left" scrollamount=10 width="100%"> <marquee class="train train2" direction="left" scrollamount=10 width="100%">
<img alt=":#marseyscooter:" class="scooterimg mirrored" src="/e/marseyscooter?a=1008"> <img alt=":#marseyscooter:" class="scooterimg mirrored" src="/e/marseyscooter.webp?a=1008">
</marquee> </marquee>
{% endif %} {% endif %}
{% endif %} {% endif %}

2
files/templates/submission_listing.html
View file

@ -123,7 +123,7 @@
<div style="z-index: 3;"> <div style="z-index: 3;">
{% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %} {% if p.club and not (v and (v.paid_dues or v.id == p.author_id)) %}
<img alt="post thumnail" loading="lazy" src="/e/marseyglow?a=1008" class="post-img"> <img alt="post thumnail" loading="lazy" src="/e/marseyglow.webp?a=1008" class="post-img">
{% elif not p.url %} {% elif not p.url %}
<a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}"> <a {% if v and v.newtab and not g.webview %}target="_blank"{% endif %} href="{{p.permalink}}">
<img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img"> <img alt="post thumnail" loading="lazy" src="{{p.thumb_url}}" class="post-img">

2
files/templates/submit.html
View file

@ -265,7 +265,7 @@
checkForRequired() checkForRequired()
</script> </script>
<script src="/static/assets/js/marked.js?a=243"></script> <script src="/static/assets/js/marked.js?a=244"></script>
<script src="/static/assets/js/formatting.js?a=240"></script> <script src="/static/assets/js/formatting.js?a=240"></script>
<script src="/static/assets/js/submit.js?a=248"></script> <script src="/static/assets/js/submit.js?a=248"></script>
{% include "emoji_modal.html" %} {% include "emoji_modal.html" %}

2
files/templates/userpage.html
View file

@ -767,7 +767,7 @@
</nav> </nav>
{% endif %} {% endif %}
<script src="/static/assets/js/marked.js?a=243"></script> <script src="/static/assets/js/marked.js?a=244"></script>
{% if v and v.id != u.id and '/comments' not in request.path %} {% if v and v.id != u.id and '/comments' not in request.path %}