From a87283428de6d5f2ecf14eb2a7383fcec005e101 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 15:22:44 +0200
Subject: [PATCH 1/8] make emoji modal neater

---
 files/templates/emoji_modal.html     | 21 ++++++---------------
 files/templates/util/assetcache.html |  4 ++--
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html
index cd86e553a9..26fb4cacd4 100644
--- a/files/templates/emoji_modal.html
+++ b/files/templates/emoji_modal.html
@@ -39,29 +39,20 @@
 				<input disabled autocomplete="off" class="form-control px-2" type="text" id="emoji_search" placeholder="Search.." onchange="start_search()" {% if not (v and v.poor) %}oninput="start_search()"{% endif %}>
 			</div>
 			<div class="px-3 d-flex flex-row">
-				<fieldset class="p-2">
-					<label style="display: inline">Options:</legend>
-
-					<div style="display: inline" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Makes the emoji larger">
+				<fieldset class="py-2 pr-2 pl-1">
+					<div class="mr-2" style="display: inline" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Makes the emoji larger">
 						<input type="checkbox" id="emoji-sel-0" value="#" class="emoji-suffix">
-						<label for="emoji-sel-0">Large</label>
+						<label class="emoji-option" for="emoji-sel-0">Large</label>
 					</div>
 
-					<div style="display: inline" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Mirror the emoji along the Y axis">
+					<div class="mr-2" style="display: inline" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Mirror the emoji along the Y axis">
 						<input type="checkbox" id="emoji-sel-1" value="!" class="emoji-suffix">
-						<label for="emoji-sel-1">Mirror</label>
+						<label class="emoji-option" for="emoji-sel-1">Mirror</label>
 					</div>
 
 					<div style="display: inline" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Adds a hand that pats the emoji">
 						<input type="checkbox" id="emoji-sel-2" value="pat" class="emoji-postfix">
-						<label for="emoji-sel-2">Pat</label>
-					</div>
-				</fieldset>
-				<fieldset class="p-2">
-					<label style="display: inline">Search:</legend>
-					<div style="display: inline" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Iterate through all substrings of the query. YIKES">
-						<input type="checkbox" id="emoji-complete-search">
-						<label for="emoji-complete-search">complete</label>
+						<label class="emoji-option" for="emoji-sel-2">Pat</label>
 					</div>
 				</fieldset>
 			</div>
diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index f67f00c1c8..091b550c50 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 397,
+	'css/main.css': 398,
 	'css/catalog.css': 2,
 
 	'css/4chan.css': 61,
@@ -20,7 +20,7 @@ set CACHE_VER = {
 	'js/bootstrap.js': 275,
 	'js/comments+submission_listing.js': 263,
 	'js/submission_listing.js': 261,
-	'js/emoji_modal.js': 297,
+	'js/emoji_modal.js': 298,
 	'js/formatting.js': 240,
 	'js/lottery.js': 256,
 	'js/marked.js': 280,

From 3f0d1ac2a759e801eeced73ce5307e5a368e41d5 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 15:28:07 +0200
Subject: [PATCH 2/8] make nuking message clearer

---
 files/routes/admin.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/routes/admin.py b/files/routes/admin.py
index 6206c086e7..d2c468812d 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -1470,7 +1470,7 @@ def admin_nuke_user(v):
 		)
 	g.db.add(ma)
 
-	notify_mod_action(v.id, f"@{v.username} has nuked @{user.username}")
+	notify_mod_action(v.id, f"@{v.username} has has removed all content of @{user.username}")
 
 
 	return redirect(user.url)
@@ -1508,7 +1508,7 @@ def admin_nunuke_user(v):
 		)
 	g.db.add(ma)
 
-	notify_mod_action(v.id, f"@{v.username} has un-nuked @{user.username}")
+	notify_mod_action(v.id, f"@{v.username} has approved all of content of @{user.username}")
 
 
 	return redirect(user.url)

From abb54747c2dd5284c4f6e73ff3b82f5cab7c3241 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 15:31:34 +0200
Subject: [PATCH 3/8] fix unrendered html in poll_votes page

---
 files/templates/poll_votes.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html
index 1a40dc55f0..3964a201c0 100644
--- a/files/templates/poll_votes.html
+++ b/files/templates/poll_votes.html
@@ -13,7 +13,7 @@
 	
 </pre>
 
-<h3>{{thing.body_html}} - {{ups | length}} votes</h3>
+<h3>{{thing.body_html | safe}} - {{ups | length}} votes</h3>
 <div class="overflow-x-auto mt-5">
 	<table class="table table-striped mb-5">
 		<thead class="bg-primary text-white">

From c56f3951e1085501ca5680015f3f7cbc5a9f104a Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 16:43:05 +0200
Subject: [PATCH 4/8] make roll command neater

---
 files/helpers/regex.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/files/helpers/regex.py b/files/helpers/regex.py
index 6eeb33f875..90f38551c3 100644
--- a/files/helpers/regex.py
+++ b/files/helpers/regex.py
@@ -1,6 +1,6 @@
 import re
 from .const import *
-from random import choice
+from random import choice, choices
 
 if SITE_NAME == 'PCM':
 	valid_username_chars = 'a-zA-Z0-9_\-А-я'
