tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Merge pull request 'mailer: Switch X-Mailer to "Forgejo"' (#3931) from algernon/forgejo:mailer-detox into forgejo

Browse source 
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/3931
Reviewed-by: Otto <otto@codeberg.org>
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
This commit is contained in:
Earl Warren 2024-05-28 17:51:04 +00:00
commit 8cca0d74dc
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
services/mailer/mail.go
View file

@ -403,7 +403,7 @@ func generateAdditionalHeaders(ctx *mailCommentContext, reason string, recipient
// https://datatracker.ietf.org/doc/html/rfc2369 // https://datatracker.ietf.org/doc/html/rfc2369
"List-Archive": fmt.Sprintf("<%s>", repo.HTMLURL()), "List-Archive": fmt.Sprintf("<%s>", repo.HTMLURL()),
"X-Mailer": "Gitea", "X-Mailer": "Forgejo",
"X-Gitea-Reason": reason, "X-Gitea-Reason": reason,
"X-Gitea-Sender": ctx.Doer.Name, "X-Gitea-Sender": ctx.Doer.Name,
"X-Gitea-Recipient": recipient.Name, "X-Gitea-Recipient": recipient.Name,

1
services/mailer/mail_test.go
View file

@ -360,6 +360,7 @@ func TestGenerateAdditionalHeaders(t *testing.T) {
expected := map[string]string{ expected := map[string]string{
"List-ID": "user2/repo1 <repo1.user2.localhost>", "List-ID": "user2/repo1 <repo1.user2.localhost>",
"List-Archive": "<https://try.gitea.io/user2/repo1>", "List-Archive": "<https://try.gitea.io/user2/repo1>",
"X-Mailer": "Forgejo",
"X-Gitea-Reason": "dummy-reason", "X-Gitea-Reason": "dummy-reason",
"X-Gitea-Sender": "user2", "X-Gitea-Sender": "user2",
"X-Gitea-Recipient": "test", "X-Gitea-Recipient": "test",