Skip to content

Commit

Permalink
Fix missing mail reply address (#27997)
Browse files Browse the repository at this point in the history
Fixes https://codeberg.org/forgejo/forgejo/issues/1458

Some mails such as issue creation mails are missing the reply-to-comment
address. This PR fixes that and specifies which comment types should get
a reply-possibility.
  • Loading branch information
KN4CK3R authored Nov 13, 2023
1 parent 024fe11 commit 3081e7e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
8 changes: 8 additions & 0 deletions models/issues/comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,14 @@ func (t CommentType) HasAttachmentSupport() bool {
return false
}

func (t CommentType) HasMailReplySupport() bool {
switch t {
case CommentTypeComment, CommentTypeCode, CommentTypeReview, CommentTypeDismissReview, CommentTypeReopen, CommentTypeClose, CommentTypeMergePull, CommentTypeAssignees:
return true
}
return false
}

// RoleInRepo presents the user's participation in the repo
type RoleInRepo string

Expand Down
8 changes: 5 additions & 3 deletions services/mailer/mail.go
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,10 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
reference := createReference(ctx.Issue, nil, activities_model.ActionType(0))

var replyPayload []byte
if ctx.Comment != nil && ctx.Comment.Type == issues_model.CommentTypeCode {
replyPayload, err = incoming_payload.CreateReferencePayload(ctx.Comment)
if ctx.Comment != nil {
if ctx.Comment.Type.HasMailReplySupport() {
replyPayload, err = incoming_payload.CreateReferencePayload(ctx.Comment)
}
} else {
replyPayload, err = incoming_payload.CreateReferencePayload(ctx.Issue)
}
Expand All @@ -316,7 +318,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient
listUnsubscribe := []string{"<" + ctx.Issue.HTMLURL() + ">"}

if setting.IncomingEmail.Enabled {
if ctx.Comment != nil {
if replyPayload != nil {
token, err := token.CreateToken(token.ReplyHandlerType, recipient, replyPayload)
if err != nil {
log.Error("CreateToken failed: %v", err)
Expand Down

0 comments on commit 3081e7e

Please sign in to comment.