Refactor

Author: NorthRealm

services/mailer/mail.go

@@ -193,10 +193,12 @@ func generateMetadataHeaders(repo *repo_model.Repository) map[string]string {
 
 func generateSenderRecipientHeaders(doer, recipient *user_model.User) map[string]string {
 	return map[string]string{
-		"X-Gitea-Sender":     doer.Name,
-		"X-Gitea-Recipient":  recipient.Name,
-		"X-GitHub-Sender":    doer.Name,
-		"X-GitHub-Recipient": recipient.Name,
+		"X-Gitea-Sender":             doer.Name,
+		"X-Gitea-Recipient":          recipient.Name,
+		"X-Gitea-Recipient-Address":  recipient.Email,
+		"X-GitHub-Sender":            doer.Name,
+		"X-GitHub-Recipient":         recipient.Name,
+		"X-GitHub-Recipient-Address": recipient.Email,
 	}
 }
 

services/mailer/mail_issue_common.go

@@ -312,10 +312,8 @@ func generateAdditionalHeadersForIssue(ctx *mailComment, reason string, recipien
 	maps.Copy(headers, generateSenderRecipientHeaders(ctx.Doer, recipient))
 	maps.Copy(headers, generateReasonHeaders(reason))
 
-	headers["X-Gitea-Recipient-Address"] = recipient.Email
 	headers["X-Gitea-Issue-ID"] = issueID
 	headers["X-Gitea-Issue-Link"] = ctx.Issue.HTMLURL()
-	headers["X-GitHub-Recipient-Address"] = recipient.Email
 	headers["X-GitLab-Issue-IID"] = issueID
 
 	return headers