diff options
| author | 2021-12-07 13:31:39 +0100 | |
|---|---|---|
| committer | 2021-12-07 13:31:39 +0100 | |
| commit | 0884f89431cd26bcc9674b3b7ab628b090f5881e (patch) | |
| tree | cdd3b3f77f780a8b59d075dbcc3d4d013811e405 /internal/processing/status | |
| 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/status')
| -rw-r--r-- | internal/processing/status/create.go | 2 | ||||
| -rw-r--r-- | internal/processing/status/fave.go | 2 | ||||
| -rw-r--r-- | internal/processing/status/status.go | 7 | ||||
| -rw-r--r-- | internal/processing/status/status_test.go | 32 | ||||
| -rw-r--r-- | internal/processing/status/util_test.go | 30 | 
5 files changed, 33 insertions, 40 deletions
diff --git a/internal/processing/status/create.go b/internal/processing/status/create.go index 655be5b17..9bcb32b78 100644 --- a/internal/processing/status/create.go +++ b/internal/processing/status/create.go @@ -34,7 +34,7 @@ import (  )  func (p *processor) Create(ctx context.Context, account *gtsmodel.Account, application *gtsmodel.Application, form *apimodel.AdvancedStatusCreateForm) (*apimodel.Status, gtserror.WithCode) { -	uris := util.GenerateURIsForAccount(account.Username, p.config.Protocol, p.config.Host) +	uris := util.GenerateURIsForAccount(account.Username)  	thisStatusID, err := id.NewULID()  	if err != nil {  		return nil, gtserror.NewErrorInternalError(err) diff --git a/internal/processing/status/fave.go b/internal/processing/status/fave.go index 571e0715c..581caf055 100644 --- a/internal/processing/status/fave.go +++ b/internal/processing/status/fave.go @@ -76,7 +76,7 @@ func (p *processor) Fave(ctx context.Context, requestingAccount *gtsmodel.Accoun  			TargetAccount:   targetStatus.Account,  			StatusID:        targetStatus.ID,  			Status:          targetStatus, -			URI:             util.GenerateURIForLike(requestingAccount.Username, p.config.Protocol, p.config.Host, thisFaveID), +			URI:             util.GenerateURIForLike(requestingAccount.Username, thisFaveID),  		}  		if err := p.db.Put(ctx, gtsFave); err != nil { diff --git a/internal/processing/status/status.go b/internal/processing/status/status.go index 666c237b7..da0abd6f4 100644 --- a/internal/processing/status/status.go +++ b/internal/processing/status/status.go @@ -22,7 +22,6 @@ import (  	"context"  	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/gtserror"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" @@ -71,7 +70,6 @@ type Processor interface {  type processor struct {  	tc            typeutils.TypeConverter -	config        *config.Config  	db            db.DB  	filter        visibility.Filter  	formatter     text.Formatter @@ -79,13 +77,12 @@ type processor struct {  }  // New returns a new status processor. -func New(db db.DB, tc typeutils.TypeConverter, config *config.Config, fromClientAPI chan messages.FromClientAPI) Processor { +func New(db db.DB, tc typeutils.TypeConverter, fromClientAPI chan messages.FromClientAPI) Processor {  	return &processor{  		tc:            tc, -		config:        config,  		db:            db,  		filter:        visibility.NewFilter(db), -		formatter:     text.NewFormatter(config, db), +		formatter:     text.NewFormatter(db),  		fromClientAPI: fromClientAPI,  	}  } diff --git a/internal/processing/status/status_test.go b/internal/processing/status/status_test.go index c5c439057..2ed37bf2a 100644 --- a/internal/processing/status/status_test.go +++ b/internal/processing/status/status_test.go @@ -20,18 +20,16 @@ package status_test  import (  	"github.com/stretchr/testify/suite" -	"github.com/superseriousbusiness/gotosocial/internal/config"  	"github.com/superseriousbusiness/gotosocial/internal/db"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"  	"github.com/superseriousbusiness/gotosocial/internal/messages"  	"github.com/superseriousbusiness/gotosocial/internal/processing/status"  	"github.com/superseriousbusiness/gotosocial/internal/typeutils" +	"github.com/superseriousbusiness/gotosocial/testrig"  ) -// nolint  type StatusStandardTestSuite struct {  	suite.Suite -	config            *config.Config  	db                db.DB  	typeConverter     typeutils.TypeConverter  	fromClientAPIChan chan messages.FromClientAPI @@ -50,3 +48,31 @@ type StatusStandardTestSuite struct {  	// module being tested  	status status.Processor  } + +func (suite *StatusStandardTestSuite) SetupSuite() { +	suite.testTokens = testrig.NewTestTokens() +	suite.testClients = testrig.NewTestClients() +	suite.testApplications = testrig.NewTestApplications() +	suite.testUsers = testrig.NewTestUsers() +	suite.testAccounts = testrig.NewTestAccounts() +	suite.testAttachments = testrig.NewTestAttachments() +	suite.testStatuses = testrig.NewTestStatuses() +	suite.testTags = testrig.NewTestTags() +	suite.testMentions = testrig.NewTestMentions() +} + +func (suite *StatusStandardTestSuite) SetupTest() { +	testrig.InitTestLog() +	testrig.InitTestConfig() + +	suite.db = testrig.NewTestDB() +	suite.typeConverter = testrig.NewTestTypeConverter(suite.db) +	suite.fromClientAPIChan = make(chan messages.FromClientAPI, 100) +	suite.status = status.New(suite.db, suite.typeConverter, suite.fromClientAPIChan) + +	testrig.StandardDBSetup(suite.db, nil) +} + +func (suite *StatusStandardTestSuite) TearDownTest() { +	testrig.StandardDBTeardown(suite.db) +} diff --git a/internal/processing/status/util_test.go b/internal/processing/status/util_test.go index 37e2f2dfc..4ec66a4f7 100644 --- a/internal/processing/status/util_test.go +++ b/internal/processing/status/util_test.go @@ -27,9 +27,6 @@ import (  	"github.com/stretchr/testify/suite"  	"github.com/superseriousbusiness/gotosocial/internal/api/model"  	"github.com/superseriousbusiness/gotosocial/internal/gtsmodel" -	"github.com/superseriousbusiness/gotosocial/internal/messages" -	"github.com/superseriousbusiness/gotosocial/internal/processing/status" -	"github.com/superseriousbusiness/gotosocial/testrig"  )  const statusText1 = `Another test @foss_satan@fossbros-anonymous.io @@ -52,33 +49,6 @@ type UtilTestSuite struct {  	StatusStandardTestSuite  } -func (suite *UtilTestSuite) SetupSuite() { -	suite.testTokens = testrig.NewTestTokens() -	suite.testClients = testrig.NewTestClients() -	suite.testApplications = testrig.NewTestApplications() -	suite.testUsers = testrig.NewTestUsers() -	suite.testAccounts = testrig.NewTestAccounts() -	suite.testAttachments = testrig.NewTestAttachments() -	suite.testStatuses = testrig.NewTestStatuses() -	suite.testTags = testrig.NewTestTags() -	suite.testMentions = testrig.NewTestMentions() -} - -func (suite *UtilTestSuite) SetupTest() { -	suite.config = testrig.NewTestConfig() -	suite.db = testrig.NewTestDB() -	testrig.InitTestLog() -	suite.typeConverter = testrig.NewTestTypeConverter(suite.db) -	suite.fromClientAPIChan = make(chan messages.FromClientAPI, 100) -	suite.status = status.New(suite.db, suite.typeConverter, suite.config, suite.fromClientAPIChan) - -	testrig.StandardDBSetup(suite.db, nil) -} - -func (suite *UtilTestSuite) TearDownTest() { -	testrig.StandardDBTeardown(suite.db) -} -  func (suite *UtilTestSuite) TestProcessMentions1() {  	creatingAccount := suite.testAccounts["local_account_1"]  	mentionedAccount := suite.testAccounts["remote_account_1"]  | 
