2 files changed, 29 insertions, 6 deletions
diff --git a/internal/cliactions/server/server.go b/internal/cliactions/server/server.go
index 107d84d2c..3837952c7 100644
--- a/internal/cliactions/server/server.go
+++ b/internal/cliactions/server/server.go
@@ -36,6 +36,7 @@ import (
 	"github.com/superseriousbusiness/gotosocial/internal/cliactions"
 	"github.com/superseriousbusiness/gotosocial/internal/config"
 	"github.com/superseriousbusiness/gotosocial/internal/db/bundb"
+	"github.com/superseriousbusiness/gotosocial/internal/email"
 	"github.com/superseriousbusiness/gotosocial/internal/federation"
 	"github.com/superseriousbusiness/gotosocial/internal/federation/federatingdb"
 	"github.com/superseriousbusiness/gotosocial/internal/gotosocial"
@@ -76,22 +77,40 @@ var Start cliactions.GTSAction = func(ctx context.Context, c *config.Config) err
 		return fmt.Errorf("error creating router: %s", err)
 	}
 
+	// build converters and util
+	typeConverter := typeutils.NewConverter(c, dbService)
+	timelineManager := timelineprocessing.NewManager(dbService, typeConverter, c)
+
 	// Open the storage backend
 	storage, err := kv.OpenFile(c.StorageConfig.BasePath, nil)
 	if err != nil {
 		return fmt.Errorf("error creating storage backend: %s", err)
 	}
 
-	// build converters and util
-	typeConverter := typeutils.NewConverter(c, dbService)
-	timelineManager := timelineprocessing.NewManager(dbService, typeConverter, c)
-
 	// build backend handlers
 	mediaHandler := media.New(c, dbService, storage)
 	oauthServer := oauth.New(ctx, dbService)
 	transportController := transport.NewController(c, dbService, &federation.Clock{}, http.DefaultClient)
 	federator := federation.NewFederator(dbService, federatingDB, transportController, c, typeConverter, mediaHandler)
-	processor := processing.NewProcessor(c, typeConverter, federator, oauthServer, mediaHandler, storage, timelineManager, dbService)
+
+	// decide whether to create a noop email sender (won't send emails) or a real one
+	var emailSender email.Sender
+	if c.SMTPConfig.Host != "" {
+		// host is defined so create a proper sender
+		emailSender, err = email.NewSender(c)
+		if err != nil {
+			return fmt.Errorf("error creating email sender: %s", err)
+		}
+	} else {
+		// no host is defined so create a noop sender
+		emailSender, err = email.NewNoopSender(c.TemplateConfig.BaseDir, nil)
+		if err != nil {
+			return fmt.Errorf("error creating noop email sender: %s", err)
+		}
+	}
+
+	// create and start the message processor using the other services we've created so far
+	processor := processing.NewProcessor(c, typeConverter, federator, oauthServer, mediaHandler, storage, timelineManager, dbService, emailSender)
 	if err := processor.Start(ctx); err != nil {
 		return fmt.Errorf("error starting processor: %s", err)
 	}
diff --git a/internal/cliactions/testrig/testrig.go b/internal/cliactions/testrig/testrig.go
index 2993d8613..2cdbfaf52 100644
--- a/internal/cliactions/testrig/testrig.go
+++ b/internal/cliactions/testrig/testrig.go
@@ -44,6 +44,8 @@ import (
 
 // Start creates and starts a gotosocial testrig server
 var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config) error {
+	testrig.InitTestLog()
+
 	c := testrig.NewTestConfig()
 	dbService := testrig.NewTestDB()
 	testrig.StandardDBSetup(dbService, nil)
@@ -62,7 +64,9 @@ var Start cliactions.GTSAction = func(ctx context.Context, _ *config.Config) err
 	}), dbService)
 	federator := testrig.NewTestFederator(dbService, transportController, storageBackend)
 
-	processor := testrig.NewTestProcessor(dbService, storageBackend, federator)
+	emailSender := testrig.NewEmailSender("./web/template/", nil)
+
+	processor := testrig.NewTestProcessor(dbService, storageBackend, federator, emailSender)
 	if err := processor.Start(ctx); err != nil {
 		return fmt.Errorf("error starting processor: %s", err)
 	}