From f5be49c33680d5b3454434da387a142d36d01ad5 Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Thu, 6 Oct 2022 00:17:12 -0700
Subject: [PATCH] some template end stuff i feel like this one is ehhhh and
 might have to be fixed at some point i'm not sure where some of these things
 are used, the templates really need to be refactored

---
 files/templates/comments.html           | 21 +++++++++++----------
 files/templates/submission_listing.html |  4 ++--
 files/templates/userpage.html           | 12 ++++++------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/files/templates/comments.html b/files/templates/comments.html
index 95c3d504a..556c7ca40 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -682,7 +682,7 @@
 
 
 
-{% if v and v.admin_level > 1 %}
+{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
 	<div class="modal fade d-md-none" id="adminModal-{{c.id}}" tabindex="-1" role="dialog" aria-labelledby="actionsModalTitle" aria-hidden="true">
 		<div class="modal-dialog modal-dialog-centered" role="document">
 			<div class="modal-content">
@@ -707,17 +707,18 @@
 							<a id="unmark2-{{c.id}}" class="{% if not c.over_18 %}d-none{% endif %} list-group-item text-danger" role="button" onclick="post_toast(this,'/toggle_comment_nsfw/{{c.id}}','mark2-{{c.id}}','unmark2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-evil text-danger mr-2"></i>Unmark +18</a>
 						{% endif %}
 
-						{% if v.id != c.author_id %}
+						{% if v.id != c.author_id and v.admin_level >= PERMS['USER_BAN'] %}
 							<a id="ban2-{{c.id}}" class="{% if c.author.is_banned %}d-none{% endif %} list-group-item text-danger" data-bs-dismiss="modal" data-bs-toggle="modal" data-bs-target="#banModal" onclick="banModal('/comment/{{c.id}}', '{{c.author.id}}', '{{c.author_name}}')" role="button"><i class="fas fa-user-slash text-danger fa-fw mr-2"></i>Ban user</a>
 							<a id="unban2-{{c.id}}" class="{% if not c.author.is_banned %}d-none{% endif %} list-group-item text-success" role="button" onclick="post_toast(this,'/unban_user/{{c.author_id}}','ban2-{{c.id}}','unban2-{{c.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-user-minus fa-fw text-success mr-2"></i>Unban user</a>
 						{% endif %}
-
-						{% if "/reported/" in request.path %}
-							<a class="list-group-item text-danger" role="button" onclick="removeComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
-							<a class="list-group-item text-success" role="button" onclick="approveComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
-						{% else %}
-							<a id="remove2-{{c.id}}" class="{% if c.is_banned %}d-none{% endif %} list-group-item text-danger" role="button" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
-							<a id="approve2-{{c.id}}" class="{% if not c.is_banned %}d-none{% endif %} list-group-item text-success" role="button" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
+						{% if v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
+							{% if "/reported/" in request.path %}
+								<a class="list-group-item text-danger" role="button" onclick="removeComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
+								<a class="list-group-item text-success" role="button" onclick="approveComment2('{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
+							{% else %}
+								<a id="remove2-{{c.id}}" class="{% if c.is_banned %}d-none{% endif %} list-group-item text-danger" role="button" onclick="removeComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-ban text-danger mr-2"></i>Remove</a>
+								<a id="approve2-{{c.id}}" class="{% if not c.is_banned %}d-none{% endif %} list-group-item text-success" role="button" onclick="approveComment2('{{c.id}}','approve2-{{c.id}}','remove2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-check text-success mr-2"></i>Approve</a>
+							{% endif %}
 						{% endif %}
 
 						{% if c.oauth_app and v.admin_level >= PERMS['APPS_MODERATE'] %}
@@ -819,7 +820,7 @@
 
 	<script defer src="{{'js/clipboard.js' | asset}}"></script>
 
-	{% if v and v.admin_level >= 2 %}
+	{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 		<script defer src="{{'js/comments_admin.js' | asset}}"></script>
 	{% endif %}
 
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index 01ed1c5b1..6cdb61256 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -225,7 +225,7 @@
 					<span class="text-info d-none {{p.id}}-new-comments"></span>
 				</a>
 
-				{% if v and v.admin_level > 1 %}
+				{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
 					<a class="ml-2" role="button" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
 						<i class="fas fa-broom"></i>
 					</a>
@@ -311,7 +311,7 @@
 </script>
 
 
-{% if v and v.admin_level > 1 %}
+{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 	{% include "post_admin_actions_mobile.html" %}
 {% endif %}
 
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index c44fb0153..da0c5a58c 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -270,7 +270,7 @@
 						<a class="btn btn-secondary" role="button" onclick="toggle()">Toggle anthem</a>
 					{% endif %}
 
-					{% if v and v.id != u.id and v.admin_level > 1 %}
+					{% if v and v.id != u.id and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
 						<br><br>
 						<div class="body d-lg-flex border-bottom">
 							{% if v.admin_level >= PERMS['USER_TITLE_CHANGE'] %}
@@ -638,12 +638,12 @@
 						<button class="btn btn-primary mt-2 mb-3" onclick="transferBux(true)">Gift</button>
 					</div>
 
-					{% if v.admin_level > 1 %}
+					{% if v and v.admin_level >= PERMS['ADMIN_HOME_VISIBLE'] %}
 
-					{% if FEATURES['COUNTRY_CLUB'] and v.admin_level >= PERMS['USER_CLUB_ALLOW_BAN'] -%}
-					<button id="grant" class="{% if u.paid_dues %}d-none{% endif %} btn btn-success" onclick="post_toast(this,'/@{{u.username}}/club_allow','grant','bar','d-none')">Grant club access</button>
-					<button id="bar" class="{% if u.club_allowed == False %}d-none{% endif %} btn btn-danger" onclick="post_toast(this,'/@{{u.username}}/club_ban','grant','bar','d-none')">Bar from club</button>
-					{%- endif %}
+						{% if FEATURES['COUNTRY_CLUB'] and v.admin_level >= PERMS['USER_CLUB_ALLOW_BAN'] -%}
+							<button id="grant" class="{% if u.paid_dues %}d-none{% endif %} btn btn-success" onclick="post_toast(this,'/@{{u.username}}/club_allow','grant','bar','d-none')">Grant club access</button>
+							<button id="bar" class="{% if u.club_allowed == False %}d-none{% endif %} btn btn-danger" onclick="post_toast(this,'/@{{u.username}}/club_ban','grant','bar','d-none')">Bar from club</button>
+						{%- endif %}
 
 						<br><br>
 						<div class="body d-lg-flex border-bottom">