diff options
| author |  Forest Johnson <forest.n.johnson@gmail.com> | 2022-01-31 10:46:20 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2022-01-31 11:46:20 +0100 |
| commit | 5be8a7a7ea96d962d0f0b9f09b967e403a227698 (patch) | |
| tree | 448ae55de146463dc86005e55ae5f2e1eb8f8bc8 /internal/email/confirm.go | |
| parent | [bug] Fix sqlite empty address issue (#370) (diff) | |
| download | gotosocial-5be8a7a7ea96d962d0f0b9f09b967e403a227698.tar.xz | |
[bug] Send plaintext emails to fix "message refused: Message is not RFC 2822 compliant" (#366)
* trying to fix "message refused: Message is not RFC 2822 compliant"
* fix "message refused: Message is not RFC 2822 compliant"
550 5.7.1 Delivery not authorized, message refused: Message is not RFC
2822 compliant
* remove silly regex
* lint
* fix tests
* we should use text/template instead of html/template now
Diffstat (limited to 'internal/email/confirm.go')
| -rw-r--r-- | internal/email/confirm.go | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/internal/email/confirm.go b/internal/email/confirm.go index 4503137b3..34e2fb660 100644 --- a/internal/email/confirm.go +++ b/internal/email/confirm.go @@ -21,11 +21,15 @@ package email import ( "bytes" "net/smtp" + + "github.com/sirupsen/logrus" + "github.com/spf13/viper" + "github.com/superseriousbusiness/gotosocial/internal/config" ) const ( - confirmTemplate = "email_confirm.tmpl" - confirmSubject = "Subject: GoToSocial Email Confirmation" + confirmTemplate = "email_confirm_text.tmpl" + confirmSubject = "GoToSocial Email Confirmation" ) func (s *sender) SendConfirmEmail(toAddress string, data ConfirmData) error { @@ -35,7 +39,11 @@ func (s *sender) SendConfirmEmail(toAddress string, data ConfirmData) error { } confirmBody := buf.String() - msg := assembleMessage(confirmSubject, confirmBody, toAddress, s.from) + msg, err := assembleMessage(confirmSubject, confirmBody, toAddress, s.from) + if err != nil { + return err + } + logrus.WithField("func", "SendConfirmEmail").Trace(s.hostAddress + "\n" + viper.GetString(config.Keys.SMTPUsername) + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n") return smtp.SendMail(s.hostAddress, s.auth, s.from, []string{toAddress}, msg) } |