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

fix muted users not notifying the person they reply to

master
Aevann 2023-03-19 10:29:58 +02:00
parent 20eef6e063
commit 62fcaec40d
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
files/classes/user.py
View File

@ -625,9 +625,13 @@ 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 == MODMAIL_ID, User.is_muted)),
)) ))
if self.admin_level >= PERMS['VIEW_MODMAIL']:
notifs = notifs.filter(
not_(and_(Comment.sentto != None, Comment.sentto == MODMAIL_ID, User.is_muted))
)
if not self.can_see_shadowbanned: if not self.can_see_shadowbanned:
notifs = notifs.filter( notifs = notifs.filter(
User.shadowbanned == None, User.shadowbanned == None,

8
files/routes/notifications.py
View File

@ -301,12 +301,16 @@ def notifications(v:User):
n.read = True n.read = True
g.db.add(n) g.db.add(n)
comments = g.db.query(Comment, Notification).join(Notification.comment).join(Comment.author).filter( comments = g.db.query(Comment, Notification).join(Notification.comment).filter(
Notification.user_id == v.id, Notification.user_id == v.id,
or_(Comment.sentto == None, Comment.sentto != v.id), or_(Comment.sentto == None, Comment.sentto != v.id),
not_(and_(Comment.sentto == MODMAIL_ID, User.is_muted)),
) )
if v.admin_level >= PERMS['VIEW_MODMAIL']:
comments = comments.join(Comment.author).filter(
not_(and_(Comment.sentto != None, Comment.sentto == MODMAIL_ID, User.is_muted))
)
if v.admin_level < PERMS['USER_SHADOWBAN']: if v.admin_level < PERMS['USER_SHADOWBAN']:
comments = comments.filter( comments = comments.filter(
Comment.is_banned == False, Comment.is_banned == False,