[chore] deinterface the typeutils.Converter and update to use state structure (#2217)

* update typeconverter to use state structure

* deinterface the typeutils.TypeConverter -> typeutils.Converter

* finish copying over old type converter code comments

* fix cherry-pick merge issues, fix tests pointing to old typeutils interface type still

6 files changed, 12 insertions, 12 deletions

diff --git a/internal/processing/status/boost.go b/internal/processing/status/boost.go
index eccd81886..d4bdc3f43 100644
--- a/internal/processing/status/boost.go
+++ b/internal/processing/status/boost.go
@@ -63,7 +63,7 @@ func (p *Processor) BoostCreate(ctx context.Context, requestingAccount *gtsmodel
 	}
 
 	// it's visible! it's boostable! so let's boost the FUCK out of it
-	boostWrapperStatus, err := p.tc.StatusToBoost(ctx, targetStatus, requestingAccount)
+	boostWrapperStatus, err := p.converter.StatusToBoost(ctx, targetStatus, requestingAccount)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
@@ -199,7 +199,7 @@ func (p *Processor) StatusBoostedBy(ctx context.Context, requestingAccount *gtsm
 			return nil, gtserror.NewErrorNotFound(wrapped)
 		}
 
-		apiAccount, err := p.tc.AccountToAPIAccountPublic(ctx, account)
+		apiAccount, err := p.converter.AccountToAPIAccountPublic(ctx, account)
 		if err != nil {
 			err = fmt.Errorf("BoostedBy: error converting account to api model: %s", err)
 			return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/status/common.go b/internal/processing/status/common.go
index e557563f3..71eef70a1 100644
--- a/internal/processing/status/common.go
+++ b/internal/processing/status/common.go
@@ -29,7 +29,7 @@ import (
 )
 
 func (p *Processor) apiStatus(ctx context.Context, targetStatus *gtsmodel.Status, requestingAccount *gtsmodel.Account) (*apimodel.Status, gtserror.WithCode) {
-	apiStatus, err := p.tc.StatusToAPIStatus(ctx, targetStatus, requestingAccount)
+	apiStatus, err := p.converter.StatusToAPIStatus(ctx, targetStatus, requestingAccount)
 	if err != nil {
 		err = gtserror.Newf("error converting status %s to frontend representation: %w", targetStatus.ID, err)
 		return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/status/fave.go b/internal/processing/status/fave.go
index 9da243312..e2bf03594 100644
--- a/internal/processing/status/fave.go
+++ b/internal/processing/status/fave.go
@@ -135,7 +135,7 @@ func (p *Processor) FavedBy(ctx context.Context, requestingAccount *gtsmodel.Acc
 			continue
 		}
 
-		apiAccount, err := p.tc.AccountToAPIAccountPublic(ctx, fave.Account)
+		apiAccount, err := p.converter.AccountToAPIAccountPublic(ctx, fave.Account)
 		if err != nil {
 			err = fmt.Errorf("FavedBy: error converting account %s to frontend representation: %w", fave.AccountID, err)
 			return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/status/get.go b/internal/processing/status/get.go
index 236f6f126..cf79b96a0 100644
--- a/internal/processing/status/get.go
+++ b/internal/processing/status/get.go
@@ -55,7 +55,7 @@ func (p *Processor) ContextGet(ctx context.Context, requestingAccount *gtsmodel.
 
 	for _, status := range parents {
 		if v, err := p.filter.StatusVisible(ctx, requestingAccount, status); err == nil && v {
-			apiStatus, err := p.tc.StatusToAPIStatus(ctx, status, requestingAccount)
+			apiStatus, err := p.converter.StatusToAPIStatus(ctx, status, requestingAccount)
 			if err == nil {
 				context.Ancestors = append(context.Ancestors, *apiStatus)
 			}
@@ -73,7 +73,7 @@ func (p *Processor) ContextGet(ctx context.Context, requestingAccount *gtsmodel.
 
 	for _, status := range children {
 		if v, err := p.filter.StatusVisible(ctx, requestingAccount, status); err == nil && v {
-			apiStatus, err := p.tc.StatusToAPIStatus(ctx, status, requestingAccount)
+			apiStatus, err := p.converter.StatusToAPIStatus(ctx, status, requestingAccount)
 			if err == nil {
 				context.Descendants = append(context.Descendants, *apiStatus)
 			}
diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go
index c34bff30f..bd8457eb8 100644
--- a/internal/processing/status/status.go
+++ b/internal/processing/status/status.go
@@ -29,18 +29,18 @@ import (
 type Processor struct {
 	state        *state.State
 	federator    federation.Federator
-	tc           typeutils.TypeConverter
+	converter    *typeutils.Converter
 	filter       *visibility.Filter
 	formatter    text.Formatter
 	parseMention gtsmodel.ParseMentionFunc
 }
 
 // New returns a new status processor.
-func New(state *state.State, federator federation.Federator, tc typeutils.TypeConverter, filter *visibility.Filter, parseMention gtsmodel.ParseMentionFunc) Processor {
+func New(state *state.State, federator federation.Federator, converter *typeutils.Converter, filter *visibility.Filter, parseMention gtsmodel.ParseMentionFunc) Processor {
 	return Processor{
 		state:        state,
 		federator:    federator,
-		tc:           tc,
+		converter:    converter,
 		filter:       filter,
 		formatter:    text.NewFormatter(state.DB),
 		parseMention: parseMention,
diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go
index a64143df4..1f73530cb 100644
--- a/internal/processing/status/status_test.go
+++ b/internal/processing/status/status_test.go
@@ -36,7 +36,7 @@ import (
 type StatusStandardTestSuite struct {
 	suite.Suite
 	db            db.DB
-	typeConverter typeutils.TypeConverter
+	typeConverter *typeutils.Converter
 	tc            transport.Controller
 	storage       *storage.Driver
 	state         state.State
@@ -78,7 +78,7 @@ func (suite *StatusStandardTestSuite) SetupTest() {
 	testrig.InitTestLog()
 
 	suite.db = testrig.NewTestDB(&suite.state)
-	suite.typeConverter = testrig.NewTestTypeConverter(suite.db)
+	suite.typeConverter = typeutils.NewConverter(&suite.state)
 	suite.state.DB = suite.db
 
 	suite.tc = testrig.NewTestTransportController(&suite.state, testrig.NewMockHTTPClient(nil, "../../../testrig/media"))
@@ -91,7 +91,7 @@ func (suite *StatusStandardTestSuite) SetupTest() {
 	testrig.StartTimelines(
 		&suite.state,
 		filter,
-		testrig.NewTestTypeConverter(suite.db),
+		suite.typeConverter,
 	)
 
 	suite.status = status.New(&suite.state, suite.federator, suite.typeConverter, filter, processing.GetParseMentionFunc(suite.db, suite.federator))