From 86ad9b5a0000d0e319c212c4f2b1d54a45ef8625 Mon Sep 17 00:00:00 2001 From: Conrad Hoffmann Date: Thu, 30 Nov 2023 11:28:12 +0100 Subject: [PATCH] server/email: use go-message for address parsing No need to additionally depend on net/mail --- server/email.go | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/server/email.go b/server/email.go index 73faabd58c149ba89bcce989a2beb1ac8dcfd709..3b0579862c0e68124493cfeceef4592bf329fe53 100644 --- a/server/email.go +++ b/server/email.go @@ -7,7 +7,6 @@ import ( "fmt" "io" "log" - gomail "net/mail" "runtime/debug" "strings" @@ -58,13 +57,12 @@ func EmailRecover(ctx context.Context, _origErr interface{}) error { log.Println("Warning: mail::error-to is not set") return fmt.Errorf("internal system error") } - rcpt, err := gomail.ParseAddress(to) + rcpt, err := mail.ParseAddress(to) if err != nil { log.Printf("Warning: mail::error-to is invalid: %v", err) return fmt.Errorf("internal system error") } - addr := mail.Address(*rcpt) - header.SetAddressList("To", []*mail.Address{&addr}) + header.SetAddressList("To", []*mail.Address{rcpt}) var reader io.Reader func() {