From f7a52ddb8c3faf226bec9708520bab608b85cacc Mon Sep 17 00:00:00 2001 From: TLSM Date: Fri, 7 Oct 2022 22:32:33 -0400 Subject: [PATCH 01/11] PCM live: stop infinite recursion on invalid input. --- files/routes/static.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/files/routes/static.py b/files/routes/static.py index ccfec09b7..4b54bed28 100644 --- a/files/routes/static.py +++ b/files/routes/static.py @@ -467,7 +467,10 @@ if SITE == 'pcmemes.net': count = "1" if 'περιμένει' in count: - return process_streamer(id, '') + if live != '': + return process_streamer(id, '') + else: + return None count = int(count.replace('.', '')) @@ -480,7 +483,11 @@ if SITE == 'pcmemes.net': return (True, (id, req.url, thumb, name, title, count)) else: t = offline_regex.search(text) - if not t: return process_streamer(id, '') + if not t: + if live != '': + return process_streamer(id, '') + else: + return None y = offline_details_regex.search(text) From 6df6054938bd1886387f702f1cb54cc151cc1a77 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Fri, 7 Oct 2022 20:48:37 -0700 Subject: [PATCH 02/11] remove revert admin actions function --- files/helpers/const.py | 1 - files/routes/admin.py | 50 ----------------------------------- files/templates/userpage.html | 9 +------ 3 files changed, 1 insertion(+), 59 deletions(-) diff --git a/files/helpers/const.py b/files/helpers/const.py index 24735dc68..e0e5217d4 100644 --- a/files/helpers/const.py +++ b/files/helpers/const.py @@ -165,7 +165,6 @@ PERMS = { # Minimum admin_level to perform action. 'ADMIN_ADD': 3, # note: explicitly disabled on rDrama 'ADMIN_REMOVE': 3, 'ADMIN_ADD_PERM_LEVEL': 2, # permission level given when user added via site - 'ADMIN_ACTIONS_REVERT': 3, 'ADMIN_MOP_VISIBLE': 2, 'ADMIN_HOME_VISIBLE': 2, 'DOMAINS_BAN': 3, diff --git a/files/routes/admin.py b/files/routes/admin.py index 4c096f9a2..fe0dac4de 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -247,56 +247,6 @@ def distribute(v, option_id): return {"message": f"Each winner has received {coinsperperson} coins!"} -@app.post("/@/revert_actions") -@limiter.limit("1/second;30/minute;200/hour;1000/day") -@admin_level_required(PERMS['ADMIN_ACTIONS_REVERT']) -def revert_actions(v, username): - user = get_user(username) - - ma = ModAction( - kind="revert", - user_id=v.id, - target_user_id=user.id - ) - g.db.add(ma) - - cutoff = int(time.time()) - 86400 - - posts = [x[0] for x in g.db.query(ModAction.target_submission_id).filter(ModAction.user_id == user.id, ModAction.created_utc > cutoff, ModAction.kind == 'ban_post').all()] - posts = g.db.query(Submission).filter(Submission.id.in_(posts)).all() - - comments = [x[0] for x in g.db.query(ModAction.target_comment_id).filter(ModAction.user_id == user.id, ModAction.created_utc > cutoff, ModAction.kind == 'ban_comment').all()] - comments = g.db.query(Comment).filter(Comment.id.in_(comments)).all() - - for item in posts + comments: - item.is_banned = False - item.ban_reason = None - item.is_approved = v.id - g.db.add(item) - - users = (x[0] for x in g.db.query(ModAction.target_user_id).filter(ModAction.user_id == user.id, ModAction.created_utc > cutoff, ModAction.kind.in_(('shadowban', 'ban_user'))).all()) - users = g.db.query(User).filter(User.id.in_(users)).all() - - for user in users: - user.shadowbanned = None - user.unban_utc = 0 - user.ban_reason = None - if user.is_banned: - user.is_banned = 0 - send_repeatable_notification(user.id, f"@{v.username} has unbanned you!") - g.db.add(user) - - for u in user.alts: - u.shadowbanned = None - u.unban_utc = 0 - u.ban_reason = None - if u.is_banned: - u.is_banned = 0 - send_repeatable_notification(u.id, f"@{v.username} has unbanned you!") - g.db.add(u) - - return {"message": f"@{user.username}'s admin actions has been reverted!"} - @app.post("/@/club_allow") @limiter.limit("1/second;30/minute;200/hour;1000/day") @admin_level_required(PERMS['USER_CLUB_ALLOW_BAN']) diff --git a/files/templates/userpage.html b/files/templates/userpage.html index 79e22bdb5..e81b27639 100644 --- a/files/templates/userpage.html +++ b/files/templates/userpage.html @@ -226,9 +226,6 @@ {% if v.admin_level >= PERMS['ADMIN_REMOVE'] %} Remove admin {% endif %} - {% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] %} - Revert admin actions - {% endif %}
@@ -496,11 +493,7 @@ {% if v.admin_level >= PERMS['ADMIN_REMOVE'] %} Remove admin {% endif %} - - {% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] %} - Revert admin actions - {% endif %} - + 

 						 

