From 32b31db1750882e32de435eb9d3a67d3c84d30f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Tue, 30 May 2023 23:07:10 +0200
Subject: [PATCH] fix back read -t html

---
 Cargo.lock                   | 23 +++++++++++++++--------
 src/domain/email/handlers.rs | 13 ++++++++++---
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3c42264..84795b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -52,9 +52,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "0.7.20"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+checksum = "67fc08ce920c31afb70f013dcce1bfc3a3195de6a228474e45e1f145b36f8d04"
 dependencies = [
  "memchr 2.5.0",
 ]
@@ -1668,6 +1668,12 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "nanohtml2text"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "999681fe3c0524336e98ece1c25ee4278607f25cc1e361ad0f9201c8bf56dc2c"
+
 [[package]]
 name = "native-tls"
 version = "0.2.11"
@@ -2062,7 +2068,7 @@ dependencies = [
 [[package]]
 name = "pimalaya-email"
 version = "0.8.0"
-source = "git+https://git.sr.ht/~soywod/pimalaya#f62efe4f4f3fe4d1493056cef50d8ebdc28f681b"
+source = "git+https://git.sr.ht/~soywod/pimalaya#6767853528d75d8d0e6ff5e424dafea7351c3c94"
 dependencies = [
  "advisory-lock",
  "ammonia",
@@ -2105,12 +2111,13 @@ dependencies = [
 [[package]]
 name = "pimalaya-email-tpl"
 version = "0.2.0"
-source = "git+https://git.sr.ht/~soywod/pimalaya#f62efe4f4f3fe4d1493056cef50d8ebdc28f681b"
+source = "git+https://git.sr.ht/~soywod/pimalaya#6767853528d75d8d0e6ff5e424dafea7351c3c94"
 dependencies = [
  "chumsky 0.9.0",
  "log",
  "mail-builder",
  "mail-parser",
+ "nanohtml2text",
  "pimalaya-process",
  "shellexpand",
  "thiserror",
@@ -2369,9 +2376,9 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
 dependencies = [
  "aho-corasick",
  "memchr 2.5.0",
@@ -2380,9 +2387,9 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.28"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
+checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
 
 [[package]]
 name = "remove_dir_all"
diff --git a/src/domain/email/handlers.rs b/src/domain/email/handlers.rs
index 976698a..fab3007 100644
--- a/src/domain/email/handlers.rs
+++ b/src/domain/email/handlers.rs
@@ -1,7 +1,9 @@
 use anyhow::{anyhow, Context, Result};
 use atty::Stream;
 use log::{debug, trace};
-use pimalaya_email::{AccountConfig, Backend, Email, EmailBuilder, Flag, Flags, Sender};
+use pimalaya_email::{
+    AccountConfig, Backend, Email, EmailBuilder, FilterParts, Flag, Flags, Sender,
+};
 use std::{
     fs,
     io::{self, BufRead},
@@ -215,7 +217,7 @@ pub fn read<P: Printer>(
     folder: &str,
     ids: Vec<&str>,
     // TODO: map this to ShowTextsStrategy
-    _text_mime: &str,
+    text_mime: &str,
     _sanitize: bool,
     raw: bool,
     headers: Vec<&str>,
@@ -237,7 +239,12 @@ pub fn read<P: Printer>(
             bodies.push_str(&String::from_utf8_lossy(email.raw()?).into_owned());
         } else {
             let tpl: String = email
-                .to_read_tpl(&config, |i| i.show_additional_headers(&headers))?
+                .to_read_tpl(&config, |tpl| match text_mime {
+                    "html" => tpl
+                        .hide_all_headers()
+                        .filter_parts(FilterParts::Only("text/html".into())),
+                    _ => tpl.show_additional_headers(&headers),
+                })?
                 .into();
             bodies.push_str(&tpl);
         }