carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity

remove redundant condition

master
Aevann 2023-02-26 11:14:39 +02:00
parent 4d6ffc3667
commit 890fedf1f3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/classes/user.py
View File

@ -594,7 +594,7 @@ class User(Base):
.filter( .filter(
Notification.read == False, Notification.read == False,
Notification.user_id == self.id, Notification.user_id == self.id,
not_(and_(Comment.sentto != None, Comment.sentto == MODMAIL_ID, User.is_muted)), not_(and_(Comment.sentto == MODMAIL_ID, User.is_muted)),
)) ))
if not self.can_see_shadowbanned: if not self.can_see_shadowbanned:

2
files/routes/notifications.py
View File

@ -298,7 +298,7 @@ def notifications(v:User):
comments = g.db.query(Comment, Notification).join(Notification.comment).join(Comment.author).filter( comments = g.db.query(Comment, Notification).join(Notification.comment).join(Comment.author).filter(
Notification.user_id == v.id, Notification.user_id == v.id,
or_(Comment.sentto == None, Comment.sentto == MODMAIL_ID), or_(Comment.sentto == None, Comment.sentto == MODMAIL_ID),
not_(and_(Comment.sentto != None, Comment.sentto == MODMAIL_ID, User.is_muted)), not_(and_(Comment.sentto == MODMAIL_ID, User.is_muted)),
) )
if v.admin_level < PERMS['USER_SHADOWBAN']: if v.admin_level < PERMS['USER_SHADOWBAN']: