From 0884f89431cd26bcc9674b3b7ab628b090f5881e Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Tue, 7 Dec 2021 13:31:39 +0100
Subject: 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
---
 internal/federation/federator.go | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'internal/federation/federator.go')

diff --git a/internal/federation/federator.go b/internal/federation/federator.go
index 280375d7d..8ccae9427 100644
--- a/internal/federation/federator.go
+++ b/internal/federation/federator.go
@@ -24,7 +24,6 @@ import (
 
 	"github.com/superseriousbusiness/activity/pub"
 	"github.com/superseriousbusiness/gotosocial/internal/ap"
-	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db"
 	"github.com/superseriousbusiness/gotosocial/internal/federation/dereferencing"
 	"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb"
@@ -73,7 +72,6 @@ type Federator interface {
 }
 
 type federator struct {
-	config              *config.Config
 	db                  db.DB
 	federatingDB        federatingdb.DB
 	clock               pub.Clock
@@ -85,12 +83,11 @@ type federator struct {
 }
 
 // NewFederator returns a new federator
-func NewFederator(db db.DB, federatingDB federatingdb.DB, transportController transport.Controller, config *config.Config, typeConverter typeutils.TypeConverter, mediaHandler media.Handler) Federator {
-	dereferencer := dereferencing.NewDereferencer(config, db, typeConverter, transportController, mediaHandler)
+func NewFederator(db db.DB, federatingDB federatingdb.DB, transportController transport.Controller, typeConverter typeutils.TypeConverter, mediaHandler media.Handler) Federator {
+	dereferencer := dereferencing.NewDereferencer(db, typeConverter, transportController, mediaHandler)
 
 	clock := &Clock{}
 	f := &federator{
-		config:              config,
 		db:                  db,
 		federatingDB:        federatingDB,
 		clock:               &Clock{},
-- 
cgit v1.2.3