[chore] move status filtering from type converter (#4306)

This finalizes the moving status filtering out of the type converter, and into its own `./internal/filter/` subpkg :)

Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4306
Co-authored-by: kim <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/internal/processing/processor.go b/internal/processing/processor.go
index c35c807e0..a5cea5da4 100644
--- a/internal/processing/processor.go
+++ b/internal/processing/processor.go
@@ -23,6 +23,7 @@ import (
 	"code.superseriousbusiness.org/gotosocial/internal/federation"
 	"code.superseriousbusiness.org/gotosocial/internal/filter/interaction"
 	"code.superseriousbusiness.org/gotosocial/internal/filter/mutes"
+	statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status"
 	"code.superseriousbusiness.org/gotosocial/internal/filter/visibility"
 	"code.superseriousbusiness.org/gotosocial/internal/gtsmodel"
 	mm "code.superseriousbusiness.org/gotosocial/internal/media"
@@ -193,7 +194,8 @@ func (p *Processor) Workers() *workers.Processor {
 	return &p.workers
 }
 
-// NewProcessor returns a new Processor.
+// NewProcessor returns
+// a new Processor.
 func NewProcessor(
 	cleaner *cleaner.Cleaner,
 	subscriptions *subscriptions.Subscriptions,
@@ -207,6 +209,7 @@ func NewProcessor(
 	visFilter *visibility.Filter,
 	muteFilter *mutes.Filter,
 	intFilter *interaction.Filter,
+	statusFilter *statusfilter.Filter,
 ) *Processor {
 	parseMentionFunc := GetParseMentionFunc(state, federator)
 	processor := &Processor{
@@ -221,18 +224,18 @@ func NewProcessor(
 	//
 	// Start with sub processors that will
 	// be required by the workers processor.
-	common := common.New(state, mediaManager, converter, federator, visFilter, muteFilter)
-	processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, parseMentionFunc)
+	common := common.New(state, mediaManager, converter, federator, visFilter, muteFilter, statusFilter)
+	processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, statusFilter, parseMentionFunc)
 	processor.media = media.New(&common, state, converter, federator, mediaManager, federator.TransportController())
 	processor.stream = stream.New(state, oauthServer)
 	filterCommon := filterCommon.New(state, &processor.stream)
 
 	// Instantiate the rest of the sub
 	// processors + pin them to this struct.
-	processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, parseMentionFunc)
+	processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, statusFilter, parseMentionFunc)
 	processor.admin = admin.New(&common, state, cleaner, subscriptions, federator, converter, mediaManager, federator.TransportController(), emailSender)
 	processor.application = application.New(state, converter)
-	processor.conversations = conversations.New(state, converter, visFilter, muteFilter)
+	processor.conversations = conversations.New(state, converter, visFilter, muteFilter, statusFilter)
 	processor.fedi = fedi.New(state, &common, converter, federator, visFilter)
 	processor.filtersv1 = filtersv1.New(state, converter, filterCommon)
 	processor.filtersv2 = filtersv2.New(state, converter, filterCommon)
@@ -243,7 +246,7 @@ func NewProcessor(
 	processor.push = push.New(state, converter)
 	processor.report = report.New(state, converter)
 	processor.tags = tags.New(state, converter)
-	processor.timeline = timeline.New(state, converter, visFilter, muteFilter)
+	processor.timeline = timeline.New(state, converter, visFilter, muteFilter, statusFilter)
 	processor.search = search.New(state, federator, converter, visFilter)
 	processor.status = status.New(state, &common, &processor.polls, &processor.interactionRequests, federator, converter, visFilter, intFilter, parseMentionFunc)
 	processor.user = user.New(state, converter, oauthServer, emailSender)
@@ -261,6 +264,7 @@ func NewProcessor(
 		converter,
 		visFilter,
 		muteFilter,
+		statusFilter,
 		emailSender,
 		webPushSender,
 		&processor.account,