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

refactor: use split_once() instead of regexp in heuristically_parse_ndn

Browse Source 
Reduce dependency on the huge `regex` crate.
This commit is contained in:
link2xt
2023-08-28 00:41:15 +00:00
parent 4d74f625d3
commit 1da52d7d1d
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/mimeparser.rs
View File

@@ -12,7 +12,6 @@ use deltachat_derive::{FromSql, ToSql};
use format_flowed::unformat_flowed; use format_flowed::unformat_flowed;
use lettre_email::mime::{self, Mime}; use lettre_email::mime::{self, Mime};
use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo}; use mailparse::{addrparse_header, DispositionType, MailHeader, MailHeaderMap, SingleInfo};
use once_cell::sync::Lazy;
use crate::aheader::{Aheader, EncryptPreference}; use crate::aheader::{Aheader, EncryptPreference};
use crate::blob::BlobObject; use crate::blob::BlobObject;
@@ -1617,25 +1616,21 @@ impl MimeMessage {
false false
}; };
if maybe_ndn && self.delivery_report.is_none() { if maybe_ndn && self.delivery_report.is_none() {
static RE: Lazy<regex::Regex> = for original_message_id in self
Lazy::new(|| regex::Regex::new(r"Message-ID:(.*)").unwrap());
for captures in self
.parts .parts
.iter() .iter()
.filter_map(|part| part.msg_raw.as_ref()) .filter_map(|part| part.msg_raw.as_ref())
.flat_map(|part| part.lines()) .flat_map(|part| part.lines())
.filter_map(|line| RE.captures(line)) .filter_map(|line| line.split_once("Message-ID:"))
.filter_map(|(_, message_id)| parse_message_id(message_id).ok())
{ {
if let Ok(original_message_id) = parse_message_id(&captures[1]) { if let Ok(Some(_)) = message::rfc724_mid_exists(context, &original_message_id).await
if let Ok(Some(_)) = {
message::rfc724_mid_exists(context, &original_message_id).await self.delivery_report = Some(DeliveryReport {
{ rfc724_mid: original_message_id,
self.delivery_report = Some(DeliveryReport { failed_recipient: None,
rfc724_mid: original_message_id, failure: true,
failed_recipient: None, })
failure: true,
})
}
} }
} }
} }