From 0fa860bc713087d2bddddda3e19cf9d88e2f15ec Mon Sep 17 00:00:00 2001
From: Bill Thiede <git@xinu.tv>
Date: Sun, 29 Sep 2024 19:05:46 -0700
Subject: [PATCH] web: show email address when now name present

---
 web/src/view/mod.rs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/web/src/view/mod.rs b/web/src/view/mod.rs
index afba57e..759a4a4 100644
--- a/web/src/view/mod.rs
+++ b/web/src/view/mod.rs
@@ -457,6 +457,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
     let id = msg.id.clone();
     let is_unread = has_unread(&msg.tags);
     let img = render_avatar(avatar, &from);
+    let unknown = "UNKNOWN".to_string();
     div![figure![
         C!["flex"],
         div![C!["w-16", "h-16", "h-auto"], &img],
@@ -475,7 +476,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     msg.to.iter().map(|to| {
                         let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
                         span![
-                            &name,
+                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
                             " ",
                             span![
                                 i![C!["far", "fa-clone"]],
@@ -499,7 +500,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
                     msg.cc.iter().map(|cc| {
                         let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
                         span![
-                            &name,
+                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
                             " ",
                             span![
                                 i![C!["far", "fa-clone"]],
@@ -553,6 +554,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
     let id = msg.id.clone();
     let is_unread = has_unread(&msg.tags);
     let img = render_avatar(avatar, &from);
+    let unknown = "UNKNOWN".to_string();
     div![figure![
         C!["flex"],
         div![C!["w-16", "h-16", "mx-auto", "h-auto"], &img],
@@ -568,10 +570,10 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 ],
                 span![
                     msg.to.iter().enumerate().map(|(i, to)| {
-                        let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, .. } = to;
+                        let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
                         span![
                             if i > 0 { ", " } else { "" },
-                            &name,
+                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
                         ]
                     })
                 ]
@@ -584,10 +586,10 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
                 ],
                 span![
                     msg.cc.iter().enumerate().map(|(i, cc)| {
-                        let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, .. } = cc;
+                        let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
                         span![
                             if i > 0 { ", " } else { "" },
-                            &name,
+                            name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
                         ]
                     })
                 ]