From dcaefaa2c993dfcb2b8654ef506988dc6b9055ab Mon Sep 17 00:00:00 2001
From: Aevann1 <Aevann3@gmail.com>
Date: Wed, 29 Sep 2021 17:38:19 +0200
Subject: [PATCH] emoji update

---
 files/helpers/jinja2.py                 | 2 +-
 files/helpers/sanitize.py               | 8 ++++----
 files/routes/posts.py                   | 4 ++--
 files/routes/reporting.py               | 8 ++++----
 files/templates/emoji_modal.html        | 2 +-
 files/templates/errors/400.html         | 2 +-
 files/templates/errors/401.html         | 2 +-
 files/templates/errors/403.html         | 2 +-
 files/templates/errors/404.html         | 2 +-
 files/templates/errors/405.html         | 2 +-
 files/templates/errors/429.html         | 2 +-
 files/templates/errors/500.html         | 2 +-
 files/templates/errors/nsfw.html        | 2 +-
 files/templates/errors/patron.html      | 2 +-
 files/templates/formatting.html         | 2 +-
 files/templates/submission_listing.html | 2 +-
 files/templates/userpage.html           | 4 ++--
 17 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/files/helpers/jinja2.py b/files/helpers/jinja2.py
index 5316b40dd..6e4ed4554 100644
--- a/files/helpers/jinja2.py
+++ b/files/helpers/jinja2.py
@@ -27,7 +27,7 @@ def favorite_emojis(x):
 	str = ""
 	emojis = sorted(x.items(), key=lambda x: x[1], reverse=True)[:25]
 	for k, v in emojis:
-		str += f'<button class="btn m-1 px-0 emoji" onclick="getEmoji(\'{k}\', \'@form@\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":{k}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis/{k}.webp" alt="{k}-emoji"/></button>'
+		str += f'<button class="btn m-1 px-0 emoji" onclick="getEmoji(\'{k}\', \'@form@\')" style="background: None!important; width:60px; overflow: hidden; border: none;" data-bs-toggle="tooltip" title=":{k}:" delay:="0"><img loading="lazy" width=50 src="/assets/images/emojis2/{k}.webp" alt="{k}-emoji"/></button>'
 	return str
 
 @app.context_processor
diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 8ec76f051..327084bef 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -219,8 +219,8 @@ def sanitize(sanitized, noimages=False):
 	
 	for i in re.finditer('<p>:([^ ]{1,30}?):</p>', sanitized):
 		emoji = i.group(1).lower()
-		if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-			sanitized = sanitized.replace(f'<p>:{emoji}:</p>', f'<p style="margin-bottom:0;"><img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=60 src="https://{site}/assets/images/emojis/{emoji}.webp"></p>')
+		if path.isfile(f'./files/assets/images/emojis2/{emoji}.webp'):
+			sanitized = sanitized.replace(f'<p>:{emoji}:</p>', f'<p style="margin-bottom:0;"><img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=60 src="https://{site}/assets/images/emojis2/{emoji}.webp"></p>')
 
 			try:
 				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
@@ -230,8 +230,8 @@ def sanitize(sanitized, noimages=False):
 
 	for i in re.finditer('\w*(?<!"):([^ ]{1,30}?):', sanitized):
 		emoji = i.group(1).lower()
-		if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-			sanitized = re.sub(f'\w*(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp">', sanitized)
+		if path.isfile(f'./files/assets/images/emojis2/{emoji}.webp'):
+			sanitized = re.sub(f'\w*(?<!"):{emoji}:', f'<img loading="lazy" data-bs-toggle="tooltip" alt=":{emoji}:" title=":{emoji}:" delay="0" height=30 src="https://{site}/assets/images/emojis2/{emoji}.webp">', sanitized)
 
 			try:
 				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 03b81e69a..4e561ba8d 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -394,8 +394,8 @@ def filter_title(title):
 	title = bleach.clean(title, tags=[])
 
 	for i in re.finditer(':(.{1,30}?):', title):
-		if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
-			title = title.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
+		if path.isfile(f'./files/assets/images/emojis2/{i.group(1)}.webp'):
+			title = title.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis2/{i.group(1)}.webp">')
 
 	return title
 
diff --git a/files/routes/reporting.py b/files/routes/reporting.py
index 6e30c0c15..a63804639 100644
--- a/files/routes/reporting.py
+++ b/files/routes/reporting.py
@@ -18,8 +18,8 @@ def api_flag_post(pid, v):
 		if "<" in reason: return {"error": f"Reasons can't contain <"}
 
 		for i in re.finditer(':(.{1,30}?):', reason):
