4 files changed, 7 insertions, 11 deletions
diff --git a/internal/web/base.go b/internal/web/base.go
index fff61043a..d203522ae 100644
--- a/internal/web/base.go
+++ b/internal/web/base.go
@@ -27,7 +27,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/api"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/processing"
@@ -54,9 +53,9 @@ type Module struct {
 
 // New returns a new api.ClientModule for web pages.
 func New(processor processing.Processor) (api.ClientModule, error) {
-	assetsBaseDir := viper.GetString(config.Keys.WebAssetBaseDir)
+	assetsBaseDir := config.GetWebAssetBaseDir()
 	if assetsBaseDir == "" {
-		return nil, fmt.Errorf("%s cannot be empty and must be a relative or absolute path", config.Keys.WebAssetBaseDir)
+		return nil, fmt.Errorf("%s cannot be empty and must be a relative or absolute path", config.WebAssetBaseDirFlag())
 	}
 
 	assetsPath, err := filepath.Abs(assetsBaseDir)
@@ -106,7 +105,7 @@ func (m *Module) baseHandler(c *gin.Context) {
 	l := logrus.WithField("func", "BaseGETHandler")
 	l.Trace("serving index html")
 
-	host := viper.GetString(config.Keys.Host)
+	host := config.GetHost()
 	instance, err := m.processor.InstanceGet(c.Request.Context(), host)
 	if err != nil {
 		l.Debugf("error getting instance from processor: %s", err)
@@ -124,7 +123,7 @@ func (m *Module) NotFoundHandler(c *gin.Context) {
 	l := logrus.WithField("func", "404")
 	l.Trace("serving 404 html")
 
-	host := viper.GetString(config.Keys.Host)
+	host := config.GetHost()
 	instance, err := m.processor.InstanceGet(c.Request.Context(), host)
 	if err != nil {
 		l.Debugf("error getting instance from processor: %s", err)
diff --git a/internal/web/confirmemail.go b/internal/web/confirmemail.go
index 9488c5d52..7c8aa464f 100644
--- a/internal/web/confirmemail.go
+++ b/internal/web/confirmemail.go
@@ -23,7 +23,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 )
 
@@ -45,7 +44,7 @@ func (m *Module) confirmEmailGETHandler(c *gin.Context) {
 		return
 	}
 
-	host := viper.GetString(config.Keys.Host)
+	host := config.GetHost()
 	instance, err := m.processor.InstanceGet(ctx, host)
 	if err != nil {
 		c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
diff --git a/internal/web/profile.go b/internal/web/profile.go
index 7fad7f4c6..66419dcc7 100644
--- a/internal/web/profile.go
+++ b/internal/web/profile.go
@@ -27,7 +27,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/api"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
@@ -52,7 +51,7 @@ func (m *Module) profileTemplateHandler(c *gin.Context) {
 		return
 	}
 
-	instance, errWithCode := m.processor.InstanceGet(ctx, viper.GetString(config.Keys.Host))
+	instance, errWithCode := m.processor.InstanceGet(ctx, config.GetHost())
 	if errWithCode != nil {
 		l.Debugf("error getting instance from processor: %s", errWithCode.Error())
 		c.JSON(errWithCode.Code(), gin.H{"error": errWithCode.Safe()})
diff --git a/internal/web/thread.go b/internal/web/thread.go
index 0450f6b26..3a9839281 100644
--- a/internal/web/thread.go
+++ b/internal/web/thread.go
@@ -23,7 +23,6 @@ import (
 	"strings"
 
 	"github.com/sirupsen/logrus"
-	"github.com/spf13/viper"
 
 	"github.com/gin-gonic/gin"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
@@ -57,7 +56,7 @@ func (m *Module) threadTemplateHandler(c *gin.Context) {
 		return
 	}
 
-	host := viper.GetString(config.Keys.Host)
+	host := config.GetHost()
 	instance, err := m.processor.InstanceGet(ctx, host)
 	if err != nil {
 		l.Debugf("error getting instance from processor: %s", err)