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

refactor: Don't call add_or_lookup_key_contacts() in advance

Browse Source 
Its result isn't needed in all the branches.
This commit is contained in:
iequidoo
2025-07-30 13:52:17 -03:00
committed by iequidoo
parent 78b7715ea6
commit db247d9f9a
1 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/receive_imf.rs
View File

@@ -297,18 +297,16 @@ async fn get_to_and_past_contact_ids(
past_member_fingerprints = &[]; past_member_fingerprints = &[];
} }
let pgp_to_ids = add_or_lookup_key_contacts(
context,
&mime_parser.recipients,
&mime_parser.gossiped_keys,
to_member_fingerprints,
Origin::Hidden,
)
.await?;
match chat_assignment { match chat_assignment {
ChatAssignment::GroupChat { .. } => { ChatAssignment::GroupChat { .. } => {
to_ids = pgp_to_ids; to_ids = add_or_lookup_key_contacts(
context,
&mime_parser.recipients,
&mime_parser.gossiped_keys,
to_member_fingerprints,
Origin::Hidden,
)
.await?;
if let Some(chat_id) = chat_id { if let Some(chat_id) = chat_id {
past_ids = lookup_key_contacts_by_address_list( past_ids = lookup_key_contacts_by_address_list(
@@ -336,7 +334,14 @@ async fn get_to_and_past_contact_ids(
ChatAssignment::ExistingChat { chat_id, .. } => { ChatAssignment::ExistingChat { chat_id, .. } => {
let chat = Chat::load_from_db(context, *chat_id).await?; let chat = Chat::load_from_db(context, *chat_id).await?;
if chat.is_encrypted(context).await? { if chat.is_encrypted(context).await? {
to_ids = pgp_to_ids; to_ids = add_or_lookup_key_contacts(
context,
&mime_parser.recipients,
&mime_parser.gossiped_keys,
to_member_fingerprints,
Origin::Hidden,
)
.await?;
past_ids = lookup_key_contacts_by_address_list( past_ids = lookup_key_contacts_by_address_list(
context, context,
&mime_parser.past_members, &mime_parser.past_members,
@@ -388,6 +393,14 @@ async fn get_to_and_past_contact_ids(
.await?; .await?;
} }
ChatAssignment::OneOneChat => { ChatAssignment::OneOneChat => {
let pgp_to_ids = add_or_lookup_key_contacts(
context,
&mime_parser.recipients,
&mime_parser.gossiped_keys,
to_member_fingerprints,
Origin::Hidden,
)
.await?;
if pgp_to_ids if pgp_to_ids
.first() .first()
.is_some_and(|contact_id| contact_id.is_some()) .is_some_and(|contact_id| contact_id.is_some())