diff options
| author | mrsdizzie <info@mrsdizzie.com> | 2020-01-03 12:13:22 -0500 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2020-01-03 19:13:22 +0200 |
| commit | b39fab41c8b315ba7ddf9f9a4cc522385cf9f720 (patch) | |
| tree | 19dc394a4b47c9a2306d4ee45d2524164c6e778e /services | |
| parent | 134e3fdf3d271f1015d062c74d55e3f28f7825d6 (diff) | |
| download | gitea-b39fab41c8b315ba7ddf9f9a4cc522385cf9f720.tar.gz gitea-b39fab41c8b315ba7ddf9f9a4cc522385cf9f720.zip | |
Some more e-mail notification fixes (#9596)
* Some more e-mail notification fixes
A few more small e-mail notification fixes/changes
* Style footer of notification email to be smaller
* Include text for when pull request is merged
* Don't include original body of issue or PR when merging/closing by
setting issue.Content to "" in these cases
* Set Re: prefix and meessage-ID headers based on actName instead of checking for a
comment. This fixes a bug where certain actions that didn't have a
comment were setting Message-ID instead of In-Reply-To which caused some
mail programs not to show those messages as they would have had the same
Message-ID as a previous message. Also fixes the case where a final
comment and closing message would have been displayed out of order if
you didn't have a copy of the original issue/pr cretion message.
* Update other template footers for consistency
Diffstat (limited to 'services')
| -rw-r--r-- | services/mailer/mail.go | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/services/mailer/mail.go b/services/mailer/mail.go index a8768de6cd..fa40170d46 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -177,7 +177,6 @@ func composeIssueCommentMessages(ctx *mailCommentContext, tos []string, fromMent commentType := models.CommentTypeComment if ctx.Comment != nil { - prefix = "Re: " commentType = ctx.Comment.Type link = ctx.Issue.HTMLURL() + "#" + ctx.Comment.HashTag() } else { @@ -189,13 +188,16 @@ func composeIssueCommentMessages(ctx *mailCommentContext, tos []string, fromMent reviewType = ctx.Comment.Review.Type } - fallback = prefix + fallbackMailSubject(ctx.Issue) - // This is the body of the new issue or comment, not the mail body body := string(markup.RenderByType(markdown.MarkupName, []byte(ctx.Content), ctx.Issue.Repo.HTMLURL(), ctx.Issue.Repo.ComposeMetas())) actType, actName, tplName := actionToTemplate(ctx.Issue, ctx.ActionType, commentType, reviewType) + if actName != "new" { + prefix = "Re: " + } + fallback = prefix + fallbackMailSubject(ctx.Issue) + if ctx.Comment != nil && ctx.Comment.Review != nil { reviewComments = make([]*models.Comment, 0, 10) for _, lines := range ctx.Comment.Review.CodeComments { @@ -247,7 +249,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, tos []string, fromMent msg.Info = fmt.Sprintf("Subject: %s, %s", subject, info) // Set Message-ID on first message so replies know what to reference - if ctx.Comment == nil { + if actName == "new" { msg.SetHeader("Message-ID", "<"+ctx.Issue.ReplyReference()+">") } else { msg.SetHeader("In-Reply-To", "<"+ctx.Issue.ReplyReference()+">") |