From 67d8bd4324211d670fa43ad82aaf8600ed4084bd Mon Sep 17 00:00:00 2001
From: atrc445 <atrc445@protonmail.com>
Date: Sun, 19 Sep 2021 13:02:35 +0200
Subject: [PATCH] fix emoji tags

---
 files/helpers/sanitize.py | 6 +++---
 files/routes/posts.py     | 2 +-
 files/routes/reporting.py | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index 1faff1953..d04454af2 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -220,7 +220,7 @@ 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-toggle="tooltip" title="{emoji}" delay="0" height=60 src="https://{site}/assets/images/emojis/{emoji}.webp"</p>')
+			sanitized = sanitized.replace(f'<p>:{emoji}:</p>', f'<p style="margin-bottom:0;"><img loading="lazy" data-toggle="tooltip" title="{emoji}" delay="0" height=60 src="https://{site}/assets/images/emojis/{emoji}.webp"></p>')
 
 			try:
 				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
@@ -231,7 +231,7 @@ def sanitize(sanitized, noimages=False):
 	for i in re.finditer(':([^ ]{1,30}?):', sanitized):
 		emoji = i.group(1).lower()
 		if path.isfile(f'./files/assets/images/emojis/{emoji}.webp'):
-			sanitized = sanitized.replace(f':{emoji}:', f'<img loading="lazy" data-toggle="tooltip" title="{emoji}" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp"<span>')
+			sanitized = sanitized.replace(f':{emoji}:', f'<img loading="lazy" data-toggle="tooltip" title="{emoji}" delay="0" height=30 src="https://{site}/assets/images/emojis/{emoji}.webp">')
 
 			try:
 				if emoji in session["favorite_emojis"]: session["favorite_emojis"][emoji] += 1
@@ -264,6 +264,6 @@ def sanitize(sanitized, noimages=False):
 		sanitized = sanitized.replace(rd, "https://old.reddit.com/")
 	
 	sanitized = re.sub(' (https:\/\/[^ <>]*)', r' <a target="_blank"  rel="nofollow noopener noreferrer" href="\1">\1</a>', sanitized)
-	sanitized = re.sub('<p>(https:\/\/[^ <>]*)', r'<p><a target="_blank"  rel="nofollow noopener noreferrer" href="\1">\1</a>', sanitized)
+	sanitized = re.sub('<p>(https:\/\/[^ <>]*)', r'<p><a target="_blank"  rel="nofollow noopener noreferrer" href="\1">\1</a></p>', sanitized)
 
 	return sanitized
diff --git a/files/routes/posts.py b/files/routes/posts.py
index 1331e8a07..346a5e4dc 100644
--- a/files/routes/posts.py
+++ b/files/routes/posts.py
@@ -439,7 +439,7 @@ def filter_title(title):
 
 	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-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp"<span>')
+			title = title.replace(f':{i.group(1)}:', f'<img loading="lazy" data-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 	return title
 
diff --git a/files/routes/reporting.py b/files/routes/reporting.py
index 8b075216f..df00165b0 100644
--- a/files/routes/reporting.py
+++ b/files/routes/reporting.py
@@ -21,7 +21,7 @@ def api_flag_post(pid, v):
 
 		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-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp"<span>')
+				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 		flag = Flag(post_id=post.id,
 					user_id=v.id,
@@ -52,7 +52,7 @@ def api_flag_comment(cid, v):
 
 		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-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp"<span>')
+				reason = reason.replace(f':{i.group(1)}:', f'<img loading="lazy" data-toggle="tooltip" title="{i.group(1)}" delay="0" height=20 src="https://{site}/assets/images/emojis/{i.group(1)}.webp">')
 
 		flag = CommentFlag(comment_id=comment.id,
 					user_id=v.id,