fds

files/routes/admin.py

@@ -382,21 +382,7 @@ def disablesignups(v):
 @admin_level_required(2)
 def badge_grant_get(v):
 
-	errors = {"already_owned": "That user already has that badge.",
+	return render_template(f"{template}admin/badge_grant.html", v=v, badge_types=BADGES)
-			  "no_user": "That user doesn't exist."
-			  }
-
-	if not v or v.oldsite: template = ''
-	else: template = 'CHRISTMAS/'
-	return render_template(f"{template}admin/badge_grant.html",
-						   v=v,
-						   badge_types=BADGES,
-						   error=errors.get(
-							   request.values.get("error"),
-							   None) if request.values.get('error') else None,
-						   msg="Badge successfully assigned" if request.values.get(
-							   "msg") else None
-						   )
 
 
 @app.post("/admin/badge_grant")
@@ -404,14 +390,18 @@ def badge_grant_get(v):
 @admin_level_required(2)
 @validate_formkey
 def badge_grant_post(v):
+	if not v or v.oldsite: template = ''
+	else: template = 'CHRISTMAS/'
 
 	user = get_user(request.values.get("username").strip(), graceful=True)
-	if not user: return redirect("/badge_grant?error=no_user")
+	if not user:
+		return render_template(f"{template}admin/badge_grant.html", v=v, badge_types=BADGES, error="User not found.")
 
 	try: badge_id = int(request.values.get("badge_id"))
 	except: abort(400)
 
-	if user.has_badge(badge_id): return redirect("/badge_grant?error=User already has that badge!")
+	if user.has_badge(badge_id):
+		return render_template(f"{template}admin/badge_grant.html", v=v, badge_types=BADGES, error="User already has that badge.")
 	
 	new_badge = Badge(badge_id=badge_id, user_id=user.id)
 	send_notification(user.id, f"@AutoJanny has given you the following profile badge:\n\n![]({new_badge.path})\n\n{new_badge.name}")
@@ -428,7 +418,7 @@ def badge_grant_post(v):
 	send_notification(user.id, text)	
 	
 	g.db.commit()
-	return redirect("/admin/badge_grant")
+	return render_template(f"{template}admin/badge_grant.html", v=v, badge_types=BADGES, msg="Badge granted!")
 
 
 @app.get("/admin/users")

files/routes/login.py

@@ -203,8 +203,6 @@ def sign_up_get(v):
 
 	redir = request.values.get("redirect", "/").replace("/logged_out", "").strip()
 
-	error = request.values.get("error", None)
-
 	if not v or v.oldsite: template = ''
 	else: template = 'CHRISTMAS/'
 	return render_template(f"{template}sign_up.html",
@@ -212,7 +210,6 @@ def sign_up_get(v):
 						   now=now,
 						   redirect=redir,
 						   ref_user=ref_user,
-						   error=error,
 						   hcaptcha=app.config["HCAPTCHA_SITEKEY"]
 						   )
 

files/routes/static.py

@@ -407,9 +407,7 @@ def settings_security(v):
 	else: template = 'CHRISTMAS/'
 	return render_template(f"{template}settings_security.html",
 						   v=v,
-						   mfa_secret=pyotp.random_base32() if not v.mfa_secret else None,
+						   mfa_secret=pyotp.random_base32() if not v.mfa_secret else None
-						   error=request.values.get("error") or None,
-						   msg=request.values.get("msg") or None
 						   )
 
 @app.post("/dismiss_mobile_tip")

files/templates/contact.html

@@ -6,19 +6,7 @@
 {% endblock %}
 
 {% block content %}
-
+		{% if msg %}
-		{% if request.values.get('error') or error %}
-		<div class="alert alert-danger alert-dismissible fade show my-3" role="alert">
-			<i class="fas fa-exclamation-circle my-auto"></i>
-			<span>
-				{{error if error else request.values.get('error')}}
-			</span>
-			<button type="button" class="close" data-bs-dismiss="alert" aria-label="Close">
-				<span aria-hidden="true"><i class="far fa-times"></i></span>
-			</button>
-		</div>
-		{% endif %}
-		{% if request.values.get('msg') or msg %}
 		<div class="alert alert-success alert-dismissible fade show my-3" role="alert">
 			<i class="fas fa-check-circle my-auto" aria-hidden="true"></i>
 			<span>