more functional

This commit is contained in:
Hocuri
2020-06-12 11:11:24 +02:00
parent 27ff1c4a75
commit 1fe85dfb3c

View File

@@ -911,25 +911,24 @@ impl MimeMessage {
.contains("daemon") .contains("daemon")
&& self.failure_report.is_none() && self.failure_report.is_none()
{ {
for line in self lazy_static! {
static ref RE: regex::Regex = regex::Regex::new(r"Message-ID:(.*)").unwrap();
}
for captures in self
.parts .parts
.iter() .iter()
.filter_map(|p| p.msg_raw.as_ref()) .filter_map(|part| part.msg_raw.as_ref())
.flat_map(|p| p.lines()) .flat_map(|part| part.lines())
.filter_map(|line| RE.captures(line))
{ {
lazy_static! { if let Ok(original_message_id) = parse_message_id(&captures[1]) {
static ref RE: regex::Regex = regex::Regex::new(r"Message-ID:(.*)").unwrap(); if let Ok(Some(_)) =
} message::rfc724_mid_exists(context, &original_message_id).await
if let Some(c) = RE.captures(line) { {
if let Ok(original_message_id) = parse_message_id(&c[1]) { self.failure_report = Some(FailureReport {
if let Ok(Some(_)) = rfc724_mid: original_message_id,
message::rfc724_mid_exists(context, &original_message_id).await failed_recipient: None,
{ })
self.failure_report = Some(FailureReport {
rfc724_mid: original_message_id,
failed_recipient: None,
})
}
} }
} }
} }