diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gotosocial/action/server/server.go | 36 | ||||
| -rw-r--r-- | cmd/gotosocial/action/testrig/testrig.go | 36 |
2 files changed, 0 insertions, 72 deletions
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index 4caf44cad..6bc27a7c4 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -57,12 +57,10 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/observability" "github.com/superseriousbusiness/gotosocial/internal/oidc" "github.com/superseriousbusiness/gotosocial/internal/processing" - tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" "github.com/superseriousbusiness/gotosocial/internal/router" "github.com/superseriousbusiness/gotosocial/internal/state" gtsstorage "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/transport" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/web" @@ -139,20 +137,6 @@ var Start action.GTSAction = func(ctx context.Context) error { // Noop on unstarted workers. state.Workers.Stop() - if state.Timelines.Home != nil { - // Home timeline mgr was setup, ensure it gets stopped. - if err := state.Timelines.Home.Stop(); err != nil { - log.Errorf(ctx, "error stopping home timeline: %v", err) - } - } - - if state.Timelines.List != nil { - // List timeline mgr was setup, ensure it gets stopped. - if err := state.Timelines.List.Stop(); err != nil { - log.Errorf(ctx, "error stopping list timeline: %v", err) - } - } - if process != nil { const timeout = time.Minute @@ -323,26 +307,6 @@ var Start action.GTSAction = func(ctx context.Context) error { // Create a Web Push notification sender. webPushSender := webpush.NewSender(client, state, typeConverter) - // Initialize both home / list timelines. - state.Timelines.Home = timeline.NewManager( - tlprocessor.HomeTimelineGrab(state), - tlprocessor.HomeTimelineFilter(state, visFilter), - tlprocessor.HomeTimelineStatusPrepare(state, typeConverter), - tlprocessor.SkipInsert(), - ) - if err := state.Timelines.Home.Start(); err != nil { - return fmt.Errorf("error starting home timeline: %s", err) - } - state.Timelines.List = timeline.NewManager( - tlprocessor.ListTimelineGrab(state), - tlprocessor.ListTimelineFilter(state, visFilter), - tlprocessor.ListTimelineStatusPrepare(state, typeConverter), - tlprocessor.SkipInsert(), - ) - if err := state.Timelines.List.Start(); err != nil { - return fmt.Errorf("error starting list timeline: %s", err) - } - // Start the job scheduler // (this is required for cleaner). state.Workers.StartScheduler() diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go index c0c080e38..cca4ead22 100644 --- a/cmd/gotosocial/action/testrig/testrig.go +++ b/cmd/gotosocial/action/testrig/testrig.go @@ -42,12 +42,10 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/middleware" "github.com/superseriousbusiness/gotosocial/internal/observability" "github.com/superseriousbusiness/gotosocial/internal/oidc" - tlprocessor "github.com/superseriousbusiness/gotosocial/internal/processing/timeline" "github.com/superseriousbusiness/gotosocial/internal/router" "github.com/superseriousbusiness/gotosocial/internal/state" "github.com/superseriousbusiness/gotosocial/internal/storage" "github.com/superseriousbusiness/gotosocial/internal/subscriptions" - "github.com/superseriousbusiness/gotosocial/internal/timeline" "github.com/superseriousbusiness/gotosocial/internal/typeutils" "github.com/superseriousbusiness/gotosocial/internal/web" "github.com/superseriousbusiness/gotosocial/testrig" @@ -89,20 +87,6 @@ var Start action.GTSAction = func(ctx context.Context) error { // tasks from being executed. testrig.StopWorkers(state) - if state.Timelines.Home != nil { - // Home timeline mgr was setup, ensure it gets stopped. - if err := state.Timelines.Home.Stop(); err != nil { - log.Errorf(ctx, "error stopping home timeline: %v", err) - } - } - - if state.Timelines.List != nil { - // List timeline mgr was setup, ensure it gets stopped. - if err := state.Timelines.List.Stop(); err != nil { - log.Errorf(ctx, "error stopping list timeline: %v", err) - } - } - if state.Storage != nil { // If storage was created, ensure torn down. testrig.StandardStorageTeardown(state.Storage) @@ -172,26 +156,6 @@ var Start action.GTSAction = func(ctx context.Context) error { typeConverter := typeutils.NewConverter(state) filter := visibility.NewFilter(state) - // Initialize both home / list timelines. - state.Timelines.Home = timeline.NewManager( - tlprocessor.HomeTimelineGrab(state), - tlprocessor.HomeTimelineFilter(state, filter), - tlprocessor.HomeTimelineStatusPrepare(state, typeConverter), - tlprocessor.SkipInsert(), - ) - if err := state.Timelines.Home.Start(); err != nil { - return fmt.Errorf("error starting home timeline: %s", err) - } - state.Timelines.List = timeline.NewManager( - tlprocessor.ListTimelineGrab(state), - tlprocessor.ListTimelineFilter(state, filter), - tlprocessor.ListTimelineStatusPrepare(state, typeConverter), - tlprocessor.SkipInsert(), - ) - if err := state.Timelines.List.Start(); err != nil { - return fmt.Errorf("error starting list timeline: %s", err) - } - processor := testrig.NewTestProcessor(state, federator, emailSender, webPushSender, mediaManager) // Initialize workers. |