github/himalaya
1
0
Fork 0
mirror of https://github.com/pimalaya/himalaya.git synced 2026-06-17 13:17:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

show email addr when name not available (#131)

Browse Source
This commit is contained in:
Clément DOUIN
2021-04-27 18:10:18 +02:00
parent 754d311a05
commit 950e57acdb
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/msg/model.rs
+17 -3
View File
@@ -262,9 +262,23 @@ impl<'m> From<&'m imap::types::Fetch> for Msg<'m> {
sender: envelope
.from
.as_ref()
.and_then(|addrs| addrs.first()?.name)
.and_then(|name| rfc2047_decoder::decode(name).ok())
.unwrap_or_default(),
.and_then(|addrs| addrs.first())
.and_then(|addr| {
addr.name
.and_then(|name| rfc2047_decoder::decode(name).ok())
.or_else(|| {
let mbox = addr
.mailbox
.and_then(|mbox| String::from_utf8(mbox.to_vec()).ok())
.unwrap_or(String::from("unknown"));
let host = addr
.host
.and_then(|host| String::from_utf8(host.to_vec()).ok())
.unwrap_or(String::from("unknown"));
Some(format!("{}@{}", mbox, host))
})
})
.unwrap_or(String::from("unknown")),
date: fetch
.internal_date()
.map(|date| date.naive_local().to_string())