From 9bb7b3758f5a41b5ae0a6732a45d6a8f43278400 Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Wed, 5 Oct 2022 21:19:11 -0700
Subject: [PATCH] distinguish stuff

---
 files/helpers/const.py                         | 1 +
 files/routes/admin.py                          | 4 ++--
 files/templates/comments.html                  | 2 +-
 files/templates/post_actions.html              | 2 +-
 files/templates/post_admin_actions_mobile.html | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index 6b073b502..64cddcfa3 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -128,6 +128,7 @@ PERMS = { # Minimum admin_level to perform action.
 	'USER_FOLLOWS_VISIBLE': 0,
 	'USER_VOTERS_VISIBLE': 0,
 	'POST_COMMENT_MODERATION': 2,
+	'POST_COMMENT_DISTINGUISH': 1,
 	'GLOBAL_HOLE_MODERATION': 3,
 	'POST_EDITING': 3,
 	'USER_BADGES': 2,
diff --git a/files/routes/admin.py b/files/routes/admin.py
index cac8c6179..42c7bead9 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -1176,7 +1176,7 @@ def approve_post(post_id, v):
 
 
 @app.post("/distinguish/<post_id>")
-@admin_level_required(1)
+@admin_level_required(PERMS['POST_COMMENT_DISTINGUISH'])
 def distinguish_post(post_id, v):
 	post = get_post(post_id)
 
@@ -1357,7 +1357,7 @@ def approve_comment(c_id, v):
 
 
 @app.post("/distinguish_comment/<c_id>")
-@admin_level_required(1)
+@admin_level_required(PERMS['POST_COMMENT_DISTINGUISH'])
 def admin_distinguish_comment(c_id, v):
 	
 	
diff --git a/files/templates/comments.html b/files/templates/comments.html
index 18618c3a4..fefc030e2 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -432,7 +432,7 @@
 							<button style="margin-top:0.2rem" class="btn caction py-0 nobackground px-1 text-muted" data-bs-toggle="dropdown" aria-expanded="false"><i class="fas fa-ellipsis-h fa-fw"></i></button>
 							<ul class="dropdown-menu">
 
-{% if v.admin_level and v.id==c.author_id %}
+{% if (v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] and (v.id==c.author_id or v.admin_level >= PERMS['POST_COMMENT_MODERATION']) %}
 	<button id="undistinguish-{{c.id}}" class="dropdown-item list-inline-item d-none {% if c.distinguish_level %}d-md-block{% endif %} text-info" onclick="post_toast(this,'/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','d-md-block')"><i class="fas fa-id-badge text-info fa-fw"></i>Undistinguish</button>
 	<button id="distinguish-{{c.id}}" class="dropdown-item list-inline-item d-none {% if not c.distinguish_level %}d-md-block{% endif %} text-info" onclick="post_toast(this,'/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','d-md-block')"><i class="fas fa-id-badge text-info fa-fw"></i>Distinguish</button>
 {% endif %}
diff --git a/files/templates/post_actions.html b/files/templates/post_actions.html
index e2a94d6a9..4aed29a6b 100644
--- a/files/templates/post_actions.html
+++ b/files/templates/post_actions.html
@@ -40,7 +40,7 @@
 	{% if v %}
 		<a class="list-inline-item" role="button" data-bs-toggle="dropdown" aria-expanded="false"><i class="fas fa-ellipsis-h fa-fw"></i></a>
 		<ul class="dropdown-menu">
-			{% if v.admin_level %}
+			{% if v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] %}
 				<a id="distinguish-{{p.id}}" class="dropdown-item {% if p.distinguish_level %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast(this,'/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}','d-none')"><i class="fas fa-crown"></i>Distinguish</a>
 				<a id="undistinguish-{{p.id}}" class="dropdown-item {% if not p.distinguish_level %}d-none{% endif %} list-inline-item text-info" role="button" onclick="post_toast(this,'/distinguish/{{p.id}}','distinguish-{{p.id}}','undistinguish-{{p.id}}','d-none')"><i class="fas fa-crown"></i>Undistinguish</a>
 			{% endif %}
diff --git a/files/templates/post_admin_actions_mobile.html b/files/templates/post_admin_actions_mobile.html
index ee568c0b9..c0f739962 100644
--- a/files/templates/post_admin_actions_mobile.html
+++ b/files/templates/post_admin_actions_mobile.html
@@ -17,11 +17,11 @@
 					<button id="club2-{{p.id}}" class="{% if p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" role="button" onclick="post_toast(this,'/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye-slash mr-2"></i>Mark club</button>
 					<button id="unclub2-{{p.id}}" class="{% if not p.club %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-info text-left" role="button" onclick="post_toast(this,'/toggle_club/{{p.id}}','club2-{{p.id}}','unclub2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-eye mr-2"></i>Unmark club</button>
 					{%- endif %}
-
+					{% if (v.admin_level >= PERMS['POST_COMMENT_DISTINGUISH'] and (v.id==c.author_id or v.admin_level >= PERMS['POST_COMMENT_MODERATION']) %}
 					<button id="distinguish2-{{p.id}}" class="{% if p.distinguish_level %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" role="button" onclick="post_toast(this,'/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-crown text-center text-primary mr-2"></i>Distinguish</button>
 
 					<button id="undistinguish2-{{p.id}}" class="{% if not p.distinguish_level %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" role="button" onclick="post_toast(this,'/distinguish/{{p.id}}','distinguish2-{{p.id}}','undistinguish2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-crown text-center text-primary mr-2"></i>Undistinguish</button>
-
+					{% endif %}
 					<button id="pin2-{{p.id}}" class="{% if p.stickied %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" role="button" onclick="post_toast(this,'/sticky/{{p.id}}','pin2-{{p.id}}','unpin2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center text-primary mr-2"></i>Pin</button>
 
 					<button id="unpin2-{{p.id}}" class="{% if not p.stickied %}d-none{% endif %} nobackground btn btn-link btn-block btn-lg text-left text-primary" role="button" onclick="post_toast(this,'/unsticky/{{p.id}}','pin2-{{p.id}}','unpin2-{{p.id}}','d-none')" data-bs-dismiss="modal"><i class="fas fa-thumbtack fa-rotate--45 text-center text-primary mr-2"></i>Unpin</button>