From a30edea43dcd5d5d4816934f065f19c80688d772 Mon Sep 17 00:00:00 2001 From: justcool393 Date: Thu, 6 Oct 2022 03:37:00 -0700 Subject: [PATCH] resolve conflict --- files/classes/user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/classes/user.py b/files/classes/user.py index 01c4c56e9..63c7d743f 100644 --- a/files/classes/user.py +++ b/files/classes/user.py @@ -459,7 +459,7 @@ class User(Base): posts = g.db.query(Submission.id).filter_by(author_id=self.id, is_pinned=False) if not (v and (v.admin_level >= PERMS['POST_COMMENT_MODERATION'] or v.id == self.id)): - posts = posts.filter_by(is_banned=False, private=False, ghost=False) + posts = posts.filter_by(is_banned=False, private=False, ghost=False, deleted_utc=0) posts = apply_time_filter(t, posts, Submission)