diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gotosocial/action/server/server.go | 12 | ||||
| -rw-r--r-- | cmd/gotosocial/action/testrig/testrig.go | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index d72df1d41..608a56a92 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -32,13 +32,14 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/api" apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" "github.com/superseriousbusiness/gotosocial/internal/cleaner" + "github.com/superseriousbusiness/gotosocial/internal/filter/spam" + "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/metrics" "github.com/superseriousbusiness/gotosocial/internal/middleware" tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/tracing" - "github.com/superseriousbusiness/gotosocial/internal/visibility" "go.uber.org/automaxprocs/maxprocs" "github.com/superseriousbusiness/gotosocial/internal/config" @@ -143,8 +144,9 @@ var Start action.GTSAction = func(ctx context.Context) error { mediaManager := media.NewManager(&state) oauthServer := oauth.New(ctx, dbService) typeConverter := typeutils.NewConverter(&state) - filter := visibility.NewFilter(&state) - federatingDB := federatingdb.New(&state, typeConverter, filter) + visFilter := visibility.NewFilter(&state) + spamFilter := spam.NewFilter(&state) + federatingDB := federatingdb.New(&state, typeConverter, visFilter, spamFilter) transportController := transport.NewController(&state, federatingDB, &federation.Clock{}, client) federator := federation.NewFederator(&state, federatingDB, transportController, typeConverter, mediaManager) @@ -168,7 +170,7 @@ var Start action.GTSAction = func(ctx context.Context) error { // Initialize timelines. state.Timelines.Home = timeline.NewManager( tlprocessor.HomeTimelineGrab(&state), - tlprocessor.HomeTimelineFilter(&state, filter), + tlprocessor.HomeTimelineFilter(&state, visFilter), tlprocessor.HomeTimelineStatusPrepare(&state, typeConverter), tlprocessor.SkipInsert(), ) @@ -178,7 +180,7 @@ var Start action.GTSAction = func(ctx context.Context) error { state.Timelines.List = timeline.NewManager( tlprocessor.ListTimelineGrab(&state), - tlprocessor.ListTimelineFilter(&state, filter), + tlprocessor.ListTimelineFilter(&state, visFilter), tlprocessor.ListTimelineStatusPrepare(&state, typeConverter), tlprocessor.SkipInsert(), ) diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go index 1220d6c23..3401734a0 100644 --- a/cmd/gotosocial/action/testrig/testrig.go +++ b/cmd/gotosocial/action/testrig/testrig.go @@ -34,6 +34,7 @@ import ( apiutil "github.com/superseriousbusiness/gotosocial/internal/api/util" "github.com/superseriousbusiness/gotosocial/internal/cleaner" "github.com/superseriousbusiness/gotosocial/internal/config" + "github.com/superseriousbusiness/gotosocial/internal/filter/visibility" "github.com/superseriousbusiness/gotosocial/internal/gotosocial" "github.com/superseriousbusiness/gotosocial/internal/gtserror" "github.com/superseriousbusiness/gotosocial/internal/language" @@ -47,7 +48,6 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/tracing" "github.com/superseriousbusiness/gotosocial/internal/typeutils" - "github.com/superseriousbusiness/gotosocial/internal/visibility" "github.com/superseriousbusiness/gotosocial/internal/web" "github.com/superseriousbusiness/gotosocial/testrig" ) |