diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2021-05-30 11:38:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-30 10:38:38 +0100 |
| commit | d79c8bc30241c98e044de40aa673138e819f765f (patch) | |
| tree | 24f7df4168afa3b020c569346a192da6176b0ae8 | |
| parent | d8c99c64d5bca4b280a1639677d4457fb6ebabcc (diff) | |
| download | gitea-d79c8bc30241c98e044de40aa673138e819f765f.tar.gz gitea-d79c8bc30241c98e044de40aa673138e819f765f.zip | |
Don't manipulate input params in email notification (#16011)
| -rw-r--r-- | modules/notification/mail/mail.go | 4 | ||||
| -rw-r--r-- | services/mailer/mail_comment.go | 6 | ||||
| -rw-r--r-- | services/mailer/mail_issue.go | 8 |
3 files changed, 12 insertions, 6 deletions
diff --git a/modules/notification/mail/mail.go b/modules/notification/mail/mail.go index eb45409faf..0927e182c1 100644 --- a/modules/notification/mail/mail.go +++ b/modules/notification/mail/mail.go @@ -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) } diff --git a/services/mailer/mail_comment.go b/services/mailer/mail_comment.go index f73c9fb637..eca05cef29 100644 --- a/services/mailer/mail_comment.go +++ b/services/mailer/mail_comment.go @@ -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) diff --git a/services/mailer/mail_issue.go b/services/mailer/mail_issue.go index cf5265872b..867aa32517 100644 --- a/services/mailer/mail_issue.go +++ b/services/mailer/mail_issue.go @@ -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) |