From ee756bf4b62ec1aef21f55d9ecaf07da70b8bf16 Mon Sep 17 00:00:00 2001
From: Aevann1 <randomname42029@gmail.com>
Date: Mon, 12 Sep 2022 09:17:57 +0200
Subject: [PATCH] minor submission changes

---
 files/helpers/get.py                             |  5 ++++-
 files/routes/asset_submissions.py                | 16 ++++++++++------
 ...set_submissions.html => original_assets.html} |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)
 rename files/templates/{asset_submissions.html => original_assets.html} (88%)

diff --git a/files/helpers/get.py b/files/helpers/get.py
index 5b8345458..00043ff15 100644
--- a/files/helpers/get.py
+++ b/files/helpers/get.py
@@ -95,7 +95,10 @@ def get_account(id, v=None, graceful=False):
 	except: abort(404)
 
 	user = g.db.get(User, id)
-	if not user and not graceful: abort(404)
+
+	if not user:
+		if not graceful: abort(404)
+		else: return None
 
 	if v:
 		block = g.db.query(UserBlock).filter(
diff --git a/files/routes/asset_submissions.py b/files/routes/asset_submissions.py
index 127c841b2..116741b4f 100644
--- a/files/routes/asset_submissions.py
+++ b/files/routes/asset_submissions.py
@@ -12,13 +12,13 @@ from files.routes.static import marsey_list
 @auth_required
 def original_marseys(v):
 	images = listdir("/asset_submissions/marseys/original")
-	return render_template("asset_submissions.html", v=v, images=images)
+	return render_template("original_assets.html", v=v, images=images, type="marseys")
 
 @app.get('/hats/original')
 @auth_required
 def original_hats(v):
 	images = listdir("/asset_submissions/hats/original")
-	return render_template("asset_submissions.html", v=v, images=images)
+	return render_template("original_assets.html", v=v, images=images, type="hats")
 
 @app.get('/asset_submissions/<path:path>')
 @limiter.exempt
@@ -76,8 +76,10 @@ def submit_marsey(v):
 	if not tags_regex.fullmatch(tags):
 		return error("Invalid tags!")
 
-	author = request.values.get('author').strip()
-	author = get_user(author)
+	username = request.values.get('author').strip()
+	author = get_user(username, graceful=True)
+	if not author:
+		return error(f"A user with the name '{username}' was not found!")
 
 	highquality = f'/asset_submissions/marseys/{name}'
 	file.save(highquality)
@@ -221,8 +223,10 @@ def submit_hat(v):
 	if not description_regex.fullmatch(description):
 		return error("Invalid description!")
 
-	author = request.values.get('author').strip()
-	author = get_user(author)
+	username = request.values.get('author').strip()
+	author = get_user(username, graceful=True)
+	if not author:
+		return error(f"A user with the name '{username}' was not found!")
 
 	highquality = f'/asset_submissions/hats/{name}'
 	file.save(highquality)
diff --git a/files/templates/asset_submissions.html b/files/templates/original_assets.html
similarity index 88%
rename from files/templates/asset_submissions.html
rename to files/templates/original_assets.html
index 471f7a3db..8f1045955 100644
--- a/files/templates/asset_submissions.html
+++ b/files/templates/original_assets.html
@@ -23,7 +23,7 @@
 		<tr>
 			<td>{{loop.index}}</td>
 			<td>{{image}}</td>
-			<td><img class="asset-submission" loading="lazy" alt="{{name}}" src="/asset_submissions/marseys/{{image}}"></td>
+			<td><img class="asset-submission" loading="lazy" alt="{{name}}" src="/asset_submissions/{{type}}/{{image}}"></td>
 		</tr>
 	{% endfor %}