[chore] de-interface{} the federator and dereferencer structs (#2285)

* de-interface{} the federator and dereferencer structs

* fix broken type signatures

14 files changed, 19 insertions, 19 deletions

diff --git a/internal/processing/account/account.go b/internal/processing/account/account.go
index 06caffaec..ea6882271 100644
--- a/internal/processing/account/account.go
+++ b/internal/processing/account/account.go
@@ -42,7 +42,7 @@ type Processor struct {
 	oauthServer  oauth.Server
 	filter       *visibility.Filter
 	formatter    *text.Formatter
-	federator    federation.Federator
+	federator    *federation.Federator
 	parseMention gtsmodel.ParseMentionFunc
 }
 
@@ -53,7 +53,7 @@ func New(
 	converter *typeutils.Converter,
 	mediaManager *media.Manager,
 	oauthServer oauth.Server,
-	federator federation.Federator,
+	federator *federation.Federator,
 	filter *visibility.Filter,
 	parseMention gtsmodel.ParseMentionFunc,
 ) Processor {
diff --git a/internal/processing/account/account_test.go b/internal/processing/account/account_test.go
index a23d324f8..7f259815a 100644
--- a/internal/processing/account/account_test.go
+++ b/internal/processing/account/account_test.go
@@ -50,7 +50,7 @@ type AccountStandardTestSuite struct {
 	oauthServer         oauth.Server
 	fromClientAPIChan   chan messages.FromClientAPI
 	transportController transport.Controller
-	federator           federation.Federator
+	federator           *federation.Federator
 	emailSender         email.Sender
 	sentEmails          map[string]string
 
diff --git a/internal/processing/admin/admin_test.go b/internal/processing/admin/admin_test.go
index 689f33f46..a5a790763 100644
--- a/internal/processing/admin/admin_test.go
+++ b/internal/processing/admin/admin_test.go
@@ -47,7 +47,7 @@ type AdminStandardTestSuite struct {
 	oauthServer         oauth.Server
 	fromClientAPIChan   chan messages.FromClientAPI
 	transportController transport.Controller
-	federator           federation.Federator
+	federator           *federation.Federator
 	emailSender         email.Sender
 	sentEmails          map[string]string
 	processor           *processing.Processor
diff --git a/internal/processing/common/common.go b/internal/processing/common/common.go
index 28fadc2a6..5abf50674 100644
--- a/internal/processing/common/common.go
+++ b/internal/processing/common/common.go
@@ -30,7 +30,7 @@ import (
 type Processor struct {
 	state     *state.State
 	converter *typeutils.Converter
-	federator federation.Federator
+	federator *federation.Federator
 	filter    *visibility.Filter
 }
 
@@ -38,7 +38,7 @@ type Processor struct {
 func New(
 	state *state.State,
 	converter *typeutils.Converter,
-	federator federation.Federator,
+	federator *federation.Federator,
 	filter *visibility.Filter,
 ) Processor {
 	return Processor{
diff --git a/internal/processing/fedi/fedi.go b/internal/processing/fedi/fedi.go
index 9fbcebefc..11be26a3e 100644
--- a/internal/processing/fedi/fedi.go
+++ b/internal/processing/fedi/fedi.go
@@ -26,13 +26,13 @@ import (
 
 type Processor struct {
 	state     *state.State
-	federator federation.Federator
+	federator *federation.Federator
 	converter *typeutils.Converter
 	filter    *visibility.Filter
 }
 
 // New returns a new fedi processor.
-func New(state *state.State, converter *typeutils.Converter, federator federation.Federator, filter *visibility.Filter) Processor {
+func New(state *state.State, converter *typeutils.Converter, federator *federation.Federator, filter *visibility.Filter) Processor {
 	return Processor{
 		state:     state,
 		federator: federator,
diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index 92c7974c7..a24683e69 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -127,7 +127,7 @@ func (p *Processor) Workers() *workers.Processor {
 // NewProcessor returns a new Processor.
 func NewProcessor(
 	converter *typeutils.Converter,
-	federator federation.Federator,
+	federator *federation.Federator,
 	oauthServer oauth.Server,
 	mediaManager *mm.Manager,
 	state *state.State,
diff --git a/internal/processing/processor_test.go b/internal/processing/processor_test.go
index 15d943e86..63d2c31fe 100644
--- a/internal/processing/processor_test.go
+++ b/internal/processing/processor_test.go
@@ -47,7 +47,7 @@ type ProcessingStandardTestSuite struct {
 	typeconverter       *typeutils.Converter
 	httpClient          *testrig.MockHTTPClient
 	transportController transport.Controller
-	federator           federation.Federator
+	federator           *federation.Federator
 	oauthServer         oauth.Server
 	emailSender         email.Sender
 
diff --git a/internal/processing/search/search.go b/internal/processing/search/search.go
index a7b1d4ad3..5321cb89d 100644
--- a/internal/processing/search/search.go
+++ b/internal/processing/search/search.go
@@ -26,13 +26,13 @@ import (
 
 type Processor struct {
 	state     *state.State
-	federator federation.Federator
+	federator *federation.Federator
 	converter *typeutils.Converter
 	filter    *visibility.Filter
 }
 
 // New returns a new status processor.
-func New(state *state.State, federator federation.Federator, converter *typeutils.Converter, filter *visibility.Filter) Processor {
+func New(state *state.State, federator *federation.Federator, converter *typeutils.Converter, filter *visibility.Filter) Processor {
 	return Processor{
 		state:     state,
 		federator: federator,
diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go
index 432f945fc..28ea64542 100644
--- a/internal/processing/status/status.go
+++ b/internal/processing/status/status.go
@@ -28,7 +28,7 @@ import (
 
 type Processor struct {
 	state        *state.State
-	federator    federation.Federator
+	federator    *federation.Federator
 	converter    *typeutils.Converter
 	filter       *visibility.Filter
 	formatter    *text.Formatter
@@ -36,7 +36,7 @@ type Processor struct {
 }
 
 // New returns a new status processor.
-func New(state *state.State, federator federation.Federator, converter *typeutils.Converter, 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,
diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go
index 1f73530cb..0507df484 100644
--- a/internal/processing/status/status_test.go
+++ b/internal/processing/status/status_test.go
@@ -41,7 +41,7 @@ type StatusStandardTestSuite struct {
 	storage       *storage.Driver
 	state         state.State
 	mediaManager  *media.Manager
-	federator     federation.Federator
+	federator     *federation.Federator
 
 	// standard suite models
 	testTokens       map[string]*gtsmodel.Token
diff --git a/internal/processing/util.go b/internal/processing/util.go
index 7aefe64fc..1ce67c616 100644
--- a/internal/processing/util.go
+++ b/internal/processing/util.go
@@ -30,7 +30,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/util"
 )
 
-func GetParseMentionFunc(dbConn db.DB, federator federation.Federator) gtsmodel.ParseMentionFunc {
+func GetParseMentionFunc(dbConn db.DB, federator *federation.Federator) gtsmodel.ParseMentionFunc {
 	return func(ctx context.Context, targetAccount string, originAccountID string, statusID string) (*gtsmodel.Mention, error) {
 		// get the origin account first since we'll need it to create the mention
 		originAccount, err := dbConn.GetAccountByID(ctx, originAccountID)
diff --git a/internal/processing/workers/federate.go b/internal/processing/workers/federate.go
index a87a89fd2..80b01ca40 100644
--- a/internal/processing/workers/federate.go
+++ b/internal/processing/workers/federate.go
@@ -36,7 +36,7 @@ import (
 type federate struct {
 	// Embed federator to give access
 	// to send and retrieve functions.
-	federation.Federator
+	*federation.Federator
 	state     *state.State
 	converter *typeutils.Converter
 }
diff --git a/internal/processing/workers/workers.go b/internal/processing/workers/workers.go
index e512a36bf..02e2f3f5b 100644
--- a/internal/processing/workers/workers.go
+++ b/internal/processing/workers/workers.go
@@ -37,7 +37,7 @@ type Processor struct {
 
 func New(
 	state *state.State,
-	federator federation.Federator,
+	federator *federation.Federator,
 	converter *typeutils.Converter,
 	filter *visibility.Filter,
 	emailSender email.Sender,
diff --git a/internal/processing/workers/workers_test.go b/internal/processing/workers/workers_test.go
index 5a7e645d6..5712180f5 100644
--- a/internal/processing/workers/workers_test.go
+++ b/internal/processing/workers/workers_test.go
@@ -47,7 +47,7 @@ type WorkersTestSuite struct {
 	typeconverter       *typeutils.Converter
 	httpClient          *testrig.MockHTTPClient
 	transportController transport.Controller
-	federator           federation.Federator
+	federator           *federation.Federator
 	oauthServer         oauth.Server
 	emailSender         email.Sender