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: don't ignore get_for_contact errors

Browse Source
This commit is contained in:
link2xt
2025-01-04 17:24:35 +00:00
committed by l
parent 3d19996f34
commit 4ffc0ca047
1 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/receive_imf.rs
View File

@@ -946,15 +946,12 @@ async fn add_parts(
chat_id = Some(chat.id); chat_id = Some(chat.id);
chat_id_blocked = chat.blocked; chat_id_blocked = chat.blocked;
} else if allow_creation { } else if allow_creation {
if let Ok(chat) = ChatIdBlocked::get_for_contact(context, from_id, create_blocked) let chat = ChatIdBlocked::get_for_contact(context, from_id, create_blocked)
.await .await
.context("Failed to get (new) chat for contact") .context("Failed to get (new) chat for contact")?;
.log_err(context)
{
chat_id = Some(chat.id); chat_id = Some(chat.id);
chat_id_blocked = chat.blocked; chat_id_blocked = chat.blocked;
} }
}
if let Some(chat_id) = chat_id { if let Some(chat_id) = chat_id {
if chat_id_blocked != Blocked::Not { if chat_id_blocked != Blocked::Not {
@@ -1149,9 +1146,8 @@ async fn add_parts(
chat_id = Some(id); chat_id = Some(id);
chat_id_blocked = blocked; chat_id_blocked = blocked;
} }
} else if let Ok(chat) = } else {
ChatIdBlocked::get_for_contact(context, to_id, Blocked::Not).await let chat = ChatIdBlocked::get_for_contact(context, to_id, Blocked::Not).await?;
{
chat_id = Some(chat.id); chat_id = Some(chat.id);
chat_id_blocked = chat.blocked; chat_id_blocked = chat.blocked;
} }
@@ -1167,7 +1163,7 @@ async fn add_parts(
if chat_id_blocked != Blocked::Not { if chat_id_blocked != Blocked::Not {
if let Some(chat_id) = chat_id { if let Some(chat_id) = chat_id {
chat_id.unblock_ex(context, Nosync).await?; chat_id.unblock_ex(context, Nosync).await?;
chat_id_blocked = Blocked::Not; // Not assigning `chat_id_blocked = Blocked::Not` to avoid unused_assignments warning.
} }
} }
} }
@@ -1204,20 +1200,15 @@ async fn add_parts(
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
if let Ok(chat) = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not) let chat = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not)
.await .await
.context("Failed to get (new) chat for contact") .context("Failed to get (new) chat for contact")?;
.log_err(context)
{
chat_id = Some(chat.id);
chat_id_blocked = chat.blocked;
}
if let Some(chat_id) = chat_id { chat_id = Some(chat.id);
if Blocked::Not != chat_id_blocked { // Not assigning `chat_id_blocked = chat.blocked` to avoid unused_assignments warning.
chat_id.unblock_ex(context, Nosync).await?;
// Not assigning `chat_id_blocked = Blocked::Not` to avoid unused_assignments warning. if Blocked::Not != chat.blocked {
} chat.id.unblock_ex(context, Nosync).await?;
} }
} }
} }