From 58c4b621635e52f55a2c287ef1ab3aff7db8add2 Mon Sep 17 00:00:00 2001
From: float-trip <102226344+float-trip@users.noreply.github.com>
Date: Thu, 2 Jun 2022 19:18:10 -0400
Subject: [PATCH] Some fixes (#300)

* Narrow emoji_regex

* Fix mirrored pat emojis

* Fix ban icon on posts/comments
---
 files/helpers/const.py               | 2 +-
 files/routes/admin.py                | 8 ++++----
 files/templates/util/assetcache.html | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index 3f532ef2c..24672cb20 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -873,7 +873,7 @@ strikethrough_regex = re.compile('''~{1,2}([^~]+)~{1,2}''', flags=re.A)
 
 mute_regex = re.compile("/mute @([a-z0-9_\-]{3,25}) ([0-9])+", flags=re.A)
 
-emoji_regex = re.compile(f"[^a]>\s*(:[!#@]{{0,3}}[{valid_username_chars}]+:\s*)+<\/", flags=re.A)
+emoji_regex = re.compile(f"<p>\s*(:[!#@]{{0,3}}[{valid_username_chars}]+:\s*)+<\/p>", flags=re.A)
 emoji_regex2 = re.compile(f"(?<!\"):([!#@{valid_username_chars}]{{1,31}}?):", flags=re.A)
 emoji_regex3 = re.compile(f"(?<!\"):([!@{valid_username_chars}]{{1,31}}?):", flags=re.A)
 
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 673461ce6..61ae52868 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -1158,16 +1158,16 @@ def ban_user(user_id, v):
 	g.db.add(ma)
 
 	if 'reason' in request.values:
-		if reason.startswith("/post/"):
+		if request.values["reason"].startswith("/post/"):
 			try:
-				post = int(reason.split("/post/")[1].split(None, 1)[0])
+				post = int(request.values["reason"].split("/post/")[1].split(None, 1)[0])
 				post = get_post(post)
 				post.bannedfor = True
 				g.db.add(post)
 			except: pass
-		elif reason.startswith("/comment/"):
+		elif request.values["reason"].startswith("/comment/"):
 			try:
-				comment = int(reason.split("/comment/")[1].split(None, 1)[0])
+				comment = int(request.values["reason"].split("/comment/")[1].split(None, 1)[0])
 				comment = get_comment(comment)
 				comment.bannedfor = True
 				g.db.add(comment)
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index 8f0185fca..bcd31a8c3 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 293,
+	'css/main.css': 294,
 
 	'css/4chan.css': 59,
 	'css/classic.css': 59,