High performance, self-hosted, newsletter and mailing list manager with a modern dashboard. Single binary app.
JavaScript campaigncampaign-managementemail-marketingemail-subscriptionlistmonkmailing-listnewsletternewsletter-managementnewsletter-softwareself-hostedsms-gatewaysmtptransactional-emails
Apply minor Go code fixes (#2219)
ANU MADHAV2abc0a8651d2
diff --git a/cmd/events.go b/cmd/events.goindex 3cb3cf67..33dda537 100644--- a/cmd/events.go+++ b/cmd/events.go@@ -48,5 +48,4 @@ func handleEventStream(c echo.Context) error {}}- return nil}diff --git a/cmd/utils.go b/cmd/utils.goindex b00c4524..04859e41 100644--- a/cmd/utils.go+++ b/cmd/utils.go@@ -9,6 +9,9 @@ import ("strconv""strings""unicode"++ "golang.org/x/text/cases"+ "golang.org/x/text/language")var (@@ -116,7 +119,7 @@ func trimNullBytes(b []byte) string {func titleCase(input string) string {parts := strings.Fields(input)for n, p := range parts {- parts[n] = strings.Title(p)+ parts[n] = cases.Title(language.Und).String(p)}return strings.Join(parts, " ")diff --git a/internal/captcha/captcha.go b/internal/captcha/captcha.goindex fd39cfa2..deec8bb4 100644--- a/internal/captcha/captcha.go+++ b/internal/captcha/captcha.go@@ -64,11 +64,11 @@ func (c *Captcha) Verify(token string) (error, bool) {}var r captchaResp- if json.Unmarshal(body, &r); err != nil {+ if err := json.Unmarshal(body, &r); err != nil {return err, true}- if r.Success != true {+ if !r.Success {return fmt.Errorf("captcha failed: %s", strings.Join(r.ErrorCodes, ",")), false}diff --git a/internal/manager/manager.go b/internal/manager/manager.goindex 58146984..74e2a640 100644--- a/internal/manager/manager.go+++ b/internal/manager/manager.go@@ -13,6 +13,8 @@ import ("github.com/Masterminds/sprig/v3""github.com/knadh/listmonk/internal/i18n""github.com/knadh/listmonk/models"+ "golang.org/x/text/cases"+ "golang.org/x/text/language")const (@@ -594,7 +596,7 @@ func (m *Manager) trackLink(url, campUUID, subUUID string) string {// sendNotif sends a notification to registered admin e-mails.func (m *Manager) sendNotif(c *models.Campaign, status, reason string) error {var (- subject = fmt.Sprintf("%s: %s", strings.Title(status), c.Name)+ subject = fmt.Sprintf("%s: %s", cases.Title(language.Und).String(status), c.Name)data = map[string]interface{}{"ID": c.ID,"Name": c.Name,diff --git a/internal/subimporter/importer.go b/internal/subimporter/importer.goindex a9a1a2ed..6ace3236 100644--- a/internal/subimporter/importer.go+++ b/internal/subimporter/importer.go@@ -26,6 +26,8 @@ import ("github.com/knadh/listmonk/internal/i18n""github.com/knadh/listmonk/models""github.com/lib/pq"+ "golang.org/x/text/cases"+ "golang.org/x/text/language")const (@@ -246,7 +248,7 @@ func (im *Importer) sendNotif(status string) error {Total: s.Total,}subject = fmt.Sprintf("%s: %s import",- strings.Title(status),+ cases.Title(language.Und).String(status),s.Name))return im.opt.NotifCB(subject, out)@@ -648,7 +650,7 @@ func (im *Importer) ValidateFields(s SubReq) (SubReq, error) {parts := strings.Fields(strings.ReplaceAll(name, ".", " "))for n, p := range parts {- parts[n] = strings.Title(p)+ parts[n] = cases.Title(language.Und).String(p)}s.Name = strings.Join(parts, " ")