3 files changed, 8 insertions, 13 deletions
diff --git a/internal/email/confirm.go b/internal/email/confirm.go
index 34e2fb660..b49004056 100644
--- a/internal/email/confirm.go
+++ b/internal/email/confirm.go
@@ -23,7 +23,6 @@ import (
 	"net/smtp"
 
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 )
 
@@ -43,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" + viper.GetString(config.Keys.SMTPUsername) + ":password" + "\n" + s.from + "\n" + toAddress + "\n\n" + string(msg) + "\n")
+	logrus.WithField("func", "SendConfirmEmail").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 9f587f319..9aab1ca41 100644
--- a/internal/email/noopsender.go
+++ b/internal/email/noopsender.go
@@ -23,7 +23,6 @@ import (
 	"text/template"
 
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 )
 
@@ -32,7 +31,7 @@ import (
 //
 // Passing a nil function is also acceptable, in which case the send functions will just return nil.
 func NewNoopSender(sendCallback func(toAddress string, message string)) (Sender, error) {
-	templateBaseDir := viper.GetString(config.Keys.WebTemplateBaseDir)
+	templateBaseDir := config.GetWebTemplateBaseDir()
 
 	t, err := loadTemplates(templateBaseDir)
 	if err != nil {
diff --git a/internal/email/sender.go b/internal/email/sender.go
index f44627496..18372ab47 100644
--- a/internal/email/sender.go
+++ b/internal/email/sender.go
@@ -23,7 +23,6 @@ import (
 	"net/smtp"
 	"text/template"
 
-	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 )
 
@@ -38,19 +37,17 @@ type Sender interface {
 
 // NewSender returns a new email Sender interface with the given configuration, or an error if something goes wrong.
 func NewSender() (Sender, error) {
-	keys := config.Keys
-
-	templateBaseDir := viper.GetString(keys.WebTemplateBaseDir)
+	templateBaseDir := config.GetWebTemplateBaseDir()
 	t, err := loadTemplates(templateBaseDir)
 	if err != nil {
 		return nil, err
 	}
 
-	username := viper.GetString(keys.SMTPUsername)
-	password := viper.GetString(keys.SMTPPassword)
-	host := viper.GetString(keys.SMTPHost)
-	port := viper.GetInt(keys.SMTPPort)
-	from := viper.GetString(keys.SMTPFrom)
+	username := config.GetSMTPUsername()
+	password := config.GetSMTPPassword()
+	host := config.GetSMTPHost()
+	port := config.GetSMTPPort()
+	from := config.GetSMTPFrom()
 
 	return &sender{
 		hostAddress: fmt.Sprintf("%s:%d", host, port),