From 284b3ba9ecec783253f18e0fb688adebc731205a Mon Sep 17 00:00:00 2001 From: Aevann Date: Thu, 22 Dec 2022 22:46:05 +0200 Subject: [PATCH] delete property that jc forgot to actually define... --- files/classes/user.py | 2 +- files/routes/routehelpers.py | 1 - files/routes/votes.py | 2 +- files/templates/admin/alts.html | 5 ++--- files/templates/userpage/banner.html | 4 ++-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/files/classes/user.py b/files/classes/user.py index 666c79f94..10573ee51 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -711,7 +711,7 @@ class User(Base): @property @lazy def alt_ids(self): - return [x.id for x in self.get_alt_graph(g.db) if not x._alt_deleted] + return [x.id for x in self.get_alt_graph(g.db)] @property @lazy diff --git a/files/routes/routehelpers.py b/files/routes/routehelpers.py index 0be87da13..4b4e87cc6 100644 --- a/files/routes/routehelpers.py +++ b/files/routes/routehelpers.py @@ -102,7 +102,6 @@ def check_for_alts(current:User, include_current_session=True): session["history"] = list(past_accs) g.db.flush() for u in get_alt_graph(current.id): - if u._alt_deleted: continue if u.shadowbanned and current.id not in DONT_SHADOWBAN: current.shadowbanned = u.shadowbanned current.ban_reason = u.ban_reason diff --git a/files/routes/votes.py b/files/routes/votes.py index a39f21113..1f4ef93be 100644 --- a/files/routes/votes.py +++ b/files/routes/votes.py @@ -89,7 +89,7 @@ def vote_post_comment(target_id, new, v, cls, vote_cls): if v.id == target.author.id: coin_delta = 0 - v_alts_id = [x.id for x in v.get_alt_graph(self.id) if not x._alt_deleted] + v_alts_id = [x.id for x in v.get_alt_graph(self.id)] alt = False if target.author.id in v.alt_ids or v.id in target.author.alt_ids: diff --git a/files/templates/admin/alts.html b/files/templates/admin/alts.html index b01f443e3..a07f21dca 100644 --- a/files/templates/admin/alts.html +++ b/files/templates/admin/alts.html @@ -39,10 +39,9 @@ {{user.created_utc|timestamp}} {{user._alt_created_utc|timestamp}} {{user._is_manual}} - {{user._alt_deleted}} - - + + Alts {% if v.admin_level >= PERMS['VIEW_ALT_VOTES'] %} Alt Votes diff --git a/files/templates/userpage/banner.html b/files/templates/userpage/banner.html index 91f1cc54b..521445491 100644 --- a/files/templates/userpage/banner.html +++ b/files/templates/userpage/banner.html @@ -225,7 +225,7 @@ Alts: {% endif %} @@ -489,7 +489,7 @@ Alts: {% endif %}