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/reset.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/reset.go')
| -rw-r--r-- | internal/email/reset.go | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/internal/email/reset.go b/internal/email/reset.go index 7a08ebda9..b646ef99b 100644 --- a/internal/email/reset.go +++ b/internal/email/reset.go @@ -24,8 +24,8 @@ import ( ) const ( - resetTemplate = "email_reset.tmpl" - resetSubject = "Subject: GoToSocial Password Reset" + resetTemplate = "email_reset_text.tmpl" + resetSubject = "GoToSocial Password Reset" ) func (s *sender) SendResetEmail(toAddress string, data ResetData) error { @@ -35,7 +35,10 @@ func (s *sender) SendResetEmail(toAddress string, data ResetData) error { } resetBody := buf.String() - msg := assembleMessage(resetSubject, resetBody, toAddress, s.from) + msg, err := assembleMessage(resetSubject, resetBody, toAddress, s.from) + if err != nil { + return err + } return smtp.SendMail(s.hostAddress, s.auth, s.from, []string{toAddress}, msg) } |