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

replace html2text package with a basic regex; reorder text/html processing to be last

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

16
server/smtp_server.go
View file

@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"github.com/emersion/go-smtp"
"github.com/k3a/html2text"
"io"
"mime"
"mime/multipart"
@ -14,6 +13,7 @@ import (
"net/http"
"net/http/httptest"
"net/mail"
"regexp"
"strings"
"sync"
)
@ -219,10 +219,10 @@ 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)
} else if strings.ToLower(contentType) == "text/html" {
return readHTMLMailBody(body, header.Get("Content-Transfer-Encoding"))
}
return "", errUnsupportedContentType
}
@ -269,6 +269,14 @@ func readHTMLMailBody(reader io.Reader, transferEncoding string) (string, error)
if err != nil {
return "", err
}
body := html2text.HTML2Text(string(html))
// Strip HTML
re := regexp.MustCompile("<[^>]*>")
body := re.ReplaceAllString(string(html), "")
// Cleanup potential empty lines
re2 := regexp.MustCompile("(?m)^[ \t]*\r?\n")
body = re2.ReplaceAllString(body, "")
return string(body), nil
}