diff options
| author |  kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> | 2023-09-23 17:44:11 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-09-23 18:44:11 +0200 |
| commit | 8f67dd583d86155440e7905ae23083a9fea42f72 (patch) | |
| tree | e67abf09a53c2d9053df8072b074a026969d93ef /cmd | |
| parent | [chore] fix typo in slice.go (#2219) (diff) | |
| download | gotosocial-8f67dd583d86155440e7905ae23083a9fea42f72.tar.xz | |
[chore] deinterface the typeutils.Converter and update to use state structure (#2217)
* update typeconverter to use state structure
* deinterface the typeutils.TypeConverter -> typeutils.Converter
* finish copying over old type converter code comments
* fix cherry-pick merge issues, fix tests pointing to old typeutils interface type still
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gotosocial/action/server/server.go | 2 | ||||
| -rw-r--r-- | cmd/gotosocial/action/testrig/testrig.go | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cmd/gotosocial/action/server/server.go b/cmd/gotosocial/action/server/server.go index 8de44c4f0..2e32ec657 100644 --- a/cmd/gotosocial/action/server/server.go +++ b/cmd/gotosocial/action/server/server.go @@ -129,7 +129,7 @@ var Start action.GTSAction = func(ctx context.Context) error { // Build handlers used in later initializations. mediaManager := media.NewManager(&state) oauthServer := oauth.New(ctx, dbService) - typeConverter := typeutils.NewConverter(dbService) + typeConverter := typeutils.NewConverter(&state) filter := visibility.NewFilter(&state) federatingDB := federatingdb.New(&state, typeConverter) transportController := transport.NewController(&state, federatingDB, &federation.Clock{}, client) diff --git a/cmd/gotosocial/action/testrig/testrig.go b/cmd/gotosocial/action/testrig/testrig.go index ccf92a971..288c5975d 100644 --- a/cmd/gotosocial/action/testrig/testrig.go +++ b/cmd/gotosocial/action/testrig/testrig.go @@ -43,6 +43,7 @@ import ( "github.com/superseriousbusiness/gotosocial/internal/storage" "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" @@ -96,7 +97,7 @@ var Start action.GTSAction = func(ctx context.Context) error { federator := testrig.NewTestFederator(&state, transportController, mediaManager) emailSender := testrig.NewEmailSender("./web/template/", nil) - typeConverter := testrig.NewTestTypeConverter(state.DB) + typeConverter := typeutils.NewConverter(&state) filter := visibility.NewFilter(&state) // Initialize timelines. |