From 3d77f81c7fed002c628db82d822cc46c56a57e64 Mon Sep 17 00:00:00 2001 From: Tobi Smethurst <31960611+tsmethurst@users.noreply.github.com> Date: Sun, 30 May 2021 13:12:00 +0200 Subject: Move a lot of stuff + tidy stuff (#37) Lots of renaming and moving stuff, some bug fixes, more lenient parsing of notifications and home timeline. --- testrig/actions.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'testrig/actions.go') diff --git a/testrig/actions.go b/testrig/actions.go index aa78799b8..f6d506c3c 100644 --- a/testrig/actions.go +++ b/testrig/actions.go @@ -29,7 +29,6 @@ import ( "syscall" "github.com/sirupsen/logrus" - "github.com/superseriousbusiness/gotosocial/internal/action" "github.com/superseriousbusiness/gotosocial/internal/api" "github.com/superseriousbusiness/gotosocial/internal/api/client/account" "github.com/superseriousbusiness/gotosocial/internal/api/client/admin" @@ -39,13 +38,14 @@ import ( mediaModule "github.com/superseriousbusiness/gotosocial/internal/api/client/media" "github.com/superseriousbusiness/gotosocial/internal/api/client/status" "github.com/superseriousbusiness/gotosocial/internal/api/security" + "github.com/superseriousbusiness/gotosocial/internal/cliactions" "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/federation" "github.com/superseriousbusiness/gotosocial/internal/gotosocial" ) // Run creates and starts a gotosocial testrig server -var Run action.GTSAction = func(ctx context.Context, _ *config.Config, log *logrus.Logger) error { +var Run cliactions.GTSAction = func(ctx context.Context, _ *config.Config, log *logrus.Logger) error { c := NewTestConfig() dbService := NewTestDB() federatingDB := NewTestFederatingDB(dbService) @@ -99,7 +99,7 @@ var Run action.GTSAction = func(ctx context.Context, _ *config.Config, log *logr } } - gts, err := gotosocial.New(dbService, router, federator, c) + gts, err := gotosocial.NewServer(dbService, router, federator, c) if err != nil { return fmt.Errorf("error creating gotosocial service: %s", err) } -- cgit v1.2.3