rDrama
/
rDrama
9
10
Fork 7
Code Issues Pull Requests 1 Packages Releases Wiki Activity

Fix notification count with muted modmails.

remotes/1693176582716663532/tmp_refs/heads/watchparty
Snakes 2022-11-12 16:56:40 -05:00
parent e90226d712
commit e027909357
Signed by: Snakes
GPG Key ID: E745A82778055C7E
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
files/classes/user.py
View File

@ -603,12 +603,19 @@ class User(Base):
@property
@lazy
def notifications_count(self):
notifs = g.db.query(Notification.user_id).join(Comment).filter(
Notification.user_id == self.id, Notification.read == False,
Comment.is_banned == False, Comment.deleted_utc == 0)
notifs = (
g.db.query(Notification.user_id)
.join(Comment).join(Comment.author)
.filter(
Notification.read == False,
Notification.user_id == self.id,
Comment.is_banned == False,
Comment.deleted_utc == 0,
not_(and_(Comment.sentto == 2, User.is_muted)),
))
if not self.can_see_shadowbanned:
notifs = notifs.join(Comment.author).filter(User.shadowbanned == None)
notifs = notifs.filter(User.shadowbanned == None)
return notifs.count() + self.post_notifications_count + self.modaction_notifications_count