From 0b30067876c121eeeae73fcafed80ba39be469e5 Mon Sep 17 00:00:00 2001
From: Aevann <randomname42029@gmail.com>
Date: Sun, 29 Jan 2023 10:28:29 +0200
Subject: [PATCH] tweak admin perms

---
 files/helpers/config/const.py            | 49 +++++++++++++-----------
 files/routes/admin.py                    |  2 +-
 files/templates/comments.html            |  4 +-
 files/templates/submission.html          |  4 +-
 files/templates/userpage/admintools.html |  2 +-
 5 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/files/helpers/config/const.py b/files/helpers/config/const.py
index 06aebf8c0e..a6d51434c4 100644
--- a/files/helpers/config/const.py
+++ b/files/helpers/config/const.py
@@ -412,11 +412,11 @@ PERMS = { # Minimum admin_level to perform action.
  	'USER_FOLLOWS_VISIBLE': 0,
  	'USER_VOTERS_VISIBLE': 0,
  	'VIEW_PENDING_SUBMITTED_MARSEYS': 0,
+
  	'POST_COMMENT_INFINITE_PINGS': 1,
  	'POST_COMMENT_DISTINGUISH': 1,
  	'POST_BYPASS_REPOST_CHECKING': 1,
  	'POST_IN_GHOST_THREADS': 1,
- 	'POST_TO_CHANGELOG': 1,
  	'VIEW_CLUB': 1,
  	'VIEW_CHUDRAMA': 1,
  	'SITE_BYPASS_READ_ONLY_MODE': 1,
@@ -425,33 +425,34 @@ PERMS = { # Minimum admin_level to perform action.
  	'NOTIFICATIONS_REDDIT': 1,
  	'NOTIFICATIONS_SPECIFIC_WPD_COMMENTS': 1,
  	'MESSAGE_BLOCKED_USERS': 1,
- 	'ADMIN_ADD_PERM_LEVEL': 2,
- 	'ADMIN_MOP_VISIBLE': 2,
- 	'ADMIN_HOME_VISIBLE': 2,
- 	'FLAGS_REMOVE': 2,
- 	'POST_COMMENT_MODERATION': 2,
- 	'POST_COMMENT_MODERATION_TOOLS_VISIBLE': 2,
+ 	'ADMIN_MOP_VISIBLE': 1,
+ 	'ADMIN_HOME_VISIBLE': 1,
+ 	'FLAGS_REMOVE': 1,
+ 	'POST_COMMENT_MODERATION': 1,
+ 	'USER_BAN': 1,
+ 	'USER_SHADOWBAN': 1,
+ 	'USER_AGENDAPOSTER': 1,
+ 	'USER_MODERATION_TOOLS_VISIBLE': 1,
+ 	'VIEW_MODMAIL': 1,
+ 	'NOTIFICATIONS_MODMAIL': 1,
+ 	'VIEW_PRIVATE_PROFILES': 1,
+ 	'VIEW_ALTS': 1,
+ 	'VIEW_ACTIVE_USERS': 1,
+ 	'VIEW_ALT_VOTES': 1,
+ 	'VIEW_LAST_ACTIVE': 1,
+ 	'VIEW_VOTE_BUTTONS_ON_USER_PAGE': 1,
+ 	'NOTIFICATIONS_HOLE_INACTIVITY_DELETION': 1,
+ 	'NOTIFICATIONS_HOLE_CREATION': 1,
+ 	'NOTIFICATIONS_MODERATOR_ACTIONS': 1,
+
+ 	'POST_TO_CHANGELOG': 2,
  	'USER_BADGES': 2,
- 	'USER_BAN': 2,
- 	'USER_SHADOWBAN': 2,
- 	'USER_AGENDAPOSTER': 2,
  	'USER_LINK': 2,
  	'USER_TITLE_CHANGE': 2,
- 	'USER_MODERATION_TOOLS_VISIBLE': 2,
  	'POST_TO_POLL_THREAD': 2,
  	'BUY_GHOST_AWARD': 2,
  	'LOTTERY_VIEW_PARTICIPANTS': 2,
- 	'VIEW_MODMAIL': 2,
- 	'VIEW_PRIVATE_PROFILES': 2,
- 	'VIEW_ALTS': 2,
- 	'VIEW_ACTIVE_USERS': 2,
- 	'VIEW_ALT_VOTES': 2,
- 	'VIEW_LAST_ACTIVE': 2,
- 	'VIEW_VOTE_BUTTONS_ON_USER_PAGE': 2,
- 	'NOTIFICATIONS_ADMIN_PING': 2,
- 	'NOTIFICATIONS_HOLE_INACTIVITY_DELETION': 2,
- 	'NOTIFICATIONS_HOLE_CREATION': 2,
- 	'NOTIFICATIONS_MODERATOR_ACTIONS': 2,
+
  	'ADMIN_ADD': 3,
  	'ADMIN_REMOVE': 3,
  	'ADMIN_ACTIONS_REVERT': 3,
@@ -467,10 +468,12 @@ PERMS = { # Minimum admin_level to perform action.
  	'SITE_SETTINGS_UNDER_ATTACK': 3,
  	'SITE_CACHE_PURGE_CDN': 3,
  	'NOTIFICATIONS_FROM_SHADOWBANNED_USERS': 3,
- 	'NOTIFICATIONS_MODMAIL': 3,
  	'APPS_MODERATION': 3,
+
  	'MODERATE_PENDING_SUBMITTED_ASSETS': 4,
+
 	'PROGSTACK': 5,
+
 	'USER_BLACKLIST': 6,
  	'POST_EDITING': 6,
  	'UPDATE_ASSETS': 6,
diff --git a/files/routes/admin.py b/files/routes/admin.py
index 4c514e515a..ec306fc09c 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -85,7 +85,7 @@ def edit_rules_post(v):
 def make_admin(v:User, username):
 	user = get_user(username)
 
-	user.admin_level = PERMS['ADMIN_ADD_PERM_LEVEL']
+	user.admin_level = 1
 	g.db.add(user)
 
 	ma = ModAction(
diff --git a/files/templates/comments.html b/files/templates/comments.html
index bb950db57c..9b11592eae 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -632,7 +632,7 @@
 
 
 
-{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION_TOOLS_VISIBLE'] %}
+{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 	<div class="modal fade d-md-none" id="adminModal-{{c.id}}" tabindex="-1">
 		<div class="modal-dialog modal-dialog-centered">
 			<div class="modal-content">
@@ -761,7 +761,7 @@
 
 	<script defer src="{{'js/vendor/clipboard.js' | asset}}"></script>
 
-	{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION_TOOLS_VISIBLE'] %}
+	{% 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.html b/files/templates/submission.html
index ded152863d..25887f54e6 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -50,7 +50,7 @@
 	</div>
 {% endif %}
 
-{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION_TOOLS_VISIBLE'] %}
+{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 	{% include "post_admin_actions_mobile.html" %}
 {% endif %}
 
@@ -254,7 +254,7 @@
 						<i class="fas fa-comment-dots mr-2"></i>{{p.comment_count}}
 						<span class="text-info d-none {{p.id}}-new-comments"></span>
 					</a>
-					{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION_TOOLS_VISIBLE'] %}
+					{% if v and v.admin_level >= PERMS['POST_COMMENT_MODERATION'] %}
 						<button type="button" class="ml-2" data-bs-toggle="modal" data-bs-target="#adminModal-{{p.id}}">
 							<i class="fas fa-broom"></i>
 						</button>
diff --git a/files/templates/userpage/admintools.html b/files/templates/userpage/admintools.html
index 4041643151..be88d89b7e 100644
--- a/files/templates/userpage/admintools.html
+++ b/files/templates/userpage/admintools.html
@@ -76,7 +76,7 @@
 
 			<div class="actionbtns mt-3">
 				{% if v.admin_level >= PERMS['ADMIN_ADD'] %}
-					<button type="button" id="add-admin-{{deviceType}}" class="{% if u.admin_level >= PERMS['ADMIN_ADD_PERM_LEVEL'] %}d-none{% endif %} btn btn-primary" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/@{{u.username}}/make_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Make Admin</button>
+					<button type="button" id="add-admin-{{deviceType}}" class="btn btn-primary" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/@{{u.username}}/make_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Make Admin</button>
 				{% endif %}
 				{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
 					<button type="button" id="remove-admin-{{deviceType}}" class="{% if u.admin_level < 1 %}d-none{% endif %} btn btn-danger" data-nonce="{{g.nonce}}" data-onclick="postToastSwitch(this,'/@{{u.username}}/remove_admin','add-admin-{{deviceType}}','remove-admin-{{deviceType}}','d-none')">Remove Admin</button>