Feature: html and text tabs (#23)

* Added tabs for HTML and Text parts of an email * Only store plaintext in text field of message
tweedegolf · Mar 6, 2023 · 0488cf4 · 0488cf4
1 parent fc82196
commit 0488cf4
Show file tree

Hide file tree

Showing 12 changed files with 209 additions and 125 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/src/main.rs b/backend/src/main.rs
@@ -33,9 +33,11 @@ fn load_index() -> Option<String> {
     let index: String = std::fs::read_to_string("dist/index.html").ok()?;
 
     // remove slash from start of asset includes, so they are loaded by relative path
-    Some(index
-        .replace("href=\"/", "href=\"./static/")
-        .replace("'/mailcrab-frontend", "'./static/mailcrab-frontend"))
+    Some(
+        index
+            .replace("href=\"/", "href=\"./static/")
+            .replace("'/mailcrab-frontend", "'./static/mailcrab-frontend"),
+    )
 }
 
 #[tokio::main]
@@ -141,13 +143,25 @@ mod test {
                 .to(format!("{to_name} <{to}>").parse().unwrap())
                 .subject(CatchPhase().fake::<String>());
 
-            let mut multipart = MultiPart::mixed().multipart(
-                MultiPart::alternative()
-                    .singlepart(SinglePart::plain(body))
-                    .singlepart(SinglePart::html(html)),
-            );
-
             let r: u8 = rng.gen();
+            let mut multipart = MultiPart::mixed().build();
+
+            match r % 3 {
+                0 => {
+                    multipart = multipart.multipart(
+                        MultiPart::alternative()
+                            .singlepart(SinglePart::plain(body))
+                            .singlepart(SinglePart::html(html)),
+                    );
+                }
+                1 => {
+                    multipart = multipart.singlepart(SinglePart::plain(body));
+                }
+                _ => {
+                    multipart = multipart.singlepart(SinglePart::html(html));
+                }
+            };
+
             let filebody = std::fs::read("blank.pdf").unwrap();
             let content_type = ContentType::parse("application/pdf").unwrap();
 

diff --git a/backend/src/types.rs b/backend/src/types.rs
@@ -151,7 +151,10 @@ impl TryFrom<mail_parser::Message<'_>> for MailMessage {
 
         let subject = message.subject().unwrap_or_default().to_owned();
 
-        let text = match message.text_bodies().next() {
+        let text = match message
+            .text_bodies()
+            .find(|p| p.is_text() && !p.is_text_html())
+        {
             Some(item) => item.to_string(),
             _ => Default::default(),
         };

diff --git a/frontend/Cargo.lock b/frontend/Cargo.lock
diff --git a/frontend/Cargo.toml b/frontend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "mailcrab-frontend"
-version = "0.6.0"
+version = "0.7.0"
 edition = "2021"
 publish = false
 

diff --git a/frontend/src/formatted.rs b/frontend/src/formatted.rs
@@ -1,4 +1,4 @@
-use crate::{api::get_api_path, types::MailMessage};
+use crate::{api::get_api_path, message_header::MessageHeader, types::MailMessage};
 use wasm_bindgen::JsCast;
 use web_sys::{Event, HtmlIFrameElement, HtmlLinkElement};
 use yew::{function_component, html, Html, Properties};
@@ -54,56 +54,7 @@ pub fn view(props: &FormattedProps) -> Html {
 
     html! {
       <>
-        <table>
-          <tbody>
-            <tr>
-              <th>{"From"}</th>
-              <td>
-                <span class="name">
-                  {message.from.clone().name.unwrap_or_default()}
-                </span>
-                <span class="email">
-                  {message.from.clone().email.unwrap_or_default()}
-                </span>
-              </td>
-            </tr>
-            <tr>
-              <th>{"To"}</th>
-              <td>
-                {message.to.iter().map(|to| {
-                  html! {
-                    <span class="user">
-                      <span class="name">
-                        {to.clone().name.unwrap_or_default()}
-                      </span>
-                      <span class="email">
-                        {to.clone().email.unwrap_or_default()}
-                      </span>
-                    </span>
-                  }
-                }).collect::<Html>()}
-              </td>
-            </tr>
-            <tr>
-              <th>{"Subject"}</th>
-              <td>{&message.subject}</td>
-            </tr>
-          </tbody>
-        </table>
-        <div class="attachments">
-          {message.attachments.iter().map(|a| {
-            html! {
-              <a
-                href={format!("data:{};base64,{}", &a.mime, &a.content)}
-                download={a.filename.clone()}
-                class={&a.mime.replace('/', "-")}
-              >
-                {&a.filename}
-                <span class="size">{&a.size}</span>
-              </a>
-            }
-          }).collect::<Html>()}
-        </div>
+        <MessageHeader message={message.clone()} />
         <div class="body">
           <iframe onload={onload} src={body_src}></iframe>
         </div>

diff --git a/frontend/src/main.rs b/frontend/src/main.rs
@@ -3,7 +3,9 @@ use overview::Overview;
 mod api;
 mod formatted;
 mod list;
+mod message_header;
 mod overview;
+mod plaintext;
 mod types;
 mod view;
 mod websocket;