From 5397fe50dc15991a8f29b65b0830dbc913302483 Mon Sep 17 00:00:00 2001 From: Joseph Kavanagh Date: Tue, 14 Jan 2025 20:43:50 +0000 Subject: [PATCH] fix(notify): support 'fromName' in SMTP messages --- notify/shoutrrr/shoutrrr.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/notify/shoutrrr/shoutrrr.go b/notify/shoutrrr/shoutrrr.go index 2375ef97..202d6025 100644 --- a/notify/shoutrrr/shoutrrr.go +++ b/notify/shoutrrr/shoutrrr.go @@ -20,6 +20,7 @@ import ( "errors" "fmt" "math/rand" + net_url "net/url" "strings" "time" @@ -159,12 +160,14 @@ func (s *Shoutrrr) BuildURL() (url string) { login := s.GetURLField("password") login = s.GetURLField("username") + util.ValueUnlessDefault(login, ":"+login) port := s.GetURLField("port") - url = fmt.Sprintf("smtp://%s%s%s/?fromaddress=%s&toaddresses=%s", + fromName := s.GetParam("fromname") + url = fmt.Sprintf("smtp://%s%s%s/?fromaddress=%s&toaddresses=%s%s", util.ValueUnlessDefault(login, login+"@"), s.GetURLField("host"), util.ValueUnlessDefault(port, ":"+port), s.GetParam("fromaddress"), - s.GetParam("toaddresses")) + s.GetParam("toaddresses"), + util.ValueUnlessDefault(fromName, "&fromname="+net_url.QueryEscape(fromName))) case "gotify": // gotify://host:port/path/token port := s.GetURLField("port")