summaryrefslogtreecommitdiff
path: root/internal/email/confirm.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/email/confirm.go')
-rw-r--r--internal/email/confirm.go14
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)
}