Skip to content

Commit

Permalink
Fix notifications of comments on own edits (#900)
Browse files Browse the repository at this point in the history
  • Loading branch information
InfiniteStash authored Jan 8, 2025
1 parent 7b0db84 commit ba7cc98
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions pkg/sqlx/querybuilder_notifications.go
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,27 @@ INSERT INTO notifications
FROM edit_comments EC
JOIN edits E ON EC.edit_id = E.id
JOIN user_notifications N ON E.user_id = N.user_id AND N.type = 'COMMENT_OWN_EDIT'
WHERE EC.id = $1
WHERE E.user_id != EC.user_id
AND EC.id = $1
UNION
SELECT N.user_id, N.type, 2 as ordering
FROM edit_comments EC
JOIN edits E ON EC.edit_id = E.id
JOIN edit_comments EO ON EO.edit_id = E.id
JOIN user_notifications N ON EO.user_id = N.user_id AND N.type = 'COMMENT_COMMENTED_EDIT'
WHERE EO.user_id != E.user_id AND EO.user_id != EC.user_id AND EC.id = $1
WHERE EO.user_id != E.user_id
AND EO.user_id != EC.user_id
AND EC.id = $1
UNION
SELECT N.user_id, N.type, 3 as ordering
FROM edit_comments EC
JOIN edits E ON EC.edit_id = E.id
JOIN edit_votes EV ON EV.edit_id = E.id
JOIN user_notifications N ON EV.user_id = N.user_id AND N.type = 'COMMENT_VOTED_EDIT'
WHERE EV.vote != 'ABSTAIN' AND EV.user_id != E.user_id AND EV.user_id != EC.user_id AND EC.id = $1
WHERE EV.vote != 'ABSTAIN'
AND EV.user_id != E.user_id
AND EV.user_id != EC.user_id
AND EC.id = $1
) notifications
ORDER BY user_id, ordering ASC
`
Expand Down

0 comments on commit ba7cc98

Please sign in to comment.