@@ -54,7 +54,6 @@ func (m *mailNotifier) NotifyNewIssue(issue *models.Issue, mentions []*models.Us | |||
func (m *mailNotifier) NotifyIssueChangeStatus(doer *models.User, issue *models.Issue, actionComment *models.Comment, isClosed bool) { | |||
var actionType models.ActionType | |||
issue.Content = "" | |||
if issue.IsPull { | |||
if isClosed { | |||
actionType = models.ActionClosePullRequest | |||
@@ -124,7 +123,6 @@ func (m *mailNotifier) NotifyMergePullRequest(pr *models.PullRequest, doer *mode | |||
log.Error("pr.LoadIssue: %v", err) | |||
return | |||
} | |||
pr.Issue.Content = "" | |||
if err := mailer.MailParticipants(pr.Issue, doer, models.ActionMergePullRequest, nil); err != nil { | |||
log.Error("MailParticipants: %v", err) | |||
} | |||
@@ -151,8 +149,6 @@ func (m *mailNotifier) NotifyPullRequestPushCommits(doer *models.User, pr *model | |||
if err := comment.LoadPushCommits(); err != nil { | |||
log.Error("comment.LoadPushCommits: %v", err) | |||
} | |||
comment.Content = "" | |||
m.NotifyCreateIssueComment(doer, comment.Issue.Repo, comment.Issue, comment, nil) | |||
} | |||
@@ -11,12 +11,16 @@ import ( | |||
// MailParticipantsComment sends new comment emails to repository watchers and mentioned people. | |||
func MailParticipantsComment(c *models.Comment, opType models.ActionType, issue *models.Issue, mentions []*models.User) error { | |||
content := c.Content | |||
if c.Type == models.CommentTypePullPush { | |||
content = "" | |||
} | |||
if err := mailIssueCommentToParticipants( | |||
&mailCommentContext{ | |||
Issue: issue, | |||
Doer: c.Poster, | |||
ActionType: opType, | |||
Content: c.Content, | |||
Content: content, | |||
Comment: c, | |||
}, mentions); err != nil { | |||
log.Error("mailIssueCommentToParticipants: %v", err) |
@@ -161,12 +161,18 @@ func mailIssueCommentBatch(ctx *mailCommentContext, users []*models.User, visite | |||
// MailParticipants sends new issue thread created emails to repository watchers | |||
// and mentioned people. | |||
func MailParticipants(issue *models.Issue, doer *models.User, opType models.ActionType, mentions []*models.User) error { | |||
content := issue.Content | |||
if opType == models.ActionCloseIssue || opType == models.ActionClosePullRequest || | |||
opType == models.ActionReopenIssue || opType == models.ActionReopenPullRequest || | |||
opType == models.ActionMergePullRequest { | |||
content = "" | |||
} | |||
if err := mailIssueCommentToParticipants( | |||
&mailCommentContext{ | |||
Issue: issue, | |||
Doer: doer, | |||
ActionType: opType, | |||
Content: issue.Content, | |||
Content: content, | |||
Comment: nil, | |||
}, mentions); err != nil { | |||
log.Error("mailIssueCommentToParticipants: %v", err) |