From e65b73dc732f433c6c30ae7b81c5f675c6fbce67 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Giraudeau <jb@giraudeau.info>
Date: Wed, 4 Dec 2024 11:13:04 +0100
Subject: [PATCH] app.go: Use cfg.Email.Enabled() to check for email config

 before starting publishJobsQueue.

 Also fix Email.Enabled to handle smtp config.
---
 app.go           | 14 +++++---------
 config/config.go |  3 ++-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app.go b/app.go
index 7630254..932fdca 100644
--- a/app.go
+++ b/app.go
@@ -428,15 +428,11 @@ func Initialize(apper Apper, debug bool) (*App, error) {
 
 	initActivityPub(apper.App())
 
-	if apper.App().cfg.Email.Domain != "" || apper.App().cfg.Email.MailgunPrivate != "" {
-		if apper.App().cfg.Email.Domain == "" {
-			log.Error("[FAILED] Starting publish jobs queue: no [letters]domain config value set.")
-		} else if apper.App().cfg.Email.MailgunPrivate == "" {
-			log.Error("[FAILED] Starting publish jobs queue: no [letters]mailgun_private config value set.")
-		} else {
-			log.Info("Starting publish jobs queue...")
-			go startPublishJobsQueue(apper.App())
-		}
+	if apper.App().cfg.Email.Enabled() {
+		log.Info("Starting publish jobs queue...")
+		go startPublishJobsQueue(apper.App())
+	} else {
+		log.Error("[FAILED] Starting publish jobs queue: no email provider is configured.")
 	}
 
 	// Handle local timeline, if enabled
diff --git a/config/config.go b/config/config.go
index 8a79224..5f084a1 100644
--- a/config/config.go
+++ b/config/config.go
@@ -251,7 +251,8 @@ func (ac *AppCfg) LandingPath() string {
 }
 
 func (lc EmailCfg) Enabled() bool {
-	return lc.Domain != "" && lc.MailgunPrivate != ""
+	return (lc.Domain != "" && lc.MailgunPrivate != "") ||
+	lc.Username != "" && lc.Password != "" && lc.Host != "" && lc.Port > 0
 }
 
 func (ac AppCfg) SignupPath() string {