[BugFix] Avoid mailing explicit unwatched (#10475)
* Avoid mailing explicit unwatched * CI.restart() * back to normal Co-Authored-By: guillep2k <18600385+guillep2k@users.noreply.github.com>release/v1.15
parent
9a476113f0
commit
a924a90349
|
@ -64,11 +64,11 @@ func getIssueWatch(e Engine, userID, issueID int64) (iw *IssueWatch, exists bool
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// GetIssueWatchersIDs returns IDs of subscribers to a given issue id
|
// GetIssueWatchersIDs returns IDs of subscribers or explicit unsubscribers to a given issue id
|
||||||
// but avoids joining with `user` for performance reasons
|
// but avoids joining with `user` for performance reasons
|
||||||
// User permissions must be verified elsewhere if required
|
// User permissions must be verified elsewhere if required
|
||||||
func GetIssueWatchersIDs(issueID int64) ([]int64, error) {
|
func GetIssueWatchersIDs(issueID int64, watching bool) ([]int64, error) {
|
||||||
return getIssueWatchersIDs(x, issueID, true)
|
return getIssueWatchersIDs(x, issueID, watching)
|
||||||
}
|
}
|
||||||
|
|
||||||
func getIssueWatchersIDs(e Engine, issueID int64, watching bool) ([]int64, error) {
|
func getIssueWatchersIDs(e Engine, issueID int64, watching bool) ([]int64, error) {
|
||||||
|
|
|
@ -62,7 +62,7 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []int64) e
|
||||||
unfiltered = append(unfiltered, ids...)
|
unfiltered = append(unfiltered, ids...)
|
||||||
|
|
||||||
// =========== Issue watchers ===========
|
// =========== Issue watchers ===========
|
||||||
ids, err = models.GetIssueWatchersIDs(ctx.Issue.ID)
|
ids, err = models.GetIssueWatchersIDs(ctx.Issue.ID, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("GetIssueWatchersIDs(%d): %v", ctx.Issue.ID, err)
|
return fmt.Errorf("GetIssueWatchersIDs(%d): %v", ctx.Issue.ID, err)
|
||||||
}
|
}
|
||||||
|
@ -80,6 +80,14 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []int64) e
|
||||||
|
|
||||||
// Avoid mailing the doer
|
// Avoid mailing the doer
|
||||||
visited[ctx.Doer.ID] = true
|
visited[ctx.Doer.ID] = true
|
||||||
|
// Avoid mailing explicit unwatched
|
||||||
|
ids, err = models.GetIssueWatchersIDs(ctx.Issue.ID, false)
|
||||||
|
if err != nil {
|
||||||
|
return fmt.Errorf("GetIssueWatchersIDs(%d): %v", ctx.Issue.ID, err)
|
||||||
|
}
|
||||||
|
for _, i := range ids {
|
||||||
|
visited[i] = true
|
||||||
|
}
|
||||||
|
|
||||||
if err = mailIssueCommentBatch(ctx, unfiltered, visited, false); err != nil {
|
if err = mailIssueCommentBatch(ctx, unfiltered, visited, false); err != nil {
|
||||||
return fmt.Errorf("mailIssueCommentBatch(): %v", err)
|
return fmt.Errorf("mailIssueCommentBatch(): %v", err)
|
||||||
|
|
Loading…
Reference in New Issue