From e022b29ef64cd0633689fcc8bdcd2ed5db3fdd49 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Sun, 26 Jun 2022 07:26:45 +0200
Subject: [PATCH] rework custom css a little

---
 files/routes/subs.py           |  2 +-
 files/routes/users.py          | 38 +++++++++++++++-------------------
 files/templates/authforms.html |  2 +-
 files/templates/chat.html      |  2 +-
 files/templates/default.html   |  2 +-
 files/templates/log.html       |  2 +-
 files/templates/settings.html  |  2 +-
 files/templates/submit.html    |  2 +-
 files/templates/userpage.html  |  2 +-
 9 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/files/routes/subs.py b/files/routes/subs.py
index b776cc5c77..d5693cdd69 100644
--- a/files/routes/subs.py
+++ b/files/routes/subs.py
@@ -419,7 +419,7 @@ def post_sub_css(v, sub):
 
 @app.get("/h/<sub>/css")
 def get_sub_css(sub):
-	sub = g.db.query(Sub).filter_by(name=sub.strip().lower()).one_or_none()
+	sub = g.db.query(Sub.css).filter_by(name=sub.strip().lower()).one_or_none()
 	if not sub: abort(404)
 	resp=make_response(sub.css or "")
 	resp.headers.add("Content-Type", "text/css")
diff --git a/files/routes/users.py b/files/routes/users.py
index 15b938de5b..9a89963f0e 100644
--- a/files/routes/users.py
+++ b/files/routes/users.py
@@ -584,32 +584,28 @@ def leaderboard(v):
 		users13=users13_25, pos13=pos13, users14=users14, pos14=pos14, users15=users15, pos15=pos15,
 		usersBlk=usersBlk)
 
-@app.get("/@<username>/css")
-def get_css(username):
-	user = get_user(username)
-	resp = make_response(user.css or "")
+@app.get("/<id>/css")
+def get_css(id):
+	try: id = int(id)
+	except: abort(404)
+
+	css = g.db.query(User.css).filter_by(id=id).one_or_none()
+	if not css: abort(404)
+
+	resp = make_response(css[0] or "")
 	resp.headers["Content-Type"] = "text/css"
-	resp.headers["Referrer-Policy"] = "no-referrer"
 	return resp
 
-@app.get("/@<username>/profilecss")
-def get_profilecss(username):
-	user = get_user(username)
-	if user.profilecss: profilecss = user.profilecss
-	else: profilecss = ""
-	resp = make_response(profilecss)
-	resp.headers["Content-Type"] = "text/css"
-	resp.headers["Referrer-Policy"] = "no-referrer"
-	return resp
+@app.get("/<id>/profilecss")
+def get_profilecss(id):
+	try: id = int(id)
+	except: abort(404)
 
-@app.get("/id/<id>/profilecss")
-def get_profilecss_id(id):
-	user = get_account(id)
-	if user.profilecss: profilecss = user.profilecss
-	else: profilecss = ""
-	resp = make_response(profilecss)
+	css = g.db.query(User.profilecss).filter_by(id=id).one_or_none()
+	if not css: abort(404)
+
+	resp = make_response(css[0] or "")
 	resp.headers["Content-Type"] = "text/css"
-	resp.headers["Referrer-Policy"] = "no-referrer"
 	return resp
 
 @app.get("/@<username>/song")
diff --git a/files/templates/authforms.html b/files/templates/authforms.html
index 5ad2868dcd..63a87d8acb 100644
--- a/files/templates/authforms.html
+++ b/files/templates/authforms.html
@@ -40,7 +40,7 @@
 					}
 				</style>
 			{% elif v.css %}
-				<link rel="stylesheet" href="/@{{v.username}}/css">
+				<link rel="stylesheet" href="/{{v.id}}/css">
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{DEFAULT_COLOR}}</style>
diff --git a/files/templates/chat.html b/files/templates/chat.html
index 0440f2f7ea..a2a6d14625 100644
--- a/files/templates/chat.html
+++ b/files/templates/chat.html
@@ -19,7 +19,7 @@
 	<link rel="stylesheet" href="{{asset('css/main.css')}}">
 	<link rel="stylesheet" href="{{asset('css/' + v.theme + '.css')}}">
 	{% if v.css %}
-		<link rel="stylesheet" href="/@{{v.username}}/css">
+		<link rel="stylesheet" href="/{{v.id}}/css">
 	{% endif %}
 
 	<style>
diff --git a/files/templates/default.html b/files/templates/default.html
index 906fb32f7a..d911d083ea 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -47,7 +47,7 @@
 				}
 			</style>
 		{% elif v.css %}
-			<link rel="stylesheet" href="/@{{v.username}}/css">
+			<link rel="stylesheet" href="/{{v.id}}/css">
 		{% endif %}
 	{% else %}
 		<style>:root{--primary:#{{DEFAULT_COLOR}}</style>
diff --git a/files/templates/log.html b/files/templates/log.html
index 37d347dce4..1bdbaca661 100644
--- a/files/templates/log.html
+++ b/files/templates/log.html
@@ -27,7 +27,7 @@
 			}
 		</style>
 	{% elif v.css %}
-		<link rel="stylesheet" href="/@{{v.username}}/css">
+		<link rel="stylesheet" href="/{{v.id}}/css">
 	{% endif %}
 {% else %}
 	<style>:root{--primary:#{{DEFAULT_COLOR}}</style>
diff --git a/files/templates/settings.html b/files/templates/settings.html
index 19b4444a5f..aaf4175300 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -56,7 +56,7 @@
 			}
 		</style>
 	{% elif v.css and not request.path.startswith('/settings/css') %}
-		<link rel="stylesheet" href="/@{{v.username}}/css">
+		<link rel="stylesheet" href="/{{v.id}}/css">
 	{% endif %}
 </head>
 
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 80607f3d61..cd20b5861b 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -49,7 +49,7 @@
 					}
 				</style>
 			{% elif v.css %}
-				<link rel="stylesheet" href="/@{{v.username}}/css">
+				<link rel="stylesheet" href="/{{v.id}}/css">
 			{% endif %}
 		{% else %}
 			<style>:root{--primary:#{{DEFAULT_COLOR}}</style>
diff --git a/files/templates/userpage.html b/files/templates/userpage.html
index 3623d40e6a..ed799d34df 100644
--- a/files/templates/userpage.html
+++ b/files/templates/userpage.html
@@ -6,7 +6,7 @@
 {% block title %}
 
 {% if u and u.profilecss and not request.values.get('nocss') %}
-	<link rel="stylesheet" href="/@{{u.username}}/profilecss">
+	<link rel="stylesheet" href="/{{u.id}}/profilecss">
 {% endif %}
 
 <title>{{u.username}}'s profile - {{SITE_NAME}}</title>