feat: html2text

ItsNotGoodName · ItsNotGoodName · commit 637e391d77a6 · 2023-07-23T02:45:53.000-07:00
diff --git a/README.md b/README.md
@@ -35,7 +35,7 @@ smtpbridge --version
 
 ## Config
 
-Config file is loaded from one of the following locations. 
+Config file is loaded from one of the following locations.
 
 - `config.yaml`
 - `config.yml`
diff --git a/go.mod b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/emersion/go-smtp v0.16.0
 	github.com/gofiber/fiber/v2 v2.47.0
 	github.com/gofiber/template/html/v2 v2.0.4
+	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7
 	github.com/jhillyerd/enmime v1.0.0
 	github.com/labstack/gommon v0.4.0
 	github.com/rs/zerolog v1.29.1
@@ -29,7 +30,6 @@ require (
 	github.com/gofiber/utils v1.1.0 // indirect
 	github.com/gogs/chardet v0.0.0-20191104214054-4b6791f73a28 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
 	github.com/klauspost/compress v1.16.3 // indirect
diff --git a/internal/envelope/message.go b/internal/envelope/message.go
@@ -4,6 +4,7 @@ import (
 	"time"
 
 	"github.com/ItsNotGoodName/smtpbridge/pkg/pagination"
+	"github.com/jaytaylor/html2text"
 	"github.com/samber/lo"
 )
 
@@ -17,12 +18,21 @@ type CreateMessage struct {
 }
 
 func NewMessage(r CreateMessage) *Message {
+	text := r.Text
+	if isHTML(r.Text) {
+		var err error
+		text, err = html2text.FromString(r.Text)
+		if err != nil {
+			text = r.Text
+		}
+	}
+
 	return &Message{
 		From:      r.From,
 		To:        lo.Uniq(r.To),
 		CreatedAt: time.Now(),
 		Subject:   r.Subject,
-		Text:      r.Text,
+		Text:      text,
 		HTML:      r.HTML,
 		Date:      r.Date,
 	}
diff --git a/internal/envelope/utils.go b/internal/envelope/utils.go
@@ -34,3 +34,7 @@ func fileExtension(name string, mimeT string) string {
 	}
 	return extension
 }
+
+func isHTML(maybeHTML string) bool {
+	return strings.HasPrefix(maybeHTML, "<!DOCTYPE html>")
+}

Original file line number	Diff line number	Diff line change
`@@ -34,3 +34,7 @@ func fileExtension(name string, mimeT string) string {`
`34`	`34`	`}`
`35`	`35`	`return extension`
`36`	`36`	`}`
	`37`	`+`
	`38`	`+func isHTML(maybeHTML string) bool {`
	`39`	`+ return strings.HasPrefix(maybeHTML, "<!DOCTYPE html>")`
	`40`	`+}`