go.mod

@@ -66,7 +66,7 @@ require (
 	github.com/tkuchiki/go-timezone v0.2.3
 	github.com/typesense/typesense-go v1.1.0
 	github.com/ulule/limiter/v3 v3.11.2
-	github.com/wneessen/go-mail v0.4.0
+	github.com/wneessen/go-mail v0.4.1
 	github.com/yuin/goldmark v1.7.2
 	golang.org/x/crypto v0.24.0
 	golang.org/x/image v0.17.0

go.sum

@@ -568,6 +568,8 @@ github.com/valyala/fasttemplate v1.2.2 h1:lxLXG0uE3Qnshl9QyaK6XJxMXlQZELvChBOCmQ
 github.com/valyala/fasttemplate v1.2.2/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
 github.com/wneessen/go-mail v0.4.0 h1:Oo4HLIV8My7G9JuZkoOX6eipXQD+ACvIqURYeIzUc88=
 github.com/wneessen/go-mail v0.4.0/go.mod h1:zxOlafWCP/r6FEhAaRgH4IC1vg2YXxO0Nar9u0IScZ8=
+github.com/wneessen/go-mail v0.4.1 h1:m2rSg/sc8FZQCdtrV5M8ymHYOFrC6KJAQAIcgrXvqoo=
+github.com/wneessen/go-mail v0.4.1/go.mod h1:zxOlafWCP/r6FEhAaRgH4IC1vg2YXxO0Nar9u0IScZ8=
 github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI=
 github.com/xdg-go/scram v1.1.1/go.mod h1:RaEWvsqvNKKvBPvcKeFjrG2cJqOkHTiyTpzz23ni57g=
 github.com/xdg-go/stringprep v1.0.3/go.mod h1:W3f5j4i+9rC0kuIEJL0ky1VpHXQU3ocBgklLGvcBnW8=

pkg/log/mail_logger.go

@@ -21,19 +21,19 @@ import (
 	"time"
 
 	"github.com/op/go-logging"
-	"xorm.io/xorm/log"
+	"github.com/wneessen/go-mail/log"
 )
 
 type MailLogger struct {
 	logger *logging.Logger
-	level  log.LogLevel
+	level  log.Level
 }
 
 const mailFormat = `%{color}%{time:` + time.RFC3339Nano + `}: %{level}` + "\t" + `▶ [MAIL] %{id:03x}%{color:reset} %{message}`
 const mailLogModule = `vikunja_mail`
 
 // NewMailLogger creates and initializes a new mail logger
-func NewMailLogger(configLogEnabled bool, configLogMail string, configLogMailLevel string) *MailLogger {
+func NewMailLogger(configLogEnabled bool, configLogMail string, configLogMailLevel string) log.Logger {
 	lvl := strings.ToUpper(configLogMailLevel)
 	level, err := logging.LogLevel(lvl)
 	if err != nil {
@@ -59,33 +59,33 @@ func NewMailLogger(configLogEnabled bool, configLogMail string, configLogMailLev
 	switch level {
 	case logging.CRITICAL:
 	case logging.ERROR:
-		mailLogger.level = log.LOG_ERR
+		mailLogger.level = log.LevelError
 	case logging.WARNING:
-		mailLogger.level = log.LOG_WARNING
+		mailLogger.level = log.LevelWarn
 	case logging.NOTICE:
 	case logging.INFO:
-		mailLogger.level = log.LOG_INFO
+		mailLogger.level = log.LevelInfo
 	case logging.DEBUG:
-		mailLogger.level = log.LOG_DEBUG
+		mailLogger.level = log.LevelDebug
 	default:
-		mailLogger.level = log.LOG_OFF
+		mailLogger.level = 0
 	}
 
 	return mailLogger
 }
 
-func (m *MailLogger) Errorf(format string, v ...interface{}) {
+func (m *MailLogger) Debugf(l log.Log) {
-	m.logger.Errorf(format, v...)
+	m.logger.Debugf(l.Format, l.Messages...)
 }
 
-func (m *MailLogger) Warnf(format string, v ...interface{}) {
+func (m *MailLogger) Infof(l log.Log) {
-	m.logger.Warningf(format, v...)
+	m.logger.Infof(l.Format, l.Messages...)
 }
 
-func (m *MailLogger) Infof(format string, v ...interface{}) {
+func (m *MailLogger) Warnf(l log.Log) {
-	m.logger.Infof(format, v...)
+	m.logger.Warningf(l.Format, l.Messages...)
 }
 
-func (m *MailLogger) Debugf(format string, v ...interface{}) {
+func (m *MailLogger) Errorf(l log.Log) {
-	m.logger.Debugf(format, v...)
+	m.logger.Errorf(l.Format, l.Messages...)
 }

pkg/mail/mail.go

@@ -49,7 +49,7 @@ func getClient() (*mail.Client, error) {
 
 	opts := []mail.Option{
 		mail.WithPort(config.MailerPort.GetInt()),
-		mail.WithTLSPolicy(tlsPolicy),
+		mail.WithTLSPortPolicy(tlsPolicy),
 		mail.WithTLSConfig(&tls.Config{
 			//#nosec G402
 			InsecureSkipVerify: config.MailerSkipTLSVerify.GetBool(),
@@ -61,7 +61,7 @@ func getClient() (*mail.Client, error) {
 	}
 
 	if config.MailerForceSSL.GetBool() {
-		opts = append(opts, mail.WithSSL())
+		opts = append(opts, mail.WithSSLPort(true))
 	}
 
 	if config.MailerUsername.GetString() != "" && config.MailerPassword.GetString() != "" {

pkg/mail/send_mail.go

@@ -89,7 +89,10 @@ func getMessage(opts *Opts) *mail.Msg {
 	}
 
 	for name, content := range opts.Embeds {
-		m.EmbedReader(name, content)
+		err := m.EmbedReader(name, content)
+		if err != nil {
+			log.Errorf("Could not create reader to embet into mail: %s", err)
+		}
 	}
 
 	for name, fs := range opts.EmbedFS {