summaryrefslogtreecommitdiffstats
path: root/services/mailer
diff options
context:
space:
mode:
author赵智超 <1012112796@qq.com>2020-09-10 03:08:55 +0800
committerGitHub <noreply@github.com>2020-09-09 15:08:55 -0400
commitffa12bdb71d1e708ff782fb681895aea9b83766b (patch)
tree52631f50e83c2e0b5db67d3bb5df3be437bb7f31 /services/mailer
parent0cd49aaebd0434cffaf16e557620441a50bb757d (diff)
downloadgitea-ffa12bdb71d1e708ff782fb681895aea9b83766b.tar.gz
gitea-ffa12bdb71d1e708ff782fb681895aea9b83766b.zip
Fix "only mail on mention" bug (#12775)
* fix mail mention bug fix #12774 Signed-off-by: a1012112796 <1012112796@qq.com> * fix test Co-authored-by: techknowlogick <techknowlogick@gitea.io>
Diffstat (limited to 'services/mailer')
-rw-r--r--services/mailer/mail_issue.go2
-rw-r--r--services/mailer/mail_release.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go
index 1030a9548e..01c198984b 100644
--- a/services/mailer/mail_issue.go
+++ b/services/mailer/mail_issue.go
@@ -118,7 +118,7 @@ func mailIssueCommentBatch(ctx *mailCommentContext, ids []int64, visited map[int
visited[id] = true
}
}
- recipients, err := models.GetMaileableUsersByIDs(unique)
+ recipients, err := models.GetMaileableUsersByIDs(unique, fromMention)
if err != nil {
return err
}
diff --git a/services/mailer/mail_release.go b/services/mailer/mail_release.go
index 55182f55cf..f278c853ae 100644
--- a/services/mailer/mail_release.go
+++ b/services/mailer/mail_release.go
@@ -27,7 +27,7 @@ func MailNewRelease(rel *models.Release) {
return
}
- recipients, err := models.GetMaileableUsersByIDs(watcherIDList)
+ recipients, err := models.GetMaileableUsersByIDs(watcherIDList, false)
if err != nil {
log.Error("models.GetMaileableUsersByIDs: %v", err)
return