core
/
gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add List-Unsubscribe header (#17804) 

Fixes #13283

Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
mscherer 2021-12-21 23:53:03 +01:00 committed by GitHub
parent 7be82f4af8
commit cb05d3a23a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -348,7 +348,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()),
//"List-Post": https://github.com/go-gitea/gitea/pull/13585 //"List-Post": https://github.com/go-gitea/gitea/pull/13585
//"List-Unsubscribe": https://github.com/go-gitea/gitea/issues/10808, https://github.com/go-gitea/gitea/issues/13283 "List-Unsubscribe": ctx.Issue.HTMLURL(),
"X-Gitea-Reason": reason, "X-Gitea-Reason": reason,
"X-Gitea-Sender": ctx.Doer.DisplayName(), "X-Gitea-Sender": ctx.Doer.DisplayName(),

1
services/mailer/mail_test.go
View File

@ -218,6 +218,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>",
"List-Unsubscribe": "https://try.gitea.io/user2/repo1/issues/1",
"X-Gitea-Reason": "dummy-reason", "X-Gitea-Reason": "dummy-reason",
"X-Gitea-Sender": "< U<se>r Tw<o > ><", "X-Gitea-Sender": "< U<se>r Tw<o > ><",
"X-Gitea-Recipient": "Test", "X-Gitea-Recipient": "Test",