aboutsummaryrefslogtreecommitdiffstats
path: root/models/issue_comment.go
diff options
context:
space:
mode:
authorsilverwind <me@silverwind.io>2019-06-11 21:27:38 +0200
committerzeripath <art27@cantab.net>2019-06-11 20:27:38 +0100
commit499a8a1cdd815cc25554371598140f5fb01e216f (patch)
tree8ad6b181036488f3054cb4326aed84c93a0d5d37 /models/issue_comment.go
parent74690f64514424ac643a8007828de1a785705793 (diff)
downloadgitea-499a8a1cdd815cc25554371598140f5fb01e216f.tar.gz
gitea-499a8a1cdd815cc25554371598140f5fb01e216f.zip
Various fixes for issue mail notifications (#7165)
- Send individual mails for actions and comments - Send mail for new issues/prs without a comment - Use correct sender for reopen/close actions - Hopefully fixed all bugs related to missing mails Fixes: https://github.com/go-gitea/gitea/issues/7124 Fixes: https://github.com/go-gitea/gitea/issues/5977
Diffstat (limited to 'models/issue_comment.go')
-rw-r--r--models/issue_comment.go19
1 files changed, 13 insertions, 6 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go
index 60fb5b0420..0d2e917f85 100644
--- a/models/issue_comment.go
+++ b/models/issue_comment.go
@@ -403,16 +403,23 @@ func (c *Comment) mailParticipants(e Engine, opType ActionType, issue *Issue) (e
return fmt.Errorf("UpdateIssueMentions [%d]: %v", c.IssueID, err)
}
- content := c.Content
+ if len(c.Content) > 0 {
+ if err = mailIssueCommentToParticipants(e, issue, c.Poster, c.Content, c, mentions); err != nil {
+ log.Error("mailIssueCommentToParticipants: %v", err)
+ }
+ }
switch opType {
case ActionCloseIssue:
- content = fmt.Sprintf("Closed #%d", issue.Index)
+ ct := fmt.Sprintf("Closed #%d.", issue.Index)
+ if err = mailIssueCommentToParticipants(e, issue, c.Poster, ct, c, mentions); err != nil {
+ log.Error("mailIssueCommentToParticipants: %v", err)
+ }
case ActionReopenIssue:
- content = fmt.Sprintf("Reopened #%d", issue.Index)
- }
- if err = mailIssueCommentToParticipants(e, issue, c.Poster, content, c, mentions); err != nil {
- log.Error("mailIssueCommentToParticipants: %v", err)
+ ct := fmt.Sprintf("Reopened #%d.", issue.Index)
+ if err = mailIssueCommentToParticipants(e, issue, c.Poster, ct, c, mentions); err != nil {
+ log.Error("mailIssueCommentToParticipants: %v", err)
+ }
}
return nil