From f6dea300b0ab697d9859923550afdafaf4ad82d7 Mon Sep 17 00:00:00 2001
From: TLSM <duolsm@outlook.com>
Date: Sun, 13 Nov 2022 17:13:14 -0500
Subject: [PATCH] Adjust shadowed comment visibility.

- Don't show shadowed comments to non-jannies in notifications.
- Auto-collapse for jannies in notifs/threads.
---
 files/classes/comment.py      | 2 ++
 files/routes/notifications.py | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/files/classes/comment.py b/files/classes/comment.py
index 9e39551289..4ea11d8d12 100644
--- a/files/classes/comment.py
+++ b/files/classes/comment.py
@@ -362,6 +362,8 @@ class Comment(Base):
 
 		if self.is_banned: return True
 
+		if self.author.shadowbanned and not v.shadowbanned: return True
+
 		if (self.wordle_result) and (not self.body or len(self.body_html) <= 100) and 9 > self.level > 1: return True
 			
 		if v and v.filter_words and self.body and any(x in self.body for x in v.filter_words): return True
diff --git a/files/routes/notifications.py b/files/routes/notifications.py
index 8cc6c516d5..09cdd03246 100644
--- a/files/routes/notifications.py
+++ b/files/routes/notifications.py
@@ -270,8 +270,12 @@ def notifications(v):
 		Comment.body_html.notlike('%<p>New site mention%<a href="https://old.reddit.com/r/%'),
 		or_(Comment.sentto == None, Comment.sentto == 2),
 		not_(and_(Comment.sentto == 2, User.is_muted)),
-	).order_by(Notification.created_utc.desc())
+	)
 
+	if v.admin_level < PERMS['USER_SHADOWBAN']:
+		comments = comments.filter(User.shadowbanned == None)
+
+	comments = comments.order_by(Notification.created_utc.desc())
 	comments = comments.offset(PAGE_SIZE * (page - 1)).limit(PAGE_SIZE+1).all()
 
 	next_exists = (len(comments) > PAGE_SIZE)