@@ -144,4 +144,8 @@ commands = {
 command_regex = re.compile("(\s|\n|^)#(fortune|factcheck|8ball|roll)", flags=re.A|re.I)
 
 def command_regex_matcher(match, upper=False):
-	return match.group(1) + str(choice(commands[match.group(2).lower()]))
\ No newline at end of file
+	result = str(choice(commands[match.group(2).lower()]))
+	if match.group(2) == 'roll':
+		color = tuple(choices(range(256), k=3))
+		result = f'<b style="color:rgb{color}">Your roll: {result}</b>'
+	return match.group(1) + result
\ No newline at end of file

From 98e3e6354734590f3624549aba7d025223186eb8 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 16:47:03 +0200
Subject: [PATCH 5/8] order poll votes by time of creation

---
 files/routes/polls.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/routes/polls.py b/files/routes/polls.py
index 98ff61e773..74c5e96657 100644
--- a/files/routes/polls.py
+++ b/files/routes/polls.py
@@ -47,7 +47,7 @@ def option_votes(option_id, v):
 
 	if not option: abort(404)
 
-	ups = g.db.query(SubmissionOptionVote).filter_by(option_id=option_id).all()
+	ups = g.db.query(SubmissionOptionVote).filter_by(option_id=option_id).order_by(SubmissionOptionVote.created_utc).all()
 
 	return render_template("poll_votes.html",
 						   v=v,
@@ -97,7 +97,7 @@ def option_votes_comment(option_id, v):
 
 	if not option: abort(404)
 
-	ups = g.db.query(CommentOptionVote).filter_by(option_id=option_id).all()
+	ups = g.db.query(CommentOptionVote).filter_by(option_id=option_id).order_by(CommentOptionVote.created_utc).all()
 
 	return render_template("poll_votes.html",
 						   v=v,

From 03620d984c4bc59f772b84e0f18ce169671e28a4 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 18:20:09 +0200
Subject: [PATCH 6/8] improve sorting tables

---
 files/templates/admins.html     | 2 +-
 files/templates/badges.html     | 2 +-
 files/templates/poll_votes.html | 4 ++--
 files/templates/sub/subs.html   | 2 +-
 files/templates/votes.html      | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/templates/admins.html b/files/templates/admins.html
index 985875e530..f00b635c08 100644
--- a/files/templates/admins.html
+++ b/files/templates/admins.html
@@ -29,6 +29,6 @@
 	</table>
 </div>
 
-<script src="/assets/js/sort_table.js?v=243"></script>
+<script src="/assets/js/sort_table.js?v=244"></script>
 
 {% endblock %}
diff --git a/files/templates/badges.html b/files/templates/badges.html
index 37852ce2d6..76fd02020d 100644
--- a/files/templates/badges.html
+++ b/files/templates/badges.html
@@ -37,6 +37,6 @@
 	</table>
 </div>
 
-<script src="/assets/js/sort_table.js?v=243"></script>
+<script src="/assets/js/sort_table.js?v=244"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/poll_votes.html b/files/templates/poll_votes.html
index 3964a201c0..d8221f78f5 100644
--- a/files/templates/poll_votes.html
+++ b/files/templates/poll_votes.html
@@ -20,7 +20,7 @@
 			<tr>
 				<th>User</th>
 				<th role="button" onclick="sort_table(1)">User Truescore</th>
-				<th>Vote Time</th>
+				<th role="button" onclick="sort_table(2)">Vote Time</th>
 			</tr>
 		</thead>
 
@@ -41,7 +41,7 @@
 	</table>
 </div>
 
-<script src="/assets/js/sort_table.js?v=243"></script>
+<script src="/assets/js/sort_table.js?v=244"></script>
 
 {% endif %}
 
diff --git a/files/templates/sub/subs.html b/files/templates/sub/subs.html
index 354386f720..1714d3192a 100644
--- a/files/templates/sub/subs.html
+++ b/files/templates/sub/subs.html
@@ -30,6 +30,6 @@
 	</table>
 </div>
 
-<script src="/assets/js/sort_table.js?v=243"></script>
+<script src="/assets/js/sort_table.js?v=244"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/files/templates/votes.html b/files/templates/votes.html
index eb4ad9c75f..429becc2fe 100644
--- a/files/templates/votes.html
+++ b/files/templates/votes.html
@@ -32,7 +32,7 @@
 			<tr>
 				<th>User</th>
 				<th role="button" onclick="sort_table(1)">User Truescore</th>
-				<th>Vote Time</th>
+				<th role="button" onclick="sort_table(2)">Vote Time</th>
 			</tr>
 		</thead>
 
@@ -60,7 +60,7 @@
 			<tr>
 				<th>User</th>
 				<th role="button" onclick="sort_table(1)">User Truescore</th>
-				<th>Vote Time</th>
+				<th role="button" onclick="sort_table(2)">Vote Time</th>
 			</tr>
 		</thead>
 
@@ -81,7 +81,7 @@
 	</table>
 </div>
 
-<script src="/assets/js/sort_table.js?v=243"></script>
+<script src="/assets/js/sort_table.js?v=244"></script>
 
 {% endif %}
 

From a6a6cb925d6bf51ecb5ce757f575b0515a8e1289 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Thu, 14 Jul 2022 18:58:08 +0200
Subject: [PATCH 8/8] more prominent effect on button click

---
 files/templates/util/assetcache.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/files/templates/util/assetcache.html b/files/templates/util/assetcache.html
index 091b550c50..685124c468 100644
--- a/files/templates/util/assetcache.html
+++ b/files/templates/util/assetcache.html
@@ -1,6 +1,6 @@
 {%-
 set CACHE_VER = {
-	'css/main.css': 398,
+	'css/main.css': 399,
 	'css/catalog.css': 2,
 
 	'css/4chan.css': 61,