From 4d0076e625cfad6c37648693b5643a39da56f729 Mon Sep 17 00:00:00 2001 From: rmanach Date: Sat, 9 Sep 2023 16:07:08 +0200 Subject: [PATCH] change receiver field type --- mail/mail.go | 23 +++++++++-------------- services/sender.go | 2 +- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/mail/mail.go b/mail/mail.go index 3b6bab4..18b6964 100644 --- a/mail/mail.go +++ b/mail/mail.go @@ -9,19 +9,10 @@ import ( type Email struct { Path string - Sender string `json:"sender"` - Receivers []string `json:"receivers"` - Subject string `json:"subject"` - Content string `json:"content"` -} - -func NewEmail(sender string, receivers []string, subject, content string) Email { - return Email{ - Sender: sender, - Receivers: receivers, - Subject: subject, - Content: content, - } + Sender string `json:"sender"` + Receivers string `json:"receivers"` + Subject string `json:"subject"` + Content string `json:"content"` } func FromJSON(path string) (Email, error) { @@ -39,10 +30,14 @@ func FromJSON(path string) (Email, error) { return mail, nil } +func (e Email) GetReceivers() []string { + return strings.Split(e.Receivers, ",") +} + func (e Email) Generate() []byte { mail := fmt.Sprintf( "To: %s\nFrom: %s\nContent-Type: text/html;charset=utf-8\nSubject: %s\n\n%s", - strings.Join(e.Receivers, ","), + e.Receivers, e.Sender, e.Subject, e.Content, diff --git a/services/sender.go b/services/sender.go index 5e639b0..beae70c 100644 --- a/services/sender.go +++ b/services/sender.go @@ -42,7 +42,7 @@ func (s Sender) SendMail(email mail.Email) error { auth := smtp.PlainAuth("", s.smtpConfig.User, s.smtpConfig.Password, s.smtpConfig.Url) log.Debug().Msg("SMTP authentication succeed") - if err := smtp.SendMail(s.smtpConfig.GetFullUrl(), auth, email.Sender, email.Receivers, email.Generate()); err != nil { + if err := smtp.SendMail(s.smtpConfig.GetFullUrl(), auth, email.Sender, email.GetReceivers(), email.Generate()); err != nil { log.Err(err).Msg("error while sending email") return err }