From 345608bcf30d3ffe8492ddcdd141d3c0af672d50 Mon Sep 17 00:00:00 2001
From: Aevann1 
Date: Sat, 8 Oct 2022 04:00:08 +0000
Subject: [PATCH 03/11] sneed

---
 seed-db.sql | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/seed-db.sql b/seed-db.sql
index 0afb1b951..f5a253a76 100644
--- a/seed-db.sql
+++ b/seed-db.sql
@@ -288,6 +288,7 @@ INSERT INTO public.hat_defs VALUES (92, 'Top Hat (black)', 'Traditional. Classy.
 INSERT INTO public.hat_defs VALUES (714, 'Captain Falcon', 'The chad that every smash player wanted to imitate, if only his moveset included a shower.', 2, 500, NULL, 1663474615);
 INSERT INTO public.hat_defs VALUES (715, 'Inspector Gadget', '"Go go Gadget Brown Bricks!"', 2, 500, NULL, 1663477536);
 INSERT INTO public.hat_defs VALUES (724, 'Spartan Helmet', 'THIS IS SPARTA!', 2, 500, NULL, 1663892367);
+
 INSERT INTO public.hat_defs VALUES (751, 'Butter', 'Southern-fried and full of love.', 2, 500, NULL, 1664595886);
 INSERT INTO public.hat_defs VALUES (754, 'Crusader helmet', 'RETAKE THE HOLY LAND!', 2, 500, NULL, 1664595954);
 INSERT INTO public.hat_defs VALUES (766, 'book', 'i can read! heheh', 2, 500, NULL, 1664645746);
@@ -296,7 +297,20 @@ INSERT INTO public.hat_defs VALUES (788, 'LGBTUSSR Officer Hat', 'Rule with an i
 INSERT INTO public.hat_defs VALUES (808, 'The Capy 2', 'The drippiest and pimpiest capybara out there.', 2, 500, NULL, 1665104484);
 
 
+
+
+
+
+
+
+
+
+
+
+
 INSERT INTO public.hat_defs VALUES (676, 'Kepi', 'Army cap for those unlucky enough to be French', 2, 500, NULL, 1663303083);
+
+
 INSERT INTO public.hat_defs VALUES (678, 'Turkroach', 'Come on Carp this one''s hilarious. It''s semi transparent to clarify', 2, 500, NULL, 1663305640);
 INSERT INTO public.hat_defs VALUES (679, 'Judge Dredd', 'THIS USER IS THE LAW', 2, 500, NULL, 1663309533);
 INSERT INTO public.hat_defs VALUES (680, 'Hat Stack', 'You are as presumptuous as you are poor and Irish. Challenge not the majesty of my tower of hats.', 2, 500, NULL, 1663310312);
@@ -942,7 +956,7 @@ INSERT INTO public.hat_defs VALUES (504, 'Iron Crown of Lombardy', 'This isn''t
 -- Name: hat_defs_id_seq; Type: SEQUENCE SET; Schema: public; Owner: -
 --
 
-SELECT pg_catalog.setval('public.hat_defs_id_seq', 812, true);
+SELECT pg_catalog.setval('public.hat_defs_id_seq', 827, true);
 
 
 --

From 558ee805ecf3916c80dcf266bd1b8621483f35c8 Mon Sep 17 00:00:00 2001
From: justcool393 
Date: Fri, 7 Oct 2022 21:07:44 -0700
Subject: [PATCH 04/11] re-add revert admin actions function and also fix a bug
 with it

---
 files/helpers/const.py        |  1 +
 files/routes/admin.py         | 50 +++++++++++++++++++++++++++++++++++
 files/templates/userpage.html |  8 ++++--
 3 files changed, 57 insertions(+), 2 deletions(-)

diff --git a/files/helpers/const.py b/files/helpers/const.py
index e0e5217d4..24735dc68 100644
--- a/files/helpers/const.py
+++ b/files/helpers/const.py
@@ -165,6 +165,7 @@ PERMS = { # Minimum admin_level to perform action.
 	'ADMIN_ADD': 3, # note: explicitly disabled on rDrama
 	'ADMIN_REMOVE': 3,
 	'ADMIN_ADD_PERM_LEVEL': 2, # permission level given when user added via site
+	'ADMIN_ACTIONS_REVERT': 3,
 	'ADMIN_MOP_VISIBLE': 2,
 	'ADMIN_HOME_VISIBLE': 2,
 	'DOMAINS_BAN': 3,
diff --git a/files/routes/admin.py b/files/routes/admin.py
index fe0dac4de..0ea454b16 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -247,6 +247,56 @@ def distribute(v, option_id):
 
 	return {"message": f"Each winner has received {coinsperperson} coins!"}
 
+@app.post("/@/revert_actions")
+@limiter.limit("1/second;30/minute;200/hour;1000/day")
+@admin_level_required(PERMS['ADMIN_ACTIONS_REVERT'])
+def revert_actions(v, username):
+	user = get_user(username)
+
+	ma = ModAction(
+		kind="revert",
+		user_id=v.id,
+		target_user_id=user.id
+	)
+	g.db.add(ma)
+
+	cutoff = int(time.time()) - 86400
+
+	posts = [x[0] for x in g.db.query(ModAction.target_submission_id).filter(ModAction.user_id == user.id, ModAction.created_utc > cutoff, ModAction.kind == 'ban_post').all()]
+	posts = g.db.query(Submission).filter(Submission.id.in_(posts)).all()
+
+	comments = [x[0] for x in g.db.query(ModAction.target_comment_id).filter(ModAction.user_id == user.id, ModAction.created_utc > cutoff, ModAction.kind == 'ban_comment').all()]
+	comments = g.db.query(Comment).filter(Comment.id.in_(comments)).all()
+
+	for item in posts + comments:
+		item.is_banned = False
+		item.ban_reason = None
+		item.is_approved = v.id
+		g.db.add(item)
+
+	users = (x[0] for x in g.db.query(ModAction.target_user_id).filter(ModAction.user_id == user.id, ModAction.created_utc > cutoff, ModAction.kind.in_(('shadowban', 'ban_user'))).all())
+	users = g.db.query(User).filter(User.id.in_(users)).all()
+
+	for user in users:
+		user.shadowbanned = None
+		user.unban_utc = 0
+		user.ban_reason = None
+		if user.is_banned:
+			user.is_banned = 0
+			send_repeatable_notification(user.id, f"@{v.username} has unbanned you!")
+		g.db.add(user)
+
+		for u in user.alts:
+			u.shadowbanned = None
+			u.unban_utc = 0
+			u.ban_reason = None
+			if u.is_banned:
+				u.is_banned = 0
+				send_repeatable_notification(u.id, f"@{v.username} has unbanned you!")
+			g.db.add(u)
+
+	return {"message": f"@{user.username}'s admin actions has been reverted!"}
+
 @app.post("/@/club_allow")
 @limiter.limit("1/second;30/minute;200/hour;1000/day")
 @admin_level_required(PERMS['USER_CLUB_ALLOW_BAN'])
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index e81b27639..4849f8ed4 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -227,7 +227,9 @@
 							Remove admin
 						{% endif %}
 						
-
+						{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
+							Revert admin actions
+						{% endif %}
 						
 							 
 							

@@ -493,7 +495,9 @@
 					{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
 						Remove admin
 					{% endif %}
-					
+					{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
+						Revert admin actions
+					{% endif %}
 					
 						

 						 

From d1e065460e2b77f77a7eb892ba0e423bf20f21ba Mon Sep 17 00:00:00 2001
From: TLSM 
Date: Sat, 8 Oct 2022 00:32:03 -0400
Subject: [PATCH 05/11] Fix hole modlog pagination.

---
 files/templates/log.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/templates/log.html b/files/templates/log.html
index 4c4936597..b1882a2c7 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -125,14 +125,14 @@
 			
    
 				{% if page>1 %}
 					
  • 
-						Prev
+						Prev
 					
    • 
 				{% else %}
 					
  • Prev
    • 
 				{% endif %}
 				{% if next_exists %}
 				
  • 
-					Next
+					Next
 				
    • 
 				{% else %}
 					
  • Next
    • 

From 39496700881292163fc134e027b965142b90a528 Mon Sep 17 00:00:00 2001
From: TLSM 
Date: Sat, 8 Oct 2022 01:10:39 -0400
Subject: [PATCH 06/11] WPD: sidebar update for flair & rule changes.

---
 files/assets/css/main.css        | 24 ++++++++++--------------
 files/templates/sidebar_WPD.html | 15 +++++++++------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/files/assets/css/main.css b/files/assets/css/main.css
index ef6cc1bf6..f2d974aec 100644
--- a/files/assets/css/main.css
+++ b/files/assets/css/main.css
@@ -5569,15 +5569,20 @@ audio, video {
 	font-size: 0.95rem;
 }
 
-#sidebar-wpd--flairs {
+.sidebar-wpd--flairs {
 	display: grid;
 	align-items: center;
-	grid-template-columns: repeat(3, 1fr);
-	margin-bottom: 2rem;
 	grid-gap: 1px;
 }
 
-#sidebar-wpd--flairs a {
+.sidebar-wpd--flairs--3 {
+	grid-template-columns: repeat(3, 1fr);
+}
+.sidebar-wpd--flairs--2 {
+	grid-template-columns: repeat(2, 1fr);
+}
+
+.sidebar-wpd--flairs a {
 	padding: 5px 5px 4px 5px;
 	text-align: center;
 	color: var(--muted);
@@ -5585,20 +5590,11 @@ audio, video {
 	box-shadow: 0 0 0 1px var(--primary);
 }
 
-#sidebar-wpd--flairs a:hover {
+.sidebar-wpd--flairs a:hover {
 	color: #fff;
 	text-decoration: none;
 }
 
-#sidebar-lgb--host-notice img {
-	display: block;
-	margin: 1.5rem auto 1rem auto;
-}
-#sidebar-lgb--host-notice a {
-	display: block;
-	text-align: center;
-}
-
 #sidebar--directory--head {
 	display: block;
 	font-size: 1.35rem;
diff --git a/files/templates/sidebar_WPD.html b/files/templates/sidebar_WPD.html
index 3080f4f2e..8b27022e6 100644
--- a/files/templates/sidebar_WPD.html
+++ b/files/templates/sidebar_WPD.html
@@ -25,7 +25,7 @@
 		
    {{sub.sidebar_html|safe}}
    
 	{% endif %}
 
-	
    
+	
    
 		Accident
 		Suicide
 		Animal
@@ -47,12 +47,14 @@
 		Maiming
 		Police
 		Combat
-		Child
 		Gore
-		Misc
-		Request
+		Other
+		Request
+	
    
+	
    
+	
    
+		Meta
 		Discussion
-		Meta
 		Social
 		Music
 	
    
@@ -70,6 +72,7 @@
 			
  • No doxing. No witch hunts.
    • 
 			
  • Posts must include videos of people dying.
 				
      
+					
    • The Discussion, Social, and Music flairs are intentionally off-topic and do not require people dying.
      • 
 					
    • Videos that only include aftermath of a serious accident/incident or current event may be allowed.
      • 
 					
    • No animal death unless there's also a human dying in the video.
      • 
 				
    
@@ -77,7 +80,7 @@
 			
  • Titles should be as descriptive as possible.
 				
      
 					
    • Additional context, images, or sources are always encouraged and appreciated. No joke titles please.
      • 
-					
    • If there is a child or animal, please add it as a descriptor.
      • 
+					
    • If there is a child hurt or killed, please put "Child Warning" in the title.
      • 
 				
    
 			
    • 
 			
  • No explicit racism or bigotry.

From 8f2d656bb31833f584d61f8ebf58339886db490d Mon Sep 17 00:00:00 2001
From: justcool393 
Date: Fri, 7 Oct 2022 22:29:20 -0700
Subject: [PATCH 07/11] rename page and also add macro for ban area

---
 files/templates/userpage.html                 | 37 +++----------------
 ...ls_lower.html => userpage_admintools.html} | 22 +++++++++++
 2 files changed, 28 insertions(+), 31 deletions(-)
 rename files/templates/{userpage_admintools_lower.html => userpage_admintools.html} (90%)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 4849f8ed4..342302e0b 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -29,7 +29,7 @@
 
 {% endblock %}
 
-{% import 'userpage_admintools_lower.html' as userpage_admintools_lower with context %}
+{% import 'userpage_admintools.html' as userpage_admintools with context %}
 
 {% block desktopUserBanner %}
 
@@ -49,25 +49,7 @@
 							
 						
    • 
 						
    
-							{% if u.is_suspended %}
-								
    BANNED USER
-									{% if u.ban_reason %}:
-										{{u.ban_reason | safe}}
-									{% endif %}
-									(by @{{u.banned_by.username}})
-								
    
-								{% if u.unban_utc %}
-									
    {{u.unban_string}}
    
-								{% endif %}
-							{% endif %}
-							{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
-								
    SHADOWBANNED USER
-									{% if u.ban_reason %}:
-										{{u.ban_reason | safe}}
-									{% endif %}
-									(by @{{u.shadowbanned}})
-								
    
-							{% endif %}
+							{{ userpage_admintools.userBanBlock('desktop') }}
 							
    
 								
    {{u.user_name}}
    
 
@@ -271,7 +253,7 @@
 						Toggle anthem
 					{% endif %}
 					
-					{{ userpage_admintools_lower.userAdminToolsLower('desktop') }}
+					{{ userpage_admintools.userAdminToolsLower('desktop') }}
 
 					
    
 					
    
@@ -336,15 +318,8 @@
 				
 			
    
 			
    
-				{% if u.is_suspended %}
-					
    BANNED USER{% if u.ban_reason %}: {{u.ban_reason | safe}}{% endif %} (by @{{u.banned_by.username}})
    
-					{% if u.unban_utc %}
    {{u.unban_string}}
    {% endif %}
-				{% endif %}
-
-				{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
-					
    SHADOWBANNED USER{% if u.ban_reason %}: {{u.ban_reason | safe}}{% endif %} (by @{{u.shadowbanned}})
    
-				{% endif %}
-
+				{{ userpage_admintools.userBanBlock('desktop') }}
+				
 				
    {{u.user_name}}
    
 
 				{% if u.username != u.original_username %}
@@ -530,7 +505,7 @@
 						
 					
    
 
-					{{ userpage_admintools_lower.userAdminToolsLower('mobile') }}
+					{{ userpage_admintools.userAdminToolsLower('mobile') }}
 					
 				{% endif %}
 				
    
diff --git a/files/templates/userpage_admintools_lower.html b/files/templates/userpage_admintools.html
similarity index 90%
rename from files/templates/userpage_admintools_lower.html
rename to files/templates/userpage_admintools.html
index c3112e0ec..5724aec0b 100644
--- a/files/templates/userpage_admintools_lower.html
+++ b/files/templates/userpage_admintools.html
@@ -1,3 +1,25 @@
+{% macro userBanBlock(deviceType) -%}
+	{% if u.is_suspended %}
+			
    BANNED USER
+			{% if u.ban_reason %}:
+				{{u.ban_reason | safe}}
+			{% endif %}
+			(by @{{u.banned_by.username}})
+			
    
+			{% if u.unban_utc %}
+				
    {{u.unban_string}}
    
+			{% endif %}
+		{% endif %}
+		{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
+			
    SHADOWBANNED USER
+			{% if u.ban_reason %}:
+				{{u.ban_reason | safe}}
+			{% endif %}
+			(by @{{u.shadowbanned}})
+			
    
+		{% endif %}
+{%- endmacro %}
+
 {% macro userAdminToolsLower(deviceType) -%}
 	{% if v and v.id != u.id and v.admin_level >= PERMS['USER_MODERATION_TOOLS_VISIBLE'] %}
 		
    

From 45a52e96f4e45e7c9004d82fd4bc15fdadf627a3 Mon Sep 17 00:00:00 2001
From: justcool393 
Date: Fri, 7 Oct 2022 22:30:57 -0700
Subject: [PATCH 08/11] some small whitespace changes

---
 files/templates/userpage_admintools.html | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index 5724aec0b..d65ec6e53 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -1,23 +1,23 @@
 {% macro userBanBlock(deviceType) -%}
 	{% if u.is_suspended %}
-			
    BANNED USER
-			{% if u.ban_reason %}:
-				{{u.ban_reason | safe}}
-			{% endif %}
-			(by @{{u.banned_by.username}})
-			
    
-			{% if u.unban_utc %}
-				
    {{u.unban_string}}
    
-			{% endif %}
+		
    BANNED USER
+		{% if u.ban_reason %}:
+			{{u.ban_reason | safe}}
 		{% endif %}
-		{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
-			
    SHADOWBANNED USER
-			{% if u.ban_reason %}:
-				{{u.ban_reason | safe}}
-			{% endif %}
-			(by @{{u.shadowbanned}})
-			
    
+		(by @{{u.banned_by.username}})
+		
+		{% if u.unban_utc %}
+			
    {{u.unban_string}}
    
 		{% endif %}
+	{% endif %}
+	{% if v and v.admin_level >= PERMS['USER_SHADOWBAN'] and u.shadowbanned %}
+		
    SHADOWBANNED USER
+		{% if u.ban_reason %}:
+			{{u.ban_reason | safe}}
+		{% endif %}
+		(by @{{u.shadowbanned}})
+		
    
+	{% endif %}
 {%- endmacro %}
 
 {% macro userAdminToolsLower(deviceType) -%}

From 437f7e63d7845b6c88e598961deb5c0c7aed6ea3 Mon Sep 17 00:00:00 2001
From: justcool393 
Date: Fri, 7 Oct 2022 22:38:29 -0700
Subject: [PATCH 09/11] upper admin tools macro also we change the remove admin
 and revert admin actions button to be red

---
 files/templates/userpage.html            | 24 +++---------------------
 files/templates/userpage_admintools.html | 13 +++++++++++++
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 342302e0b..602ddc4b2 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -202,16 +202,8 @@
 
 						Block
 
-						{% if v.admin_level >= PERMS['ADMIN_ADD'] and SITE != 'rdrama.net' %}
-							Make admin
-						{% endif %}
-						{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
-							Remove admin
-						{% endif %}
-						
    
-						{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
-							Revert admin actions
-						{% endif %}
+						{{ userpage_admintools.userAdminToolsUpper('desktop') }}
+						
 						
 							 
 							
    
@@ -319,7 +311,6 @@
 			
    
 			
    
 				{{ userpage_admintools.userBanBlock('desktop') }}
-				
 				
    {{u.user_name}}
    
 
 				{% if u.username != u.original_username %}
@@ -463,16 +454,7 @@
 
 					Block
 
-					{% if v.admin_level >= PERMS['ADMIN_ADD'] and SITE != 'rdrama.net' %}
-						Make admin
-					{% endif %}
-
-					{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
-						Remove admin
-					{% endif %}
-					{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
-						Revert admin actions
-					{% endif %}
+					{{ userpage_admintools.userAdminToolsUpper('mobile') }}
 					
 						
    
 						 
diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index d65ec6e53..302a52e4b 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -20,6 +20,19 @@
 	{% endif %}
 {%- endmacro %}
 
+{% macro userAdminToolsUpper(deviceType) -%}
+	{% if v and v.id != u.id and v.admin_level >= PERMS['USER_MODERATION_TOOLS_VISIBLE'] %}
+		{% if v.admin_level >= PERMS['ADMIN_ADD'] and SITE != 'rdrama.net' %}
+			Make admin
+		{% endif %}
+		{% if v.admin_level >= PERMS['ADMIN_REMOVE'] %}
+			Remove admin
+		{% endif %}
+		{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
+			Revert admin actions
+		{% endif %}
+{%- endmacro %}
+
 {% macro userAdminToolsLower(deviceType) -%}
 	{% if v and v.id != u.id and v.admin_level >= PERMS['USER_MODERATION_TOOLS_VISIBLE'] %}
 		
    

From a910cede78307c1bcf17ff97a7419d0090e6ba59 Mon Sep 17 00:00:00 2001
From: justcool393 
Date: Fri, 7 Oct 2022 22:41:01 -0700
Subject: [PATCH 10/11] userBanBlock block was incorrect on mobile

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

diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 602ddc4b2..b70b76d66 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -310,7 +310,7 @@
 				
 			
    
 			
    
-				{{ userpage_admintools.userBanBlock('desktop') }}
+				{{ userpage_admintools.userBanBlock('mobile') }}
 				
    {{u.user_name}}
    
 
 				{% if u.username != u.original_username %}

From 1f996662d4f34842b93f44c278d57b46e0b26ae1 Mon Sep 17 00:00:00 2001
From: justcool393 
Date: Fri, 7 Oct 2022 23:02:21 -0700
Subject: [PATCH 11/11] end if

---
 files/templates/userpage_admintools.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/files/templates/userpage_admintools.html b/files/templates/userpage_admintools.html
index 302a52e4b..8348430ec 100644
--- a/files/templates/userpage_admintools.html
+++ b/files/templates/userpage_admintools.html
@@ -31,6 +31,7 @@
 		{% if v.admin_level >= PERMS['ADMIN_ACTIONS_REVERT'] and u.admin_level %}
 			Revert admin actions
 		{% endif %}
+	{% endif %}
 {%- endmacro %}
 
 {% macro userAdminToolsLower(deviceType) -%}