From cb05d3a23a78b0c62eab45450a6179cd8e4ebd35 Mon Sep 17 00:00:00 2001 From: mscherer Date: Tue, 21 Dec 2021 23:53:03 +0100 Subject: [PATCH] Add List-Unsubscribe header (#17804) Fixes #13283 Co-authored-by: zeripath Co-authored-by: Lunny Xiao --- services/mailer/mail.go | 2 +- services/mailer/mail_test.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 91d39abead..0a55737073 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -348,7 +348,7 @@ func generateAdditionalHeaders(ctx *mailCommentContext, reason string, recipient // https://datatracker.ietf.org/doc/html/rfc2369 "List-Archive": fmt.Sprintf("<%s>", repo.HTMLURL()), //"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-Sender": ctx.Doer.DisplayName(), diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 1ce1020d07..6a175337ad 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -218,6 +218,7 @@ func TestGenerateAdditionalHeaders(t *testing.T) { expected := map[string]string{ "List-ID": "user2/repo1 ", "List-Archive": "", + "List-Unsubscribe": "https://try.gitea.io/user2/repo1/issues/1", "X-Gitea-Reason": "dummy-reason", "X-Gitea-Sender": "< Ur Tw ><", "X-Gitea-Recipient": "Test",