From 6ee46db3de5f3ba314ec69a97088e55395899567 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Mon, 18 Oct 2021 14:44:52 +0200 Subject: [PATCH] log emails that *would* have been sent --- internal/email/noopsender.go | 52 +++++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/internal/email/noopsender.go b/internal/email/noopsender.go index d8a7b4db7..5efb963a4 100644 --- a/internal/email/noopsender.go +++ b/internal/email/noopsender.go @@ -22,6 +22,7 @@ import ( "bytes" "html/template" + "github.com/sirupsen/logrus" "github.com/superseriousbusiness/gotosocial/internal/text" ) @@ -47,37 +48,44 @@ type noopSender struct { } func (s *noopSender) SendConfirmEmail(toAddress string, data ConfirmData) error { + buf := &bytes.Buffer{} + if err := s.template.ExecuteTemplate(buf, confirmTemplate, data); err != nil { + return err + } + + confirmBody, err := text.MinifyHTML(buf.String()) + if err != nil { + return err + } + + msg := assembleMessage(confirmSubject, confirmBody, toAddress, "test@example.org") + + logrus.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg) + if s.sendCallback != nil { - buf := &bytes.Buffer{} - if err := s.template.ExecuteTemplate(buf, confirmTemplate, data); err != nil { - return err - } - - confirmBody, err := text.MinifyHTML(buf.String()) - if err != nil { - return err - } - - msg := assembleMessage(confirmSubject, confirmBody, toAddress, "test@example.org") s.sendCallback(toAddress, string(msg)) } return nil } func (s *noopSender) SendResetEmail(toAddress string, data ResetData) error { + buf := &bytes.Buffer{} + if err := s.template.ExecuteTemplate(buf, resetTemplate, data); err != nil { + return err + } + + resetBody, err := text.MinifyHTML(buf.String()) + if err != nil { + return err + } + + msg := assembleMessage(resetSubject, resetBody, toAddress, "test@example.org") + + logrus.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg) + if s.sendCallback != nil { - buf := &bytes.Buffer{} - if err := s.template.ExecuteTemplate(buf, resetTemplate, data); err != nil { - return err - } - - resetBody, err := text.MinifyHTML(buf.String()) - if err != nil { - return err - } - - msg := assembleMessage(resetSubject, resetBody, toAddress, "test@example.org") s.sendCallback(toAddress, string(msg)) } + return nil }