IntenseWebs/gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[BugFix] Avoid mailing explicit unwatched (#10475) (#10500)

Browse Source 
* [BugFix] Avoid mailing explicit unwatched (#10475)
This commit is contained in:
6543 2020-02-27 18:42:51 +01:00 committed by GitHub
parent 5d11ccc9e1
commit 50f2e90b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/issue_watch.go
View File

@ -64,14 +64,18 @@ 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, watching)
}
func getIssueWatchersIDs(e Engine, issueID int64, watching bool) ([]int64, error) {
ids := make([]int64, 0, 64) ids := make([]int64, 0, 64)
return ids, x.Table("issue_watch"). return ids, e.Table("issue_watch").
Where("issue_id=?", issueID). Where("issue_id=?", issueID).
And("is_watching = ?", true). And("is_watching = ?", watching).
Select("user_id"). Select("user_id").
Find(&ids) Find(&ids)
} }

10
services/mailer/mail_issue.go
View File

@ -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)