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

fix: prioritize mailing list over self-sent messages

Browse Source 
New Delta Chat is going to send self-sent messages
with undisclosed recipients instead of placing self into the `To` field.
To avoid assigning broadcast list messages to Saved Messages chat,
we should check the mailing list headers
before attempting to assign to Saved Messages.
This commit is contained in:
link2xt
2025-01-04 19:48:32 +00:00
committed by l
parent 2bce4466d7
commit 548fadc84a
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/receive_imf.rs
View File

@@ -1181,6 +1181,22 @@ async fn add_parts(
.await?; .await?;
} }
if chat_id.is_none() {
// Check if the message belongs to a broadcast list.
if let Some(mailinglist_header) = mime_parser.get_mailinglist_header() {
let listid = mailinglist_header_listid(mailinglist_header)?;
chat_id = Some(
if let Some((id, ..)) = chat::get_chat_id_by_grpid(context, &listid).await? {
id
} else {
let name =
compute_mailinglist_name(mailinglist_header, &listid, mime_parser);
chat::create_broadcast_list_ex(context, Nosync, listid, name).await?
},
);
}
}
if chat_id.is_none() && self_sent { if chat_id.is_none() && self_sent {
// from_id==to_id==ContactId::SELF - this is a self-sent messages, // from_id==to_id==ContactId::SELF - this is a self-sent messages,
// maybe an Autocrypt Setup Message // maybe an Autocrypt Setup Message
@@ -1200,22 +1216,6 @@ async fn add_parts(
} }
} }
} }
if chat_id.is_none() {
// Check if the message belongs to a broadcast list.
if let Some(mailinglist_header) = mime_parser.get_mailinglist_header() {
let listid = mailinglist_header_listid(mailinglist_header)?;
chat_id = Some(
if let Some((id, ..)) = chat::get_chat_id_by_grpid(context, &listid).await? {
id
} else {
let name =
compute_mailinglist_name(mailinglist_header, &listid, mime_parser);
chat::create_broadcast_list_ex(context, Nosync, listid, name).await?
},
);
}
}
} }
if fetching_existing_messages && mime_parser.decrypting_failed { if fetching_existing_messages && mime_parser.decrypting_failed {