From ba3996159e41137f62dc0547ff5b8c9ca92b2349 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Fri, 10 Dec 2021 06:00:52 +0200
Subject: [PATCH] fsdfds

---
 files/routes/settings.py                | 2 ++
 files/templates/comments.html           | 4 ++--
 files/templates/submission.html         | 4 ++--
 files/templates/submission_listing.html | 4 ++--
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/files/routes/settings.py b/files/routes/settings.py
index 0d01fbfe84..94face50c0 100644
--- a/files/routes/settings.py
+++ b/files/routes/settings.py
@@ -851,6 +851,8 @@ def settings_profilecss(v):
 @validate_formkey
 def settings_block_user(v):
 
+	if v and v.admin_level: return {"error": "Admins can't block users."}, 403
+
 	user = get_user(request.values.get("username"), graceful=True)
 
 	if not user: return {"error": "That user doesn't exist."}, 404
diff --git a/files/templates/comments.html b/files/templates/comments.html
index c02649c828..cb0907200f 100644
--- a/files/templates/comments.html
+++ b/files/templates/comments.html
@@ -373,7 +373,7 @@
 							<a id="distinguish-{{c.id}}" class="list-inline-item d-none {% if not c.distinguish_level %}d-md-inline-block{% endif %} text-info" href="javascript:void(0)" onclick="post_toast3('/distinguish_comment/{{c.id}}','distinguish-{{c.id}}','undistinguish-{{c.id}}','yes')"><i class="fas fa-id-badge text-info fa-fw"></i>Distinguish</a>
 						{% endif %}
 
-						{% if v and not v.id==c.author_id%}
+						{% if v and not v.id==c.author_id and not v.admin_level %}
 							<a id="unblock-{{c.id}}" class="text-success {% if c.is_blocking %}d-md-inline-block{% endif %} list-inline-item d-none" href="javascript:void(0)" onclick="post_toast3('/settings/unblock?username={{c.author.username}}','block-{{c.id}}','unblock-{{c.id}}')"><i class="fas fa-eye-slash fa-fw text-success"></i>Unblock user</a>
 
 							<a id="prompt-{{c.id}}" class="blockuser list-inline-item d-none text-danger" href="javascript:void(0)" onclick="post_toast3('/settings/block?username={{c.author.username}}','prompt-{{c.id}}','unblock-{{c.id}}')"><i class="fas fa-eye-slash fa-fw text-danger"></i>Are you sure?</a>
@@ -562,7 +562,7 @@
 							<a href="{{c.oauth_app.permalink}}/comments" class="list-group-item text-info" ><i class="fas fa-code text-info"></i>API App</a>
 						{% endif %}
 
-						{% if not v.id==c.author_id %}
+						{% if not v.id==c.author_id and not v.admin_level %}
 							<a id="unblock2-{{c.id}}" data-bs-dismiss="modal" class="text-success list-group-item {% if not c.is_blocking %}d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{c.author.username}}','block2-{{c.id}}','unblock2-{{c.id}}')" data-bs-dismiss="modal"><i class="fas fa-eye-slash text-success"></i>Unblock user</a>
 
 							<a id="prompt2-{{c.id}}" data-bs-dismiss="modal" class="blockuser list-group-item d-none text-danger" href="javascript:void(0)" onclick="post_toast2('/settings/block?username={{c.author.username}}','prompt2-{{c.id}}','unblock2-{{c.id}}')"><i class="fas fa-eye-slash fa-fw text-danger"></i>Are you sure?</a>
diff --git a/files/templates/submission.html b/files/templates/submission.html
index db3ce37219..7cdfe9230b 100644
--- a/files/templates/submission.html
+++ b/files/templates/submission.html
@@ -293,7 +293,7 @@
 
 					{% endif %}
 
-					{% if v and v.id != p.author_id %}
+					{% if v and v.id != p.author_id and not v.admin_level %}
 						<button id="unblock2-{{p.id}}" class="nobackground btn btn-link btn-block btn-lg text-success text-left{% if not p.is_blocking %} d-none{% endif %}" data-bs-dismiss="modal" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block2-{{p.id}}','unblock2-{{p.id}}')"><i class="fas fa-eye mr-3 text-success"></i>Unblock user</button>
 
 						<button id="prompt2-{{p.id}}" class="blockuser nobackground btn btn-link btn-block btn-lg text-danger text-left d-none" data-bs-dismiss="modal" onclick="post_toast2('/settings/block?username={{p.author.username}}','prompt2-{{p.id}}','unblock2-{{p.id}}')"><i class="fas fa-eye-slash mr-3 text-danger"></i>Are you sure?</button>
@@ -611,7 +611,7 @@
 								<a class="list-inline-item" href="{{p.oauth_app.permalink}}" ><i class="fas fa-code"></i>API App</a>
 							{% endif %}
 
-							{% if not v.id==p.author_id %}								
+							{% if not v.id==p.author_id and not v.admin_level %}								
 								<a id="unblock-{{p.id}}" class="text-success list-inline-item {% if not p.is_blocking %} d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block-{{p.id}}','unblock-{{p.id}}')"><i class="fas fa-eye text-success"></i>Unblock user</a>
 
 								<a id="prompt-{{p.id}}" class="text-danger blockuser list-inline-item d-none" href="javascript:void(0)" onclick="post_toast2('/settings/block?username={{p.author.username}}','prompt-{{p.id}}','unblock-{{p.id}}')"><i class="fas fa-eye-slash text-danger"></i>Are you sure?</a>
diff --git a/files/templates/submission_listing.html b/files/templates/submission_listing.html
index b9688933c4..76a3368e3c 100644
--- a/files/templates/submission_listing.html
+++ b/files/templates/submission_listing.html
@@ -274,7 +274,7 @@
 								<a class="list-inline-item" href="{{p.oauth_app.permalink}}" ><i class="fas fa-code"></i>API App</a>
 							{% endif %}
 
-							{% if not v.id==p.author_id %}
+							{% if not v.id==p.author_id and not v.admin_level %}
 								<a id="unblock-{{p.id}}" class="text-success list-inline-item {% if not p.is_blocking %} d-none{% endif %}" href="javascript:void(0)" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block-{{p.id}}','unblock-{{p.id}}')"><i class="fas fa-eye text-success"></i>Unblock user</a>
 
 								<a id="prompt-{{p.id}}" class="text-danger blockuser list-inline-item d-none" href="javascript:void(0)" onclick="post_toast2('/settings/block?username={{p.author.username}}','prompt-{{p.id}}','unblock-{{p.id}}')"><i class="fas fa-eye-slash text-danger"></i>Are you sure?</a>
@@ -438,7 +438,7 @@
 
 					{% endif %}
 
-					{% if v and v.id != p.author_id %}
+					{% if v and v.id != p.author_id and not v.admin_level %}
 						<button id="unblock2-{{p.id}}" class="nobackground btn btn-link btn-block btn-lg text-success text-left{% if not p.is_blocking %} d-none{% endif %}" data-bs-dismiss="modal" onclick="post_toast2('/settings/unblock?username={{p.author.username}}','block2-{{p.id}}','unblock2-{{p.id}}')"><i class="fas fa-eye mr-3 text-success"></i>Unblock user</button>
 
 						<button id="prompt2-{{p.id}}" class="blockuser nobackground btn btn-link btn-block btn-lg text-danger text-left d-none" data-bs-dismiss="modal" onclick="post_toast2('/settings/block?username={{p.author.username}}','prompt2-{{p.id}}','unblock2-{{p.id}}')"><i class="fas fa-eye-slash mr-3 text-danger"></i>Are you sure?</button>