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/noopsender.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/noopsender.go')
| -rw-r--r-- | internal/email/noopsender.go | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/internal/email/noopsender.go b/internal/email/noopsender.go index efec303f0..9f587f319 100644 --- a/internal/email/noopsender.go +++ b/internal/email/noopsender.go @@ -20,7 +20,7 @@ package email import ( "bytes" - "html/template" + "text/template" "github.com/sirupsen/logrus" "github.com/spf13/viper" @@ -57,7 +57,10 @@ func (s *noopSender) SendConfirmEmail(toAddress string, data ConfirmData) error } confirmBody := buf.String() - msg := assembleMessage(confirmSubject, confirmBody, toAddress, "test@example.org") + msg, err := assembleMessage(confirmSubject, confirmBody, toAddress, "test@example.org") + if err != nil { + return err + } logrus.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg) @@ -74,7 +77,10 @@ func (s *noopSender) SendResetEmail(toAddress string, data ResetData) error { } resetBody := buf.String() - msg := assembleMessage(resetSubject, resetBody, toAddress, "test@example.org") + msg, err := assembleMessage(resetSubject, resetBody, toAddress, "test@example.org") + if err != nil { + return err + } logrus.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg) |