wathiede/letterbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Releases Wiki Activity

web: show email address when now name present

Browse Source
This commit is contained in:
Bill Thiede 2024-09-29 19:05:46 -07:00
parent b858b23584
commit 0fa860bc71
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/src/view/mod.rs
View File

@ -457,6 +457,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
let id = msg.id.clone(); let id = msg.id.clone();
let is_unread = has_unread(&msg.tags); let is_unread = has_unread(&msg.tags);
let img = render_avatar(avatar, &from); let img = render_avatar(avatar, &from);
let unknown = "UNKNOWN".to_string();
div![figure![ div![figure![
C!["flex"], C!["flex"],
div![C!["w-16", "h-16", "h-auto"], &img], 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| { msg.to.iter().map(|to| {
let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to; let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
span![ span![
&name, name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
" ", " ",
span![ span![
i![C!["far", "fa-clone"]], i![C!["far", "fa-clone"]],
@ -499,7 +500,7 @@ fn render_open_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Node<
msg.cc.iter().map(|cc| { msg.cc.iter().map(|cc| {
let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc; let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
span![ span![
&name, name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown)),
" ", " ",
span![ span![
i![C!["far", "fa-clone"]], i![C!["far", "fa-clone"]],
@ -553,6 +554,7 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
let id = msg.id.clone(); let id = msg.id.clone();
let is_unread = has_unread(&msg.tags); let is_unread = has_unread(&msg.tags);
let img = render_avatar(avatar, &from); let img = render_avatar(avatar, &from);
let unknown = "UNKNOWN".to_string();
div![figure![ div![figure![
C!["flex"], C!["flex"],
div![C!["w-16", "h-16", "mx-auto", "h-auto"], &img], div![C!["w-16", "h-16", "mx-auto", "h-auto"], &img],
@ -568,10 +570,10 @@ fn render_closed_header(msg: &ShowThreadQueryThreadOnEmailThreadMessages) -> Nod
], ],
span![ span![
msg.to.iter().enumerate().map(|(i, to)| { msg.to.iter().enumerate().map(|(i, to)| {
let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, .. } = to; let ShowThreadQueryThreadOnEmailThreadMessagesTo { name, addr } = to;
span![ span![
if i > 0 { ", " } else { "" }, 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![ span![
msg.cc.iter().enumerate().map(|(i, cc)| { msg.cc.iter().enumerate().map(|(i, cc)| {
let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, .. } = cc; let ShowThreadQueryThreadOnEmailThreadMessagesCc { name, addr } = cc;
span![ span![
if i > 0 { ", " } else { "" }, if i > 0 { ", " } else { "" },
&name, name.as_ref().unwrap_or_else(|| addr.as_ref().unwrap_or(&unknown))
] ]
}) })
] ]