astra/ntfy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

allow publishing of text/html emails

Browse source
This commit is contained in:
Philipp Born 2023-02-20 10:07:11 +01:00
parent 5f75e98861
commit 893360da28
No known key found for this signature in database
GPG key ID: 8F5874E00662B261
4 changed files with 89 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
server/smtp_server.go
View file

@ -6,6 +6,7 @@ import (
"errors"
"fmt"
"github.com/emersion/go-smtp"
"github.com/k3a/html2text"
"io"
"mime"
"mime/multipart"
@ -218,6 +219,8 @@ func readMailBody(body io.Reader, header mail.Header) (string, error) {
}
if strings.ToLower(contentType) == "text/plain" {
return readPlainTextMailBody(body, header.Get("Content-Transfer-Encoding"))
} else if strings.ToLower(contentType) == "text/html" {
return readHTMLMailBody(body, header.Get("Content-Transfer-Encoding"))
} else if strings.HasPrefix(strings.ToLower(contentType), "multipart/") {
return readMultipartMailBody(body, params, 0)
}
@ -257,3 +260,15 @@ func readPlainTextMailBody(reader io.Reader, transferEncoding string) (string, e
}
return string(body), nil
}
func readHTMLMailBody(reader io.Reader, transferEncoding string) (string, error) {
if strings.ToLower(transferEncoding) == "base64" {
reader = base64.NewDecoder(base64.StdEncoding, reader)
}
html, err := io.ReadAll(reader)
if err != nil {
return "", err
}
body := html2text.HTML2Text(string(html))
return string(body), nil
}