tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-07-22 18:28:37 +00:00
Code Releases Activity

[refactor] mailer service (#15072)

Browse Source 
* Unexport SendUserMail

* Instead of "[]*models.User" or "[]string" lists infent "[]*MailRecipient" for mailer

* adopt

* code format

* TODOs for "i18n"

* clean

* no fallback for lang -> just use english

* lint

* exec testComposeIssueCommentMessage per lang and use only emails

* rm MailRecipient

* Dont reload from users from db if you alredy have in ram

* nits

* minimize diff

Signed-off-by: 6543 <6543@obermui.de>

* localize subjects

* linter ...

* Tr extend

* start tmpl edit ...

* Apply suggestions from code review

* use translation.Locale

* improve mailIssueCommentBatch

Signed-off-by: Andrew Thornton <art27@cantab.net>

* add i18n to datas

Signed-off-by: Andrew Thornton <art27@cantab.net>

* a comment

Co-authored-by: Andrew Thornton <art27@cantab.net>
This commit is contained in:
6543
2021-04-02 12:25:13 +02:00
committed by GitHub
parent cc2d540092
commit 80d6c6d7de
15 changed files with 191 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/mailer/mail_test.go
View File

@@ -59,7 +59,7 @@ func TestComposeIssueCommentMessage(t *testing.T) {
tos := []string{"test@gitea.com", "test2@gitea.com"}
msgs := composeIssueCommentMessages(&mailCommentContext{Issue: issue, Doer: doer, ActionType: models.ActionCommentIssue,
Content: "test body", Comment: comment}, tos, false, "issue comment")
Content: "test body", Comment: comment}, "en-US", tos, false, "issue comment")
assert.Len(t, msgs, 2)
gomailMsg := msgs[0].ToMessage()
mailto := gomailMsg.GetHeader("To")
@@ -93,7 +93,7 @@ func TestComposeIssueMessage(t *testing.T) {
tos := []string{"test@gitea.com", "test2@gitea.com"}
msgs := composeIssueCommentMessages(&mailCommentContext{Issue: issue, Doer: doer, ActionType: models.ActionCreateIssue,
Content: "test body"}, tos, false, "issue create")
Content: "test body"}, "en-US", tos, false, "issue create")
assert.Len(t, msgs, 2)
gomailMsg := msgs[0].ToMessage()
@@ -218,7 +218,7 @@ func TestTemplateServices(t *testing.T) {
}
func testComposeIssueCommentMessage(t *testing.T, ctx *mailCommentContext, tos []string, fromMention bool, info string) *Message {
msgs := composeIssueCommentMessages(ctx, tos, fromMention, info)
msgs := composeIssueCommentMessages(ctx, "en-US", tos, fromMention, info)
assert.Len(t, msgs, 1)
return msgs[0]
}