6 files changed, 29 insertions, 29 deletions
diff --git a/internal/typeutils/converter.go b/internal/typeutils/converter.go
index 212ae1247..448fef5c8 100644
--- a/internal/typeutils/converter.go
+++ b/internal/typeutils/converter.go
@@ -26,7 +26,6 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
 	"github.com/superseriousbusiness/gotosocial/internal/api/model"
 	"github.com/superseriousbusiness/gotosocial/internal/cache"
-	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 )
@@ -192,15 +191,13 @@ type TypeConverter interface {
 }
 
 type converter struct {
-	config  *config.Config
 	db      db.DB
 	asCache cache.Cache
 }
 
 // NewConverter returns a new Converter
-func NewConverter(config *config.Config, db db.DB) TypeConverter {
+func NewConverter(db db.DB) TypeConverter {
 	return &converter{
-		config:  config,
 		db:      db,
 		asCache: cache.New(),
 	}
diff --git a/internal/typeutils/converter_test.go b/internal/typeutils/converter_test.go
index d557e52f2..57952a84a 100644
--- a/internal/typeutils/converter_test.go
+++ b/internal/typeutils/converter_test.go
@@ -21,7 +21,6 @@ package typeutils_test
 import (
 	"github.com/stretchr/testify/suite"
 	"github.com/superseriousbusiness/activity/streams/vocab"
-	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 	"github.com/superseriousbusiness/gotosocial/internal/typeutils"
@@ -324,7 +323,6 @@ const (
 
 type TypeUtilsTestSuite struct {
 	suite.Suite
-	config       *config.Config
 	db           db.DB
 	testAccounts map[string]*gtsmodel.Account
 	testStatuses map[string]*gtsmodel.Status
@@ -334,13 +332,14 @@ type TypeUtilsTestSuite struct {
 }
 
 func (suite *TypeUtilsTestSuite) SetupSuite() {
-	suite.config = testrig.NewTestConfig()
-	suite.db = testrig.NewTestDB()
 	testrig.InitTestLog()
+	testrig.InitTestConfig()
+
+	suite.db = testrig.NewTestDB()
 	suite.testAccounts = testrig.NewTestAccounts()
 	suite.testStatuses = testrig.NewTestStatuses()
 	suite.testPeople = testrig.NewTestFediPeople()
-	suite.typeconverter = typeutils.NewConverter(suite.config, suite.db)
+	suite.typeconverter = typeutils.NewConverter(suite.db)
 }
 
 func (suite *TypeUtilsTestSuite) SetupTest() {
diff --git a/internal/typeutils/internal.go b/internal/typeutils/internal.go
index b6a425732..2257d7203 100644
--- a/internal/typeutils/internal.go
+++ b/internal/typeutils/internal.go
@@ -25,7 +25,7 @@ func (c *converter) FollowRequestToFollow(ctx context.Context, f *gtsmodel.Follo
 
 func (c *converter) StatusToBoost(ctx context.Context, s *gtsmodel.Status, boostingAccount *gtsmodel.Account) (*gtsmodel.Status, error) {
 	// the wrapper won't use the same ID as the boosted status so we generate some new UUIDs
-	uris := util.GenerateURIsForAccount(boostingAccount.Username, c.config.Protocol, c.config.Host)
+	uris := util.GenerateURIsForAccount(boostingAccount.Username)
 	boostWrapperStatusID, err := id.NewULID()
 	if err != nil {
 		return nil, err
diff --git a/internal/typeutils/internaltoas.go b/internal/typeutils/internaltoas.go
index ae8e3b1f2..1bf2416b8 100644
--- a/internal/typeutils/internaltoas.go
+++ b/internal/typeutils/internaltoas.go
@@ -25,9 +25,11 @@ import (
 	"fmt"
 	"net/url"
 
+	"github.com/spf13/viper"
 	"github.com/superseriousbusiness/activity/pub"
 	"github.com/superseriousbusiness/activity/streams"
 	"github.com/superseriousbusiness/activity/streams/vocab"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/gtserror"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 )
@@ -620,7 +622,8 @@ func (c *converter) MentionToAS(ctx context.Context, m *gtsmodel.Mention) (vocab
 	// name -- this should be the namestring of the mentioned user, something like @whatever@example.org
 	var domain string
 	if m.TargetAccount.Domain == "" {
-		domain = c.config.AccountDomain
+		accountDomain := viper.GetString(config.Keys.AccountDomain)
+		domain = accountDomain
 	} else {
 		domain = m.TargetAccount.Domain
 	}
diff --git a/internal/typeutils/internaltofrontend.go b/internal/typeutils/internaltofrontend.go
index 272ffc175..4dd8e335b 100644
--- a/internal/typeutils/internaltofrontend.go
+++ b/internal/typeutils/internaltofrontend.go
@@ -21,11 +21,14 @@ package typeutils
 import (
 	"context"
 	"fmt"
-	"github.com/sirupsen/logrus"
 	"strings"
 	"time"
 
+	"github.com/sirupsen/logrus"
+	"github.com/spf13/viper"
+
 	"github.com/superseriousbusiness/gotosocial/internal/api/model"
+	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
 )
@@ -567,34 +570,32 @@ func (c *converter) InstanceToAPIInstance(ctx context.Context, i *gtsmodel.Insta
 	}
 
 	// if the requested instance is *this* instance, we can add some extra information
-	if i.Domain == c.config.Host {
-		userCountKey := "user_count"
-		statusCountKey := "status_count"
-		domainCountKey := "domain_count"
-
-		userCount, err := c.db.CountInstanceUsers(ctx, c.config.Host)
+	keys := config.Keys
+	host := viper.GetString(keys.Host)
+	if i.Domain == host {
+		userCount, err := c.db.CountInstanceUsers(ctx, host)
 		if err == nil {
-			mi.Stats[userCountKey] = userCount
+			mi.Stats["user_count"] = userCount
 		}
 
-		statusCount, err := c.db.CountInstanceStatuses(ctx, c.config.Host)
+		statusCount, err := c.db.CountInstanceStatuses(ctx, host)
 		if err == nil {
-			mi.Stats[statusCountKey] = statusCount
+			mi.Stats["status_count"] = statusCount
 		}
 
-		domainCount, err := c.db.CountInstanceDomains(ctx, c.config.Host)
+		domainCount, err := c.db.CountInstanceDomains(ctx, host)
 		if err == nil {
-			mi.Stats[domainCountKey] = domainCount
+			mi.Stats["domain_count"] = domainCount
 		}
 
-		mi.Registrations = c.config.AccountsConfig.OpenRegistration
-		mi.ApprovalRequired = c.config.AccountsConfig.RequireApproval
+		mi.Registrations = viper.GetBool(keys.AccountsRegistrationOpen)
+		mi.ApprovalRequired = viper.GetBool(keys.AccountsApprovalRequired)
 		mi.InvitesEnabled = false // TODO
-		mi.MaxTootChars = uint(c.config.StatusesConfig.MaxChars)
+		mi.MaxTootChars = uint(viper.GetInt(keys.StatusesMaxChars))
 		mi.URLS = &model.InstanceURLs{
-			StreamingAPI: fmt.Sprintf("wss://%s", c.config.Host),
+			StreamingAPI: fmt.Sprintf("wss://%s", host),
 		}
-		mi.Version = c.config.SoftwareVersion
+		mi.Version = viper.GetString(keys.SoftwareVersion)
 	}
 
 	// get the instance account if it exists and just skip if it doesn't
diff --git a/internal/typeutils/wrap.go b/internal/typeutils/wrap.go
index b5938c419..0f82a679b 100644
--- a/internal/typeutils/wrap.go
+++ b/internal/typeutils/wrap.go
@@ -33,7 +33,7 @@ func (c *converter) WrapPersonInUpdate(person vocab.ActivityStreamsPerson, origi
 		return nil, err
 	}
 
-	idString := util.GenerateURIForUpdate(originAccount.Username, c.config.Protocol, c.config.Host, newID)
+	idString := util.GenerateURIForUpdate(originAccount.Username, newID)
 	idURI, err := url.Parse(idString)
 	if err != nil {
 		return nil, fmt.Errorf("WrapPersonInUpdate: error parsing url %s: %s", idString, err)