web & server: plumb debugging info for content type hierarchy.

Also cleanup Email trait.

web/src/lib.rs

@@ -985,58 +985,57 @@ fn view_search_pager_legacy(start: usize, count: usize, total: usize) -> Node<Ms
 }
 
 trait Email {
-    fn name(&self) -> &Option<String>;
-    fn addr(&self) -> &Option<String>;
+    fn name(&self) -> Option<&str>;
+    fn addr(&self) -> Option<&str>;
 }
 
 impl<T: Email> Email for &'_ T {
-    fn name(&self) -> &Option<String> {
+    fn name(&self) -> Option<&str> {
         return (*self).name();
     }
-    fn addr(&self) -> &Option<String> {
+    fn addr(&self) -> Option<&str> {
         return (*self).addr();
     }
 }
 
 impl Email for ShowThreadQueryThreadMessagesCc {
-    fn name(&self) -> &Option<String> {
-        return &self.name;
+    fn name(&self) -> Option<&str> {
+        self.name.as_deref()
     }
-    fn addr(&self) -> &Option<String> {
-        return &self.addr;
+    fn addr(&self) -> Option<&str> {
+        self.addr.as_deref()
     }
 }
 impl Email for ShowThreadQueryThreadMessagesFrom {
-    fn name(&self) -> &Option<String> {
-        return &self.name;
+    fn name(&self) -> Option<&str> {
+        self.name.as_deref()
     }
-    fn addr(&self) -> &Option<String> {
-        return &self.addr;
+    fn addr(&self) -> Option<&str> {
+        self.addr.as_deref()
     }
 }
 impl Email for ShowThreadQueryThreadMessagesTo {
-    fn name(&self) -> &Option<String> {
-        return &self.name;
+    fn name(&self) -> Option<&str> {
+        self.name.as_deref()
     }
-    fn addr(&self) -> &Option<String> {
-        return &self.addr;
+    fn addr(&self) -> Option<&str> {
+        self.addr.as_deref()
     }
 }
 
-fn view_addresses<E: Email>(addrs: &[E]) -> Vec<Node<Msg>> {
-    addrs
-        .into_iter()
-        .map(|address| {
-            span![
-                C!["tag", "is-black"],
-                address.addr().as_ref().map(|a| attrs! {At::Title=>a}),
-                address
-                    .name()
-                    .as_ref()
-                    .unwrap_or(address.addr().as_ref().unwrap_or(&"(UNKNOWN)".to_string()))
-            ]
-        })
-        .collect::<Vec<_>>()
+fn view_address(email: impl Email) -> Node<Msg> {
+    span![
+        C!["tag", "is-black"],
+        email.addr().as_ref().map(|a| attrs! {At::Title=>a}),
+        email
+            .name()
+            .as_ref()
+            .unwrap_or(&email.addr().unwrap_or("(UNKNOWN)"))
+    ]
+}
+
+fn view_addresses(addrs: &[impl Email]) -> Vec<Node<Msg>> {
+    addrs.into_iter().map(view_address).collect::<Vec<_>>()
 }
 
 fn view_thread(thread: &ShowThreadQueryThread) -> Node<Msg> {
@@ -1061,11 +1060,21 @@ fn view_thread(thread: &ShowThreadQueryThread) -> Node<Msg> {
                         ShowThreadQueryThreadMessagesBodyOnUnhandledContentType { contents },
                     ) => pre![C!["error"], contents],
                     ShowThreadQueryThreadMessagesBody::PlainText(
-                        ShowThreadQueryThreadMessagesBodyOnPlainText { contents },
-                    ) => div![C!["view-part-text-plain"], contents],
+                        ShowThreadQueryThreadMessagesBodyOnPlainText {
+                            contents,
+                            content_tree,
+                        },
+                    ) => div![C!["view-part-text-plain"], contents, pre![content_tree]],
                     ShowThreadQueryThreadMessagesBody::Html(
-                        ShowThreadQueryThreadMessagesBodyOnHtml { contents },
-                    ) => div![C!["view-part-text-html"], raw![contents]],
+                        ShowThreadQueryThreadMessagesBodyOnHtml {
+                            contents,
+                            content_tree,
+                        },
+                    ) => div![
+                        C!["view-part-text-html"],
+                        raw![contents],
+                        pre![content_tree]
+                    ],
                 }
             ],
         ]