mirrors/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-12-30 12:16:14 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove emailer from account processor again

Browse source
This commit is contained in:
tsmethurst 2021-10-17 15:23:53 +02:00
commit 0fee68f5fe
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
internal/processing/account/account.go
View file

@ -25,7 +25,6 @@ import (
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"
"github.com/superseriousbusiness/gotosocial/internal/gtserror"
"github.com/superseriousbusiness/gotosocial/internal/gtsmodel"
@ -87,11 +86,10 @@ type processor struct {
formatter text.Formatter
db db.DB
federator federation.Federator
emailSender email.Sender
}
// New returns a new account processor.
func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, oauthServer oauth.Server, fromClientAPI chan messages.FromClientAPI, federator federation.Federator, emailSender email.Sender, config *config.Config) Processor {
func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, oauthServer oauth.Server, fromClientAPI chan messages.FromClientAPI, federator federation.Federator, config *config.Config) Processor {
return &processor{
tc: tc,
config: config,
@ -102,6 +100,5 @@ func New(db db.DB, tc typeutils.TypeConverter, mediaHandler media.Handler, oauth
formatter: text.NewFormatter(config, db),
db: db,
federator: federator,
emailSender: emailSender,
}
}

2
internal/processing/account/account_test.go
View file

@ -87,7 +87,7 @@ func (suite *AccountStandardTestSuite) SetupTest() {
suite.transportController = testrig.NewTestTransportController(suite.httpClient, suite.db)
suite.federator = testrig.NewTestFederator(suite.db, suite.transportController, suite.storage)
suite.emailSender = testrig.NewEmailSender("../../../web/template/")
suite.accountProcessor = account.New(suite.db, suite.tc, suite.mediaHandler, suite.oauthServer, suite.fromClientAPIChan, suite.federator, suite.emailSender, suite.config)
suite.accountProcessor = account.New(suite.db, suite.tc, suite.mediaHandler, suite.oauthServer, suite.fromClientAPIChan, suite.federator, suite.config)
testrig.StandardDBSetup(suite.db, nil)
testrig.StandardStorageSetup(suite.storage, "../../../testrig/media")
}