From c11f00d791a75c96d9a24c01e080183c7f837319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment=20DOUIN?= <clement.douin@posteo.net>
Date: Tue, 19 Dec 2023 15:36:56 +0100
Subject: [PATCH] fix message and template send stdin issues

---
 src/email/message/command/send.rs          | 6 ++----
 src/email/message/template/command/send.rs | 8 +++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/email/message/command/send.rs b/src/email/message/command/send.rs
index 0bde172..5c06bea 100644
--- a/src/email/message/command/send.rs
+++ b/src/email/message/command/send.rs
@@ -36,16 +36,14 @@ impl MessageSendCommand {
             config.clone().into_account_configs(account, cache)?;
         let backend = Backend::new(toml_account_config, account_config.clone(), true).await?;
 
-        let is_tty = io::stdin().is_terminal();
-        let is_json = printer.is_json();
-        let msg = if is_tty || is_json {
+        let msg = if io::stdin().is_terminal() {
             self.message.raw()
         } else {
             io::stdin()
                 .lock()
                 .lines()
                 .filter_map(Result::ok)
-                .collect::<Vec<String>>()
+                .collect::<Vec<_>>()
                 .join("\r\n")
         };
 
diff --git a/src/email/message/template/command/send.rs b/src/email/message/template/command/send.rs
index dfa6a4d..91ae63a 100644
--- a/src/email/message/template/command/send.rs
+++ b/src/email/message/template/command/send.rs
@@ -39,17 +39,15 @@ impl TemplateSendCommand {
             config.clone().into_account_configs(account, cache)?;
         let backend = Backend::new(toml_account_config, account_config.clone(), true).await?;
 
-        let is_tty = io::stdin().is_terminal();
-        let is_json = printer.is_json();
-        let tpl = if is_tty || is_json {
+        let tpl = if io::stdin().is_terminal() {
             self.template.raw()
         } else {
             io::stdin()
                 .lock()
                 .lines()
                 .filter_map(Result::ok)
-                .collect::<Vec<String>>()
-                .join("\r\n")
+                .collect::<Vec<_>>()
+                .join("\n")
         };
 
         #[allow(unused_mut)]