From 0fee68f5fedf9859ccc00ae8af208ee9c37f8623 Mon Sep 17 00:00:00 2001 From: tsmethurst Date: Sun, 17 Oct 2021 15:23:53 +0200 Subject: [PATCH] remove emailer from account processor again --- internal/processing/account/account.go | 5 +---- internal/processing/account/account_test.go | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/internal/processing/account/account.go b/internal/processing/account/account.go index e8715d188..e88cd3a94 100644 --- a/internal/processing/account/account.go +++ b/internal/processing/account/account.go @@ -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, } } diff --git a/internal/processing/account/account_test.go b/internal/processing/account/account_test.go index d4f60e850..e8ef9ca68 100644 --- a/internal/processing/account/account_test.go +++ b/internal/processing/account/account_test.go @@ -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") }