diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2021-12-07 13:31:39 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2021-12-07 13:31:39 +0100 |
| commit | 0884f89431cd26bcc9674b3b7ab628b090f5881e (patch) | |
| tree | cdd3b3f77f780a8b59d075dbcc3d4d013811e405 /internal/processing/processor.go | |
| parent | Update dependencies (#333) (diff) | |
| download | gotosocial-0884f89431cd26bcc9674b3b7ab628b090f5881e.tar.xz | |
Implement Cobra CLI tooling, Viper config tooling (#336)
* start pulling out + replacing urfave and config
* replace many many instances of config
* move more stuff => viper
* properly remove urfave
* move some flags to root command
* add testrig commands to root
* alias config file keys
* start adding cli parsing tests
* reorder viper init
* remove config path alias
* fmt
* change config file keys to non-nested
* we're more or less in business now
* tidy up the common func
* go fmt
* get tests passing again
* add note about the cliparsing tests
* reorganize
* update docs with changes
* structure cmd dir better
* rename + move some files around
* fix dangling comma
Diffstat (limited to 'internal/processing/processor.go')
| -rw-r--r-- | internal/processing/processor.go | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/internal/processing/processor.go b/internal/processing/processor.go index a65ef23d9..ebfabb0de 100644 --- a/internal/processing/processor.go +++ b/internal/processing/processor.go @@ -26,7 +26,6 @@ import ( "codeberg.org/gruf/go-store/kv" "github.com/sirupsen/logrus" apimodel "github.com/superseriousbusiness/gotosocial/internal/api/model" - "github.com/superseriousbusiness/gotosocial/internal/config" "github.com/superseriousbusiness/gotosocial/internal/db" "github.com/superseriousbusiness/gotosocial/internal/email" "github.com/superseriousbusiness/gotosocial/internal/federation" @@ -234,7 +233,6 @@ type processor struct { fromFederator chan messages.FromFederator federator federation.Federator stop chan interface{} - config *config.Config tc typeutils.TypeConverter oauthServer oauth.Server mediaHandler media.Handler @@ -258,7 +256,6 @@ type processor struct { // NewProcessor returns a new Processor. func NewProcessor( - config *config.Config, tc typeutils.TypeConverter, federator federation.Federator, oauthServer oauth.Server, @@ -270,20 +267,19 @@ func NewProcessor( fromClientAPI := make(chan messages.FromClientAPI, 1000) fromFederator := make(chan messages.FromFederator, 1000) - statusProcessor := status.New(db, tc, config, fromClientAPI) + statusProcessor := status.New(db, tc, fromClientAPI) streamingProcessor := streaming.New(db, oauthServer) - accountProcessor := account.New(db, tc, mediaHandler, oauthServer, fromClientAPI, federator, config) - adminProcessor := admin.New(db, tc, mediaHandler, fromClientAPI, config) - mediaProcessor := mediaProcessor.New(db, tc, mediaHandler, storage, config) - userProcessor := user.New(db, emailSender, config) - federationProcessor := federationProcessor.New(db, tc, config, federator, fromFederator) + accountProcessor := account.New(db, tc, mediaHandler, oauthServer, fromClientAPI, federator) + adminProcessor := admin.New(db, tc, mediaHandler, fromClientAPI) + mediaProcessor := mediaProcessor.New(db, tc, mediaHandler, storage) + userProcessor := user.New(db, emailSender) + federationProcessor := federationProcessor.New(db, tc, federator, fromFederator) return &processor{ fromClientAPI: fromClientAPI, fromFederator: fromFederator, federator: federator, stop: make(chan interface{}), - config: config, tc: tc, oauthServer: oauthServer, mediaHandler: mediaHandler, |