3 files changed, 5 insertions, 6 deletions
diff --git a/internal/email/confirm.go b/internal/email/confirm.go
index b49004056..7cc32f330 100644
--- a/internal/email/confirm.go
+++ b/internal/email/confirm.go
@@ -22,8 +22,8 @@ import (
 	"bytes"
 	"net/smtp"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
 const (
@@ -42,7 +42,7 @@ func (s *sender) SendConfirmEmail(toAddress string, data ConfirmData) error {
 	if err != nil {
 		return err
 	}
-	logrus.WithField("func", "SendConfirmEmail").Trace(s.hostAddress + "\n" + config.GetSMTPUsername() + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n")
+	log.Trace(s.hostAddress + "\n" + config.GetSMTPUsername() + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n")
 	return smtp.SendMail(s.hostAddress, s.auth, s.from, []string{toAddress}, msg)
 }
 
diff --git a/internal/email/noopsender.go b/internal/email/noopsender.go
index 9aab1ca41..4f4aa2014 100644
--- a/internal/email/noopsender.go
+++ b/internal/email/noopsender.go
@@ -22,8 +22,8 @@ import (
 	"bytes"
 	"text/template"
 
-	"github.com/sirupsen/logrus"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
+	"github.com/superseriousbusiness/gotosocial/internal/log"
 )
 
 // NewNoopSender returns a no-op email sender that will just execute the given sendCallback
@@ -61,7 +61,7 @@ func (s *noopSender) SendConfirmEmail(toAddress string, data ConfirmData) error
 		return err
 	}
 
-	logrus.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg)
+	log.Tracef("NOT SENDING confirmation email to %s with contents: %s", toAddress, msg)
 
 	if s.sendCallback != nil {
 		s.sendCallback(toAddress, string(msg))
@@ -81,7 +81,7 @@ func (s *noopSender) SendResetEmail(toAddress string, data ResetData) error {
 		return err
 	}
 
-	logrus.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg)
+	log.Tracef("NOT SENDING reset email to %s with contents: %s", toAddress, msg)
 
 	if s.sendCallback != nil {
 		s.sendCallback(toAddress, string(msg))
diff --git a/internal/email/util.go b/internal/email/util.go
index c543db755..80534d6ae 100644
--- a/internal/email/util.go
+++ b/internal/email/util.go
@@ -45,7 +45,6 @@ func loadTemplates(templateBaseDir string) (*template.Template, error) {
 // https://pkg.go.dev/net/smtp#SendMail
 // and it did seem to work.
 func assembleMessage(mailSubject string, mailBody string, mailTo string, mailFrom string) ([]byte, error) {
-
 	if strings.Contains(mailSubject, "\r") || strings.Contains(mailSubject, "\n") {
 		return nil, errors.New("email subject must not contain newline characters")
 	}