From 5a1224ddc7f6f46f45d53dd6218e042bba5a1f24 Mon Sep 17 00:00:00 2001
From: justcool393 <justcool393@gmail.com>
Date: Sun, 27 Nov 2022 11:13:23 -0600
Subject: [PATCH] fix shadowbanned and nonexistent users in marseys table

---
 files/routes/static.py             | 2 +-
 files/templates/admin/alts.html    | 2 +-
 files/templates/marseys.html       | 2 +-
 files/templates/user_in_table.html | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/files/routes/static.py b/files/routes/static.py
index dde4590f6..bd0478314 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -27,7 +27,7 @@ def rdrama(id, title):
 @auth_required
 def marseys(v:User):
 	marseys = get_marseys(g.db)
-	authors = get_accounts_dict([m.author_id for m in marseys], graceful=True, include_shadowbanned=False)
+	authors = get_accounts_dict([m.author_id for m in marseys], v=v, graceful=True, include_shadowbanned=False)
 	original = os.listdir("/asset_submissions/marseys/original")
 	for marsey in marseys:
 		marsey.user = authors.get(marsey.author_id)
diff --git a/files/templates/admin/alts.html b/files/templates/admin/alts.html
index 2ef58ed52..b01f443e3 100644
--- a/files/templates/admin/alts.html
+++ b/files/templates/admin/alts.html
@@ -35,7 +35,7 @@
 	{% for user in alts %}
 		<tr>
 			<td>{{loop.index}}</td>
-			<td>{% include "admin/shadowbanned_tooltip.html" %}{% include "user_in_table.html" %}</td>
+			<td>{% include "user_in_table.html" %}</td>
 			<td>{{user.created_utc|timestamp}}</td>
 			<td>{{user._alt_created_utc|timestamp}}</td>
 			<td>{{user._is_manual}}</td>
diff --git a/files/templates/marseys.html b/files/templates/marseys.html
index e650daa6b..1a5f1bee3 100644
--- a/files/templates/marseys.html
+++ b/files/templates/marseys.html
@@ -27,7 +27,7 @@
 	<td>{{marsey.count}}</td>
 	{% if FEATURES['ASSET_SUBMISSIONS'] %}
 	{% set user = marsey.user %}
-	<td data-sort-key="{{user.username}}">{% include "user_in_table.html" %}</td>
+	<td data-sort-key="{{user.username.lower() if user else ''}}">{% include "user_in_table.html" %}</td>
 	{% endif %}
 	<td data-sort-key="{{marsey.created_utc or 0}}" {% if marsey.created_utc != None %}data-time="{{marsey.created_utc}}"{% endif %}></td>
 	{% if FEATURES['ASSET_SUBMISSIONS'] %}
diff --git a/files/templates/user_in_table.html b/files/templates/user_in_table.html
index 70632d837..a48fa2295 100644
--- a/files/templates/user_in_table.html
+++ b/files/templates/user_in_table.html
@@ -1,3 +1,5 @@
+{%- include 'admin/shadowbanned_tooltip.html' -%}
+{% if user and (not user.shadowbanned or v.can_see_shadowbanned) %}
 <a style="color:#{{user.name_color}};font-weight:bold" href="/@{{user.username}}">
 	<div class="profile-pic-20-wrapper mb-2">
 		<img loading="lazy" src="{{user.profile_url}}" class="pp20">
@@ -7,3 +9,4 @@
 	</div>
 	<span {% if user.patron %}class="patron" style="background-color:#{{user.name_color}}"{% endif %}>{{user.user_name}}</span>
 </a>
+{% endif %}