mirror of
https://github.com/superseriousbusiness/gotosocial
synced 2025-06-05 21:59:39 +02:00
[chore] de-interface{} the federator and dereferencer structs (#2285)
* de-interface{} the federator and dereferencer structs * fix broken type signatures
This commit is contained in:
@@ -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 {
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
@@ -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{
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
@@ -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
|
||||
|
||||
|
@@ -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,
|
||||
|
@@ -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,
|
||||
|
@@ -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
|
||||
|
@@ -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)
|
||||
|
@@ -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
|
||||
}
|
||||
|
@@ -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,
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user