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

refactor: flatten lookup_chat_by_reply

Browse Source
This commit is contained in:
link2xt
2023-09-25 09:30:00 +00:00
parent f290fe0871
commit a1345f2542
1 changed files with 43 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
src/receive_imf.rs
View File

@@ -1408,56 +1408,53 @@ async fn lookup_chat_by_reply(
) -> Result<Option<(ChatId, Blocked)>> { ) -> Result<Option<(ChatId, Blocked)>> {
// Try to assign message to the same chat as the parent message. // Try to assign message to the same chat as the parent message.
if let Some(parent) = parent { let Some(parent) = parent else {
let parent_chat = Chat::load_from_db(context, parent.chat_id).await?; return Ok(None);
};
if parent.download_state != DownloadState::Done let parent_chat = Chat::load_from_db(context, parent.chat_id).await?;
// TODO (2023-09-12): Added for backward compatibility with versions that did not have
// `DownloadState::Undecipherable`. Remove eventually with the comment in
// `MimeMessage::from_bytes()`.
|| parent
.error
.as_ref()
.filter(|e| e.starts_with("Decrypting failed:"))
.is_some()
{
// If the parent msg is not fully downloaded or undecipherable, it may have been
// assigned to the wrong chat (they often get assigned to the 1:1 chat with the sender).
return Ok(None);
}
if parent_chat.id == DC_CHAT_ID_TRASH { if parent.download_state != DownloadState::Done
return Ok(None); // TODO (2023-09-12): Added for backward compatibility with versions that did not have
} // `DownloadState::Undecipherable`. Remove eventually with the comment in
// `MimeMessage::from_bytes()`.
// If this was a private message just to self, it was probably a private reply. || parent
// It should not go into the group then, but into the private chat. .error
if is_probably_private_reply(context, to_ids, from_id, mime_parser, parent_chat.id).await? { .as_ref()
return Ok(None); .filter(|e| e.starts_with("Decrypting failed:"))
} .is_some()
{
// If the parent chat is a 1:1 chat, and the sender is a classical MUA and added // If the parent msg is not fully downloaded or undecipherable, it may have been
// a new person to TO/CC, then the message should not go to the 1:1 chat, but to a // assigned to the wrong chat (they often get assigned to the 1:1 chat with the sender).
// newly created ad-hoc group. return Ok(None);
if parent_chat.typ == Chattype::Single
&& !mime_parser.has_chat_version()
&& to_ids.len() > 1
{
let mut chat_contacts = chat::get_chat_contacts(context, parent_chat.id).await?;
chat_contacts.push(ContactId::SELF);
if to_ids.iter().any(|id| !chat_contacts.contains(id)) {
return Ok(None);
}
}
info!(
context,
"Assigning message to {} as it's a reply to {}.", parent_chat.id, parent.rfc724_mid
);
return Ok(Some((parent_chat.id, parent_chat.blocked)));
} }
Ok(None) if parent_chat.id == DC_CHAT_ID_TRASH {
return Ok(None);
}
// If this was a private message just to self, it was probably a private reply.
// It should not go into the group then, but into the private chat.
if is_probably_private_reply(context, to_ids, from_id, mime_parser, parent_chat.id).await? {
return Ok(None);
}
// If the parent chat is a 1:1 chat, and the sender is a classical MUA and added
// a new person to TO/CC, then the message should not go to the 1:1 chat, but to a
// newly created ad-hoc group.
if parent_chat.typ == Chattype::Single && !mime_parser.has_chat_version() && to_ids.len() > 1 {
let mut chat_contacts = chat::get_chat_contacts(context, parent_chat.id).await?;
chat_contacts.push(ContactId::SELF);
if to_ids.iter().any(|id| !chat_contacts.contains(id)) {
return Ok(None);
}
}
info!(
context,
"Assigning message to {} as it's a reply to {}.", parent_chat.id, parent.rfc724_mid
);
Ok(Some((parent_chat.id, parent_chat.blocked)))
} }
/// If this method returns true, the message shall be assigned to the 1:1 chat with the sender. /// If this method returns true, the message shall be assigned to the 1:1 chat with the sender.