[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, 22 insertions, 25 deletions

diff --git a/internal/processing/admin/admin.go b/internal/processing/admin/admin.go
index 7353c0da8..51429c11c 100644
--- a/internal/processing/admin/admin.go
+++ b/internal/processing/admin/admin.go
@@ -30,7 +30,7 @@ import (
 type Processor struct {
 	state               *state.State
 	cleaner             *cleaner.Cleaner
-	tc                  typeutils.TypeConverter
+	converter           *typeutils.Converter
 	mediaManager        *media.Manager
 	transportController transport.Controller
 	emailSender         email.Sender
@@ -45,11 +45,11 @@ func (p *Processor) Actions() *Actions {
 }
 
 // New returns a new admin processor.
-func New(state *state.State, tc typeutils.TypeConverter, mediaManager *media.Manager, transportController transport.Controller, emailSender email.Sender) Processor {
+func New(state *state.State, converter *typeutils.Converter, mediaManager *media.Manager, transportController transport.Controller, emailSender email.Sender) Processor {
 	return Processor{
 		state:               state,
 		cleaner:             cleaner.New(state),
-		tc:                  tc,
+		converter:           converter,
 		mediaManager:        mediaManager,
 		transportController: transportController,
 		emailSender:         emailSender,
diff --git a/internal/processing/admin/admin_test.go b/internal/processing/admin/admin_test.go
index c1c4d46c2..689f33f46 100644
--- a/internal/processing/admin/admin_test.go
+++ b/internal/processing/admin/admin_test.go
@@ -40,7 +40,7 @@ type AdminStandardTestSuite struct {
 	// standard suite interfaces
 	suite.Suite
 	db                  db.DB
-	tc                  typeutils.TypeConverter
+	tc                  *typeutils.Converter
 	storage             *storage.Driver
 	state               state.State
 	mediaManager        *media.Manager
@@ -86,7 +86,7 @@ func (suite *AdminStandardTestSuite) SetupTest() {
 
 	suite.db = testrig.NewTestDB(&suite.state)
 	suite.state.DB = suite.db
-	suite.tc = testrig.NewTestTypeConverter(suite.db)
+	suite.tc = typeutils.NewConverter(&suite.state)
 
 	testrig.StartTimelines(
 		&suite.state,
diff --git a/internal/processing/admin/domainpermission.go b/internal/processing/admin/domainpermission.go
index c759c0f11..bedaf6a11 100644
--- a/internal/processing/admin/domainpermission.go
+++ b/internal/processing/admin/domainpermission.go
@@ -40,7 +40,7 @@ func (p *Processor) apiDomainPerm(
 	domainPermission gtsmodel.DomainPermission,
 	export bool,
 ) (*apimodel.DomainPermission, gtserror.WithCode) {
-	apiDomainPerm, err := p.tc.DomainPermToAPIDomainPerm(ctx, domainPermission, export)
+	apiDomainPerm, err := p.converter.DomainPermToAPIDomainPerm(ctx, domainPermission, export)
 	if err != nil {
 		err := gtserror.NewfAt(3, "error converting domain permission to api model: %w", err)
 		return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/admin/emoji.go b/internal/processing/admin/emoji.go
index 96b0bef07..568c4350b 100644
--- a/internal/processing/admin/emoji.go
+++ b/internal/processing/admin/emoji.go
@@ -84,7 +84,7 @@ func (p *Processor) EmojiCreate(ctx context.Context, account *gtsmodel.Account,
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("error loading emoji: %s", err), "error loading emoji")
 	}
 
-	apiEmoji, err := p.tc.EmojiToAPIEmoji(ctx, emoji)
+	apiEmoji, err := p.converter.EmojiToAPIEmoji(ctx, emoji)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting emoji: %s", err), "error converting emoji to api representation")
 	}
@@ -122,7 +122,7 @@ func (p *Processor) EmojisGet(
 
 	items := make([]interface{}, 0, count)
 	for _, emoji := range emojis {
-		adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji)
+		adminEmoji, err := p.converter.EmojiToAdminAPIEmoji(ctx, emoji)
 		if err != nil {
 			err := fmt.Errorf("EmojisGet: error converting emoji to admin model emoji: %s", err)
 			return nil, gtserror.NewErrorInternalError(err)
@@ -185,7 +185,7 @@ func (p *Processor) EmojiGet(ctx context.Context, account *gtsmodel.Account, use
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji)
+	adminEmoji, err := p.converter.EmojiToAdminAPIEmoji(ctx, emoji)
 	if err != nil {
 		err = fmt.Errorf("EmojiGet: error converting emoji to admin api emoji: %s", err)
 		return nil, gtserror.NewErrorInternalError(err)
@@ -211,7 +211,7 @@ func (p *Processor) EmojiDelete(ctx context.Context, id string) (*apimodel.Admin
 		return nil, gtserror.NewErrorBadRequest(err, err.Error())
 	}
 
-	adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji)
+	adminEmoji, err := p.converter.EmojiToAdminAPIEmoji(ctx, emoji)
 	if err != nil {
 		err = fmt.Errorf("EmojiDelete: error converting emoji to admin api emoji: %s", err)
 		return nil, gtserror.NewErrorInternalError(err)
@@ -260,7 +260,7 @@ func (p *Processor) EmojiCategoriesGet(ctx context.Context) ([]*apimodel.EmojiCa
 
 	apiCategories := make([]*apimodel.EmojiCategory, 0, len(categories))
 	for _, category := range categories {
-		apiCategory, err := p.tc.EmojiCategoryToAPIEmojiCategory(ctx, category)
+		apiCategory, err := p.converter.EmojiCategoryToAPIEmojiCategory(ctx, category)
 		if err != nil {
 			err := fmt.Errorf("EmojiCategoriesGet: error converting emoji category to api emoji category: %s", err)
 			return nil, gtserror.NewErrorInternalError(err)
@@ -367,7 +367,7 @@ func (p *Processor) emojiUpdateCopy(ctx context.Context, emoji *gtsmodel.Emoji,
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, newEmoji)
+	adminEmoji, err := p.converter.EmojiToAdminAPIEmoji(ctx, newEmoji)
 	if err != nil {
 		err = fmt.Errorf("emojiUpdateCopy: error converting updated emoji %s to admin emoji: %s", emoji.ID, err)
 		return nil, gtserror.NewErrorInternalError(err)
@@ -391,7 +391,7 @@ func (p *Processor) emojiUpdateDisable(ctx context.Context, emoji *gtsmodel.Emoj
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji)
+	adminEmoji, err := p.converter.EmojiToAdminAPIEmoji(ctx, emoji)
 	if err != nil {
 		err = fmt.Errorf("emojiUpdateDisable: error converting updated emoji %s to admin emoji: %s", emoji.ID, err)
 		return nil, gtserror.NewErrorInternalError(err)
@@ -472,7 +472,7 @@ func (p *Processor) emojiUpdateModify(ctx context.Context, emoji *gtsmodel.Emoji
 		}
 	}
 
-	adminEmoji, err := p.tc.EmojiToAdminAPIEmoji(ctx, emoji)
+	adminEmoji, err := p.converter.EmojiToAdminAPIEmoji(ctx, emoji)
 	if err != nil {
 		err = fmt.Errorf("emojiUpdateModify: error converting updated emoji %s to admin emoji: %s", emoji.ID, err)
 		return nil, gtserror.NewErrorInternalError(err)
diff --git a/internal/processing/admin/report.go b/internal/processing/admin/report.go
index e99cc2ec0..0f47cf839 100644
--- a/internal/processing/admin/report.go
+++ b/internal/processing/admin/report.go
@@ -58,7 +58,7 @@ func (p *Processor) ReportsGet(
 	prevMinIDValue := reports[0].ID
 
 	for _, r := range reports {
-		item, err := p.tc.ReportToAdminAPIReport(ctx, r, account)
+		item, err := p.converter.ReportToAdminAPIReport(ctx, r, account)
 		if err != nil {
 			return nil, gtserror.NewErrorInternalError(fmt.Errorf("error converting report to api: %s", err))
 		}
@@ -96,7 +96,7 @@ func (p *Processor) ReportGet(ctx context.Context, account *gtsmodel.Account, id
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	apimodelReport, err := p.tc.ReportToAdminAPIReport(ctx, report, account)
+	apimodelReport, err := p.converter.ReportToAdminAPIReport(ctx, report, account)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
@@ -144,7 +144,7 @@ func (p *Processor) ReportResolve(ctx context.Context, account *gtsmodel.Account
 		TargetAccount:  report.Account,
 	})
 
-	apimodelReport, err := p.tc.ReportToAdminAPIReport(ctx, updatedReport, account)
+	apimodelReport, err := p.converter.ReportToAdminAPIReport(ctx, updatedReport, account)
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
diff --git a/internal/processing/admin/rule.go b/internal/processing/admin/rule.go
index 40a2bdcf3..d1ee63cc8 100644
--- a/internal/processing/admin/rule.go
+++ b/internal/processing/admin/rule.go
@@ -35,7 +35,6 @@ func (p *Processor) RulesGet(
 	ctx context.Context,
 ) ([]*apimodel.AdminInstanceRule, gtserror.WithCode) {
 	rules, err := p.state.DB.GetActiveRules(ctx)
-
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
@@ -43,7 +42,7 @@ func (p *Processor) RulesGet(
 	apiRules := make([]*apimodel.AdminInstanceRule, len(rules))
 
 	for i := range rules {
-		apiRules[i] = p.tc.InstanceRuleToAdminAPIRule(&rules[i])
+		apiRules[i] = p.converter.InstanceRuleToAdminAPIRule(&rules[i])
 	}
 
 	return apiRules, nil
@@ -59,7 +58,7 @@ func (p *Processor) RuleGet(ctx context.Context, id string) (*apimodel.AdminInst
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	return p.tc.InstanceRuleToAdminAPIRule(rule), nil
+	return p.converter.InstanceRuleToAdminAPIRule(rule), nil
 }
 
 // RuleCreate adds a new rule to the instance.
@@ -78,7 +77,7 @@ func (p *Processor) RuleCreate(ctx context.Context, form *apimodel.InstanceRuleC
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	return p.tc.InstanceRuleToAdminAPIRule(rule), nil
+	return p.converter.InstanceRuleToAdminAPIRule(rule), nil
 }
 
 // RuleUpdate updates text for an existing rule.
@@ -96,12 +95,11 @@ func (p *Processor) RuleUpdate(ctx context.Context, id string, form *apimodel.In
 	rule.Text = form.Text
 
 	updatedRule, err := p.state.DB.UpdateRule(ctx, rule)
-
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	return p.tc.InstanceRuleToAdminAPIRule(updatedRule), nil
+	return p.converter.InstanceRuleToAdminAPIRule(updatedRule), nil
 }
 
 // RuleDelete deletes an existing rule.
@@ -118,10 +116,9 @@ func (p *Processor) RuleDelete(ctx context.Context, id string) (*apimodel.AdminI
 
 	rule.Deleted = util.Ptr(true)
 	deletedRule, err := p.state.DB.UpdateRule(ctx, rule)
-
 	if err != nil {
 		return nil, gtserror.NewErrorInternalError(err)
 	}
 
-	return p.tc.InstanceRuleToAdminAPIRule(deletedRule), nil
+	return p.converter.InstanceRuleToAdminAPIRule(deletedRule), nil
 }