diff options
| author | Wim <wim@42.be> | 2022-06-20 12:02:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 12:02:49 +0200 |
| commit | cb50375e2b6abf0c79d4891e5e1ea775b9759cd2 (patch) | |
| tree | 938af0f442baf79cebd114692aff5ad6af37f987 /services/mailer | |
| parent | 3289abcefc563d6ea16c1dbd19680b874a58a6d3 (diff) | |
| download | gitea-cb50375e2b6abf0c79d4891e5e1ea775b9759cd2.tar.gz gitea-cb50375e2b6abf0c79d4891e5e1ea775b9759cd2.zip | |
Add more linters to improve code readability (#19989)
Add nakedret, unconvert, wastedassign, stylecheck and nolintlint linters to improve code readability
- nakedret - https://github.com/alexkohler/nakedret - nakedret is a Go static analysis tool to find naked returns in functions greater than a specified function length.
- unconvert - https://github.com/mdempsky/unconvert - Remove unnecessary type conversions
- wastedassign - https://github.com/sanposhiho/wastedassign - wastedassign finds wasted assignment statements.
- notlintlint - Reports ill-formed or insufficient nolint directives
- stylecheck - https://staticcheck.io/docs/checks/#ST - keep style consistent
- excluded: [ST1003 - Poorly chosen identifier](https://staticcheck.io/docs/checks/#ST1003) and [ST1005 - Incorrectly formatted error string](https://staticcheck.io/docs/checks/#ST1005)
Diffstat (limited to 'services/mailer')
| -rw-r--r-- | services/mailer/mail.go | 8 | ||||
| -rw-r--r-- | services/mailer/mail_test.go | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/services/mailer/mail.go b/services/mailer/mail.go index 81cfb2e31a..f936229551 100644 --- a/services/mailer/mail.go +++ b/services/mailer/mail.go @@ -287,7 +287,7 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient } var mailSubject bytes.Buffer - if err := subjectTemplates.ExecuteTemplate(&mailSubject, string(tplName), mailMeta); err == nil { + if err := subjectTemplates.ExecuteTemplate(&mailSubject, tplName, mailMeta); err == nil { subject = sanitizeSubject(mailSubject.String()) if subject == "" { subject = fallback @@ -302,8 +302,8 @@ func composeIssueCommentMessages(ctx *mailCommentContext, lang string, recipient var mailBody bytes.Buffer - if err := bodyTemplates.ExecuteTemplate(&mailBody, string(tplName), mailMeta); err != nil { - log.Error("ExecuteTemplate [%s]: %v", string(tplName)+"/body", err) + if err := bodyTemplates.ExecuteTemplate(&mailBody, tplName, mailMeta); err != nil { + log.Error("ExecuteTemplate [%s]: %v", tplName+"/body", err) } // Make sure to compose independent messages to avoid leaking user emails @@ -498,5 +498,5 @@ func actionToTemplate(issue *issues_model.Issue, actionType models.ActionType, if !ok { template = "issue/default" } - return + return typeName, name, template } diff --git a/services/mailer/mail_test.go b/services/mailer/mail_test.go index 83955a5896..93837ba8c4 100644 --- a/services/mailer/mail_test.go +++ b/services/mailer/mail_test.go @@ -61,7 +61,7 @@ func prepareMailerTest(t *testing.T) (doer *user_model.User, repo *repo_model.Re issue = unittest.AssertExistsAndLoadBean(t, &issues_model.Issue{ID: 1, Repo: repo, Poster: doer}).(*issues_model.Issue) assert.NoError(t, issue.LoadRepo(db.DefaultContext)) comment = unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{ID: 2, Issue: issue}).(*issues_model.Comment) - return + return doer, repo, issue, comment } func TestComposeIssueCommentMessage(t *testing.T) { |