Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-05 14:26:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

mimeparser: simplify get_subject() and get_rfc724_mid

Browse Source
This commit is contained in:
Alexander Krotov
2020-01-11 15:43:45 +03:00
committed by holger krekel
parent fde8fb960b
commit c7b2bdfaac
1 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mimeparser.rs
View File

@@ -367,14 +367,9 @@ impl<'a> MimeMessage<'a> {
} }
pub(crate) fn get_subject(&self) -> Option<String> { pub(crate) fn get_subject(&self) -> Option<String> {
if let Some(s) = self.get(HeaderDef::Subject) { self.get(HeaderDef::Subject)
if s.is_empty() { .filter(|s| !s.is_empty())
return None; .map(|s| s.to_string())
}
Some(s.to_string())
} else {
None
}
} }
pub fn get(&self, headerdef: HeaderDef) -> Option<&String> { pub fn get(&self, headerdef: HeaderDef) -> Option<&String> {
@@ -713,11 +708,8 @@ impl<'a> MimeMessage<'a> {
} }
pub fn get_rfc724_mid(&self) -> Option<String> { pub fn get_rfc724_mid(&self) -> Option<String> {
if let Some(msgid) = self.get(HeaderDef::MessageId) { self.get(HeaderDef::MessageId)
parse_message_id(msgid) .and_then(|msgid| parse_message_id(msgid))
} else {
None
}
} }
fn merge_headers(&mut self, fields: &[mailparse::MailHeader<'_>]) { fn merge_headers(&mut self, fields: &[mailparse::MailHeader<'_>]) {