diff options
Diffstat (limited to 'internal/processing/processor.go')
| -rw-r--r-- | internal/processing/processor.go | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/internal/processing/processor.go b/internal/processing/processor.go index a07df76e1..5afcf0721 100644 --- a/internal/processing/processor.go +++ b/internal/processing/processor.go @@ -21,6 +21,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/cleaner" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" + "github.com/superseriousbusiness/gotosocial/internal/filter/interaction" "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" mm "github.com/superseriousbusiness/gotosocial/internal/media" @@ -173,11 +174,10 @@ func NewProcessor( mediaManager *mm.Manager, state *state.State, emailSender email.Sender, + visFilter *visibility.Filter, + intFilter *interaction.Filter, ) *Processor { - var ( - parseMentionFunc = GetParseMentionFunc(state, federator) - filter = visibility.NewFilter(state) - ) + var parseMentionFunc = GetParseMentionFunc(state, federator) processor := &Processor{ converter: converter, @@ -191,26 +191,26 @@ func NewProcessor( // // Start with sub processors that will // be required by the workers processor. - common := common.New(state, mediaManager, converter, federator, filter) - processor.account = account.New(&common, state, converter, mediaManager, federator, filter, parseMentionFunc) + common := common.New(state, mediaManager, converter, federator, visFilter) + processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, parseMentionFunc) processor.media = media.New(&common, state, converter, federator, mediaManager, federator.TransportController()) processor.stream = stream.New(state, oauthServer) // Instantiate the rest of the sub // processors + pin them to this struct. - processor.account = account.New(&common, state, converter, mediaManager, federator, filter, parseMentionFunc) + processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, parseMentionFunc) processor.admin = admin.New(&common, state, cleaner, federator, converter, mediaManager, federator.TransportController(), emailSender) - processor.conversations = conversations.New(state, converter, filter) - processor.fedi = fedi.New(state, &common, converter, federator, filter) + processor.conversations = conversations.New(state, converter, visFilter) + processor.fedi = fedi.New(state, &common, converter, federator, visFilter) processor.filtersv1 = filtersv1.New(state, converter, &processor.stream) processor.filtersv2 = filtersv2.New(state, converter, &processor.stream) processor.list = list.New(state, converter) processor.markers = markers.New(state, converter) processor.polls = polls.New(&common, state, converter) processor.report = report.New(state, converter) - processor.timeline = timeline.New(state, converter, filter) - processor.search = search.New(state, federator, converter, filter) - processor.status = status.New(state, &common, &processor.polls, federator, converter, filter, parseMentionFunc) + processor.timeline = timeline.New(state, converter, visFilter) + processor.search = search.New(state, federator, converter, visFilter) + processor.status = status.New(state, &common, &processor.polls, federator, converter, visFilter, intFilter, parseMentionFunc) processor.user = user.New(state, converter, oauthServer, emailSender) // The advanced migrations processor sequences advanced migrations from all other processors. @@ -223,7 +223,7 @@ func NewProcessor( state, federator, converter, - filter, + visFilter, emailSender, &processor.account, &processor.media, |