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

Rename X-Additional-Message-IDs into Additional-Message-IDs

Browse Source 
X- prefixes are deprecated in https://tools.ietf.org/html/rfc6648
This commit is contained in:
Alexander Krotov
2020-01-19 22:49:36 +03:00
parent 763587ffb4
commit b50d2358d3
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/headerdef.rs
View File

@@ -12,7 +12,7 @@ pub enum HeaderDef {
OriginalMessageId, OriginalMessageId,
/// Delta Chat extension for message IDs in combined MDNs /// Delta Chat extension for message IDs in combined MDNs
XAdditionalMessageIds, AdditionalMessageIds,
ListId, ListId,
References, References,

2
src/mimefactory.rs
View File

@@ -948,7 +948,7 @@ impl<'a, 'b> MimeFactory<'a, 'b> {
let extension_fields = if additional_msg_ids.is_empty() { let extension_fields = if additional_msg_ids.is_empty() {
"".to_string() "".to_string()
} else { } else {
"X-Additional-Message-IDs: ".to_string() "Additional-Message-IDs: ".to_string()
+ &additional_msg_ids + &additional_msg_ids
.iter() .iter()
.map(|mid| render_rfc724_mid(&mid)) .map(|mid| render_rfc724_mid(&mid))

6
src/mimeparser.rs
View File

@@ -743,7 +743,7 @@ impl<'a> MimeMessage<'a> {
.and_then(|v| parse_message_id(&v)) .and_then(|v| parse_message_id(&v))
{ {
let additional_message_ids = report_fields let additional_message_ids = report_fields
.get_first_value(&HeaderDef::XAdditionalMessageIds.get_headername()) .get_first_value(&HeaderDef::AdditionalMessageIds.get_headername())
.ok() .ok()
.flatten() .flatten()
.map_or_else(Vec::new, |v| { .map_or_else(Vec::new, |v| {
@@ -868,7 +868,7 @@ fn update_gossip_peerstates(
pub(crate) struct Report { pub(crate) struct Report {
/// Original-Message-ID header /// Original-Message-ID header
original_message_id: String, original_message_id: String,
/// X-Additional-Message-IDs /// Additional-Message-IDs
additional_message_ids: Vec<String>, additional_message_ids: Vec<String>,
} }
@@ -1430,7 +1430,7 @@ Original-Recipient: rfc822;bob@example.org\n\
Final-Recipient: rfc822;bob@example.org\n\ Final-Recipient: rfc822;bob@example.org\n\
Original-Message-ID: <foo@example.org>\n\ Original-Message-ID: <foo@example.org>\n\
Disposition: manual-action/MDN-sent-automatically; displayed\n\ Disposition: manual-action/MDN-sent-automatically; displayed\n\
X-Additional-Message-IDs: <foo@example.com> <foo@example.net>\n\ Additional-Message-IDs: <foo@example.com> <foo@example.net>\n\
\n\ \n\
\n\ \n\
--kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\ --kJBbU58X1xeWNHgBtTbMk80M5qnV4N--\n\