From dbfc25b5f790c659f9f0756594045ad91f5cd3aa Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 3 Jan 2022 12:39:41 +0200
Subject: [PATCH] fsdfs

---
 files/routes/admin.py                 | 18 ------------------
 files/routes/login.py                 |  8 ++------
 files/routes/users.py                 | 19 +++++++++++++++++++
 files/templates/admin/admin_home.html |  4 ++--
 files/templates/grassed.html          |  9 ++++++---
 files/templates/shadowbanned.html     |  7 ++++---
 6 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/files/routes/admin.py b/files/routes/admin.py
index 58e3ffbe6..6d5a273c6 100644
--- a/files/routes/admin.py
+++ b/files/routes/admin.py
@@ -54,16 +54,6 @@ def remove_admin(v, username):
 	g.db.commit()
 	return {"message": "Admin removed!"}
 
-
-@app.get("/admin/grassed")
-@admin_level_required(2)
-def grassed(v):
-	users = g.db.query(User).filter(User.ban_reason.like('grass award used by @%')).all()
-
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}grassed.html", v=v, users=users)
-
 @app.post("/distribute/<comment>")
 @limiter.limit("1/second")
 @admin_level_required(3)
@@ -287,14 +277,6 @@ def shadowbanned(v):
 	else: template = 'CHRISTMAS/'
 	return render_template(f"{template}shadowbanned.html", v=v, users=users)
 
-@app.get("/agendaposters")
-@auth_desired
-def agendaposters(v):
-	users = [x for x in g.db.query(User).filter_by(agendaposter = True).all()]
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}agendaposters.html", v=v, users=users)
-
 
 @app.get("/admin/image_posts")
 @admin_level_required(2)
diff --git a/files/routes/login.py b/files/routes/login.py
index 723adab04..19aac3c64 100644
--- a/files/routes/login.py
+++ b/files/routes/login.py
@@ -186,9 +186,7 @@ def sign_up_get(v):
 		ref_user = None
 
 	if ref_user and (ref_user.id in session.get("history", [])):
-		if not v or v.oldsite: template = ''
-		else: template = 'CHRISTMAS/'
-		return render_template(f"{template}sign_up_failed_ref.html")
+		return render_template(f"sign_up_failed_ref.html")
 
 	now = int(time.time())
 	token = token_hex(16)
@@ -203,9 +201,7 @@ def sign_up_get(v):
 
 	redir = request.values.get("redirect", "/").replace("/logged_out", "").strip()
 
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}sign_up.html",
+	return render_template(f"sign_up.html",
 						   formkey=formkey,
 						   now=now,
 						   redirect=redir,
diff --git a/files/routes/users.py b/files/routes/users.py
index 90fb0b230..b37d59cae 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -18,6 +18,25 @@ site = environ.get("DOMAIN").strip()
 beams_client = PushNotifications(instance_id=PUSHER_INSTANCE_ID, secret_key=PUSHER_KEY)
 
 
+
+@app.get("/grassed")
+@auth_desired
+def grassed(v):
+	users = g.db.query(User).filter(User.ban_reason.like('grass award used by @%')).all()
+
+	if not v or v.oldsite: template = ''
+	else: template = 'CHRISTMAS/'
+	return render_template(f"{template}grassed.html", v=v, users=users)
+
+@app.get("/agendaposters")
+@auth_desired
+def agendaposters(v):
+	users = [x for x in g.db.query(User).filter_by(agendaposter = True).all()]
+	if not v or v.oldsite: template = ''
+	else: template = 'CHRISTMAS/'
+	return render_template(f"{template}agendaposters.html", v=v, users=users)
+
+
 @app.get("/@<username>/upvoters")
 @auth_desired
 def upvoters(v, username):
diff --git a/files/templates/admin/admin_home.html b/files/templates/admin/admin_home.html
index d48cbbe9a..31f6cff11 100644
--- a/files/templates/admin/admin_home.html
+++ b/files/templates/admin/admin_home.html
@@ -23,8 +23,8 @@
 <ul>
 	<li><a href="/admin/users">Users Feed</a></li>
 	<li><a href="/admin/shadowbanned">Shadowbanned Users</a></li>
-	<li><a href="/admin/agendaposters">Users with Agendaposter Theme</a></li>
-	<li><a href="/admin/grassed">Currently Grassed Users</a></li>
+	<li><a href="/agendaposters">Users with Agendaposter Theme</a></li>
+	<li><a href="/grassed">Currently Grassed Users</a></li>
 </ul>
 
 <h4>Safety</h4>
diff --git a/files/templates/grassed.html b/files/templates/grassed.html
index d05554e1d..0fd088937 100644
--- a/files/templates/grassed.html
+++ b/files/templates/grassed.html
@@ -1,12 +1,15 @@
 {% extends "settings2.html" %}
 
 {% block content %}
-<div class="overflow-x-auto"><table class="table table-striped mb-5 text-small-mobile">
+<script src="/static/assets/js/sort_table.js?a=2"></script>
+
+<div class="overflow-x-auto">
+<table id="sortable_table" class="table table-striped mb-5 text-small-mobile">
 <thead class="bg-primary text-white">
 	<tr>
 		<th style="font-weight:bold;">#</th>
-		<th style="font-weight:bold;">Name</th>
-		<th style="font-weight:bold;">Grasser</th>
+		<th role="button" onclick="sort_table(1)" style="font-weight:bold;">Name</th>
+		<th role="button" onclick="sort_table(2)" style="font-weight:bold;">Grasser</th>
 	</tr>
 </thead>
 {% for user in users %}
diff --git a/files/templates/shadowbanned.html b/files/templates/shadowbanned.html
index 5e5787cde..5ef23c490 100644
--- a/files/templates/shadowbanned.html
+++ b/files/templates/shadowbanned.html
@@ -3,12 +3,13 @@
 {% block content %}
 <script src="/static/assets/js/sort_table.js?a=2"></script>
 
-<div class="overflow-x-auto"><table class="table table-striped mb-5 text-small-mobile">
+<div class="overflow-x-auto">
+<table id="sortable_table" class="table table-striped mb-5 text-small-mobile">
 <thead class="bg-primary text-white">
 	<tr>
 		<th style="font-weight:bold;">#</th>
-		<th onclick="sort_table(1)" style="font-weight:bold;">Name</th>
-		<th onclick="sort_table(2)" style="font-weight:bold;">Shadowbanned by</th>
+		<th role="button" onclick="sort_table(1)" style="font-weight:bold;">Name</th>
+		<th role="button" onclick="sort_table(2)" style="font-weight:bold;">Shadowbanned by</th>
 	</tr>
 </thead>
 {% for user in users %}