`
+ for range embeddedContentDepthLimit {
+ withinLimit = embeddedActionTextAttachment(withinLimit)
+ }
+ beyondLimit := embeddedActionTextAttachment(withinLimit)
+
+ for name, text := range map[string]func(string) string{"ToText": ToText, "MessageSourceText": MessageSourceText} {
+ if got := text(withinLimit); !strings.Contains(got, "innermost") {
+ t.Errorf("%s = %q, want the body at the nesting limit", name, got)
+ }
+ if got := text(beyondLimit); strings.Contains(got, "innermost") {
+ t.Errorf("%s = %q, should stop before the body beyond the nesting limit", name, got)
+ }
+ }
+ if urls := ExtractImageURLs(withinLimit); len(urls) != 1 {
+ t.Errorf("ExtractImageURLs = %v, want the image at the nesting limit", urls)
+ }
+ if urls := ExtractImageURLs(beyondLimit); len(urls) != 0 {
+ t.Errorf("ExtractImageURLs = %v, should stop before the image beyond the nesting limit", urls)
+ }
+}
+
+// HEY renders an attachment's content as HTML only when its content type is HTML; any
+// other attachment is itself, whatever content it carries.
+func TestNonHTMLActionTextAttachmentContentIsNotABody(t *testing.T) {
+ image := ``
+ if urls := ExtractImageURLs(image); len(urls) != 1 || urls[0] != "https://example.com/floor-plan.png" {
+ t.Errorf("ExtractImageURLs = %v, want the attachment's own image", urls)
+ }
+
+ untyped := `
Visible
`
+ if got := ToText(untyped); strings.Contains(got, "not the body") {
+ t.Errorf("ToText = %q, should not render a non-HTML attachment's content", got)
+ }
+ if got := strings.Join(strings.Fields(MessageSourceText(untyped)), " "); got != "Visible" {
+ t.Errorf("MessageSourceText = %q, want only the visible text", got)
+ }
+}
+
+// Only an unnamed HTML attachment is an email body; a named one is a file, even when it is HTML.
+func TestNamedHTMLActionTextAttachmentIsAFile(t *testing.T) {
+ file := ``
+
+ if got := toMarkdown(file); got != "📄 itinerary.html" {
+ t.Errorf("ToMarkdown = %q, want the file row", got)
+ }
+ if got := ToText(file); got != "[itinerary.html]" {
+ t.Errorf("ToText = %q, want the filename", got)
+ }
+ if got := MessageSourceText(file); got != "" {
+ t.Errorf("MessageSourceText = %q, want no source text from a file", got)
+ }
+ if urls := ExtractImageURLs(file); len(urls) != 0 {
+ t.Errorf("ExtractImageURLs = %v, want no image from inside a file", urls)
+ }
+}
+
func TestExtractAttachmentsSkipsEmbeddedHTMLAttachment(t *testing.T) {
attachments := ExtractAttachments(``)
if len(attachments) != 0 {
diff --git a/internal/htmlutil/markdown.go b/internal/htmlutil/markdown.go
index 158fb310b..a546d6e0c 100644
--- a/internal/htmlutil/markdown.go
+++ b/internal/htmlutil/markdown.go
@@ -730,7 +730,8 @@ func (m *markdownizer) embedded(content string) {
m.depth--
}
-// actionTextAttachment writes an attachment node — or nothing, for a decorative image.
+// actionTextAttachment writes an attachment node — or nothing, for a decorative image,
+// or the markup an unnamed text/html one carries inline, which is an email body.
// HEY rewrites an inbound email's tags into these nodes, so a notification
// email's avatars and icons arrive as image attachments declaring icon-sized
// dimensions, decoration beside the text that already says who or what they show. A
@@ -740,6 +741,10 @@ func (m *markdownizer) actionTextAttachment(n *html.Node) {
if isImageContentType(getAttr(n, "content-type")) && isDecorativeImage(getAttr(n, "width"), getAttr(n, "height")) {
return
}
+ if content := embeddedActionTextContent(n); content != "" {
+ m.embedded(content)
+ return
+ }
filename := getAttr(n, "filename")
if filename == "" {
filename = getAttr(n, "caption")
diff --git a/internal/htmlutil/markdown_test.go b/internal/htmlutil/markdown_test.go
index 2e1bc2e6e..9ce687b8b 100644
--- a/internal/htmlutil/markdown_test.go
+++ b/internal/htmlutil/markdown_test.go
@@ -529,6 +529,47 @@ func TestToMarkdownEmbeddedHTMLAttachment(t *testing.T) {
}
}
+// A nested action-text-attachment carries its HTML in a content attribute.
+func TestToMarkdownEmbeddedActionTextAttachment(t *testing.T) {
+ got := toMarkdown(``)
+
+ want := "Dear customer,\n\nPlease [sign the document](https://example.com/sign)."
+ if got != want {
+ t.Errorf("ToMarkdown = %q, want %q", got, want)
+ }
+}
+
+func TestToMarkdownNamedActionTextAttachmentIgnoresInlineContent(t *testing.T) {
+ got := toMarkdown(``)
+ want := "📄 report.pdf"
+ if got != want {
+ t.Errorf("ToMarkdown = %q, want %q", got, want)
+ }
+}
+
+// HEY renders an attachment's content as HTML only when its content type is HTML.
+func TestToMarkdownNonHTMLActionTextAttachmentIgnoresInlineContent(t *testing.T) {
+ got := toMarkdown(``)
+ want := ""
+ if got != want {
+ t.Errorf("ToMarkdown = %q, want %q", got, want)
+ }
+}
+
+func TestToMarkdownEmbeddedActionTextAttachmentStopsRecursing(t *testing.T) {
+ withinLimit := "
innermost
"
+ for range embeddedContentDepthLimit {
+ withinLimit = embeddedActionTextAttachment(withinLimit)
+ }
+ if got := toMarkdown(withinLimit); got != "innermost" {
+ t.Errorf("ToMarkdown = %q, want the body at the nesting limit", got)
+ }
+
+ if got := toMarkdown(embeddedActionTextAttachment(withinLimit)); strings.Contains(got, "innermost") {
+ t.Errorf("ToMarkdown = %q, should stop before the body beyond the nesting limit", got)
+ }
+}
+
func TestToMarkdownEmbeddedContentStopsRecursing(t *testing.T) {
nested := "
`
+ for range embeddedContentDepthLimit {
+ withinLimit = embeddedActionTextAttachment(withinLimit)
+ }
+ beyondLimit := embeddedActionTextAttachment(withinLimit)
+
+ for name, text := range map[string]func(string) string{"ToText": ToText, "MessageSourceText": MessageSourceText} {
+ if got := text(withinLimit); !strings.Contains(got, "innermost") {
+ t.Errorf("%s = %q, want the body at the nesting limit", name, got)
+ }
+ if got := text(beyondLimit); strings.Contains(got, "innermost") {
+ t.Errorf("%s = %q, should stop before the body beyond the nesting limit", name, got)
+ }
+ }
+ if urls := ExtractImageURLs(withinLimit); len(urls) != 1 {
+ t.Errorf("ExtractImageURLs = %v, want the image at the nesting limit", urls)
+ }
+ if urls := ExtractImageURLs(beyondLimit); len(urls) != 0 {
+ t.Errorf("ExtractImageURLs = %v, should stop before the image beyond the nesting limit", urls)
+ }
+}
+
+// HEY renders an attachment's content as HTML only when its content type is HTML; any
+// other attachment is itself, whatever content it carries.
+func TestNonHTMLActionTextAttachmentContentIsNotABody(t *testing.T) {
+ image := `