Fix edit comment notifications

stashapp · Jan 3, 2025 · cc6fbc1 · cc6fbc1
1 parent fe54e8b
commit cc6fbc1
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/pkg/sqlx/querybuilder_notifications.go b/pkg/sqlx/querybuilder_notifications.go
@@ -99,23 +99,28 @@ func (qb *notificationsQueryBuilder) TriggerEditCommentNotifications(commentID u
 	args = append(args, commentID)
 	query := `
 INSERT INTO notifications 
-		SELECT N.user_id, N.type, $1
-		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
-		UNION
-		SELECT N.user_id, N.type, $1
-		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
-		UNION
-		SELECT N.user_id, N.type, $1
-		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
+    SELECT DISTINCT ON (user_id) user_id, type, $1 FROM (
+			SELECT N.user_id, N.type, 1 as ordering
+			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
+			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
+			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
+		) notifications
+		ORDER BY user_id, ordering ASC
 	`
 	err := qb.dbi.RawExec(query, args)
 	return err