-			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
-				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
+			if path.isfile(f'./files/assets/images/emojis2/{i.group(1)}.webp'):
+				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis2/{i.group(1)}.webp">')
 
 		flag = Flag(post_id=post.id,
 					user_id=v.id,
@@ -49,8 +49,8 @@ def api_flag_comment(cid, v):
 		if "<" in reason: return {"error": f"Reasons can't contain <"}
 
 		for i in re.finditer(':(.{1,30}?):', reason):
-			if path.isfile(f'./files/assets/images/emojis/{i.group(1)}.webp'):
-				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
+			if path.isfile(f'./files/assets/images/emojis2/{i.group(1)}.webp'):
+				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-bs-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis2/{i.group(1)}.webp">')
 
 		flag = CommentFlag(comment_id=comment.id,
 					user_id=v.id,
diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index 0180bd97d..4475a6bd3 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -1,4 +1,4 @@
-<script src="/assets/js/emoji_modal3.js"></script>
+<script src="/assets/js/emoji_modal4.js"></script>
 
 <style>
 	a.emojitab {
diff --git a/files/templates/errors/400.html b/files/templates/errors/400.html
index 29a3dc90a..473e5e116 100644
--- a/files/templates/errors/400.html
+++ b/files/templates/errors/400.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
-			<img loading="lazy" src="/assets/images/emojis/marseybrainlet.webp">
+			<img loading="lazy" src="/assets/images/emojis2/marseybrainlet.webp">
 			<pre></pre>
 			<h1 class="h5">400 Bad Request</h1>
 			<p class="text-muted mb-5">That request was bad and you should feel bad.</p>
diff --git a/files/templates/errors/401.html b/files/templates/errors/401.html
index c7168c6ee..7cfb5197f 100644
--- a/files/templates/errors/401.html
+++ b/files/templates/errors/401.html
@@ -11,7 +11,7 @@
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
 
-		<img loading="lazy" src="/assets/images/emojis/marseydead.webp">
+		<img loading="lazy" src="/assets/images/emojis2/marseydead.webp">
 		<pre></pre>
 
 			<h1 class="h5">401 Not Authorized</h1>
diff --git a/files/templates/errors/403.html b/files/templates/errors/403.html
index f24128f90..884941faf 100644
--- a/files/templates/errors/403.html
+++ b/files/templates/errors/403.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
-		<img loading="lazy" src="/assets/images/emojis/marseytroll.webp">
+		<img loading="lazy" src="/assets/images/emojis2/marseytroll.webp">
 		<pre></pre>
 		<h1 class="h5">403 Forbidden</h1>
 			<p class="text-muted mb-5">YOU AREN'T WELCOME HERE GO AWAY</p>
diff --git a/files/templates/errors/404.html b/files/templates/errors/404.html
index 0923c7200..adfd85ad9 100644
--- a/files/templates/errors/404.html
+++ b/files/templates/errors/404.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
-		<img loading="lazy" src="/assets/images/emojis/marseyconfused.webp">
+		<img loading="lazy" src="/assets/images/emojis2/marseyconfused.webp">
 		<pre></pre>
 		<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>
diff --git a/files/templates/errors/405.html b/files/templates/errors/405.html
index 5d4e33a3f..333006af6 100644
--- a/files/templates/errors/405.html
+++ b/files/templates/errors/405.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
-		<img loading="lazy" src="/assets/images/emojis/marseyretard.webp">
+		<img loading="lazy" src="/assets/images/emojis2/marseyretard.webp">
 		<pre></pre>
 		<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>
diff --git a/files/templates/errors/429.html b/files/templates/errors/429.html
index 294ce82e6..0cfa013b8 100644
--- a/files/templates/errors/429.html
+++ b/files/templates/errors/429.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
-		<img loading="lazy" src="/assets/images/emojis/marseyrentfree.webp">
+		<img loading="lazy" src="/assets/images/emojis2/marseyrentfree.webp">
 		<pre></pre>
 		<h1 class="h5">429 Too Many Requests</h1>
 			<p class="text-muted mb-5">go spam somewhere else nerd</p>
diff --git a/files/templates/errors/500.html b/files/templates/errors/500.html
index bddbdf3b9..014c5795b 100644
--- a/files/templates/errors/500.html
+++ b/files/templates/errors/500.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 		<div class="text-center px-3 my-8">
-			<img loading="lazy" src="/assets/images/emojis/marseydead.webp">
+			<img loading="lazy" src="/assets/images/emojis2/marseydead.webp">
 			<pre></pre>
 			<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>
diff --git a/files/templates/errors/nsfw.html b/files/templates/errors/nsfw.html
index 25450c275..4080315d4 100644
--- a/files/templates/errors/nsfw.html
+++ b/files/templates/errors/nsfw.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col col-md-5">
 		<div class="text-center px-3 mt-5">
-			<img loading="lazy" src="/assets/images/emojis/marseytwerking.webp">
+			<img loading="lazy" src="/assets/images/emojis2/marseytwerking.webp">
 			<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>
 			<div class="btn-toolbar justify-content-center mb-4">
diff --git a/files/templates/errors/patron.html b/files/templates/errors/patron.html
index 2fa38c45f..deae41769 100644
--- a/files/templates/errors/patron.html
+++ b/files/templates/errors/patron.html
@@ -10,7 +10,7 @@
 <div class="row justify-content-center">
 	<div class="col-10 col-md-5">
 	<div class="text-center px-3 my-8">
-			<img loading="lazy" class="mb-2" src="/assets/images/emojis/marseymerchant.webp">
+			<img loading="lazy" class="mb-2" src="/assets/images/emojis2/marseymerchant.webp">
 			<h1 class="h5">401 Not Authorized</h1>
 			<p class="text-muted">This page is only available to {% if "rdrama" in request.host %}paypigs{% else %}patrons{% endif %}:</p>
 			<a rel="nofollow noopener noreferrer" href="{{'GUMROAD_LINK' | app_config}}">{{'GUMROAD_LINK' | app_config}}</a>
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index f1b44e60e..82350df0f 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -55,7 +55,7 @@ On {{'SITE_NAME' | app_config}}, you can use Markdown formatting.
 	<tr>
 		<td>Emojis</td>
 		<td>:marseylove:</td>
-		<td><img loading="lazy" data-bs-toggle="tooltip" title="marseylove" delay="0" height="20" src="/assets/images/emojis/marseylove.webp"></td>
+		<td><img loading="lazy" data-bs-toggle="tooltip" title="marseylove" delay="0" height="20" src="/assets/images/emojis2/marseylove.webp"></td>
 	</tr>
 </table>
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index c6ffef812..852549f31 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -93,7 +93,7 @@
 
 			<div style="z-index: 3;">
 				{% if p.club and not (v and v.paid_dues) %}
-					<img loading="lazy" src="/assets/images/emojis/marseyglow.webp" class="post-img">
+					<img loading="lazy" src="/assets/images/emojis2/marseyglow.webp" class="post-img">
 				{% elif not p.url %}
 					<a {% if v and v.newtab %}target="_blank"{% endif %} {% if v %}href="{{p.permalink}}"{% else %}href="/logged_out{{p.permalink}}"{% endif %}>
 						<img loading="lazy" src="{{p.thumb_url}}" class="post-img">
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 894c1614e..301f4f03f 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -131,7 +131,7 @@
 				{% if u.customtitle %}<p class="font-weight-bolder" style="color: #{{u.titlecolor}}">{% if u.quadrant %}<img loading="lazy" height="20" src="/assets/images/PCM/quadrants/{{u.quadrant}}.webp">{% endif %}{{u.customtitle | safe}}</p>{% endif %}
 				<div class="font-weight-bolder">
 					<span id="profile-coins-amount">{{u.coins}}</span>
-					&nbsp;<img data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{'COINS_NAME' | app_config}}" height="20" src="https://rdrama.net/assets/images/emojis/marseybux.webp">&nbsp;&nbsp;
+					&nbsp;<img data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{'COINS_NAME' | app_config}}" height="20" src="https://rdrama.net/assets/images/emojis2/marseybux.webp">&nbsp;&nbsp;
 
 					{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}<a href="/@{{u.username}}/followers">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; {% endif %}
 					joined <span data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{u.created_datetime}}">{{u.created_date}}</span>
@@ -388,7 +388,7 @@
 				<div class="font-weight-normal">
 					<span id="profile-coins-amount-mobile" class="font-weight-bold">{{u.coins}}</span>
 
-					&nbsp;<img data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{'COINS_NAME' | app_config}}" height="15" src="https://rdrama.net/assets/images/emojis/marseybux.webp">&nbsp;&nbsp;
+					&nbsp;<img data-bs-toggle="tooltip" data-bs-placement="bottom" title="{{'COINS_NAME' | app_config}}" height="15" src="https://rdrama.net/assets/images/emojis2/marseybux.webp">&nbsp;&nbsp;
 					{% if u.stored_subscriber_count >=1 and not u.is_nofollow %}<a href="/@{{u.username}}/followers" class="font-weight-bold">{{u.stored_subscriber_count}} follower{{'s' if u.stored_subscriber_count != 1 else ''}}</a>&nbsp;&nbsp; {% endif %}
 					{% if "pcm" in request.host %}
 						<br>Based count: {{u.basedcount}}