chat::chat_tests::test_past_members fixed

Author: link2xt

src/mimefactory.rs

@@ -257,7 +257,6 @@ impl MimeFactory {
                      LEFT JOIN contacts c ON cc.contact_id=c.id
                      LEFT JOIN public_keys k ON k.fingerprint=c.fingerprint
                      WHERE cc.chat_id=?
-                     AND cc.add_timestamp >= cc.remove_timestamp
                      AND (cc.contact_id>9 OR (cc.contact_id=1 AND ?))",
                     (msg.chat_id, chat.typ == Chattype::Group),
                     |row| {
@@ -300,6 +299,15 @@ impl MimeFactory {
                                     }
                                 }
                                 recipient_ids.insert(id);
+
+                                if let Some(public_key) = public_key_opt {
+                                    keys.push((addr.clone(), public_key))
+                                } else if id != ContactId::SELF {
+                                    missing_key_addresses.insert(addr.clone());
+                                    if is_encrypted {
+                                        warn!(context, "Missing key for {addr}");
+                                    }
+                                }
                             } else if remove_timestamp.saturating_add(60 * 24 * 3600) > now {
                                 // Row is a tombstone,
                                 // member is not actually part of the group.
@@ -324,15 +332,6 @@ impl MimeFactory {
                                     }
                                 }
                             }
-
-                            if let Some(public_key) = public_key_opt {
-                                keys.push((addr.clone(), public_key))
-                            } else if id != ContactId::SELF {
-                                missing_key_addresses.insert(addr.clone());
-                                if is_encrypted {
-                                    warn!(context, "Missing key for {addr}");
-                                }
-                            }
                         }
 
                         debug_assert!(member_timestamps.len() >= to.len());

src/receive_imf.rs

@@ -335,13 +335,7 @@ pub(crate) async fn receive_imf_inner(
         &mime_parser.recipients,
         &mime_parser.gossiped_keys,
         &[], // TODO use To fingerprints
-        if !mime_parser.incoming {
-            Origin::OutgoingTo
-        } else if incoming_origin.is_known() {
-            Origin::IncomingTo
-        } else {
-            Origin::IncomingUnknownTo
-        },
+        Origin::Hidden
     )
     .await?;
 
@@ -354,8 +348,14 @@ pub(crate) async fn receive_imf_inner(
                 lookup_pgp_contacts_by_address_list(context, &mime_parser.past_members, &past_members_fingerprints, chat_id)
                     .await?;
         } else {
-            // TODO: lookup by fingerprints if they are available.
-            past_ids = vec![None; mime_parser.past_members.len()];
+            past_ids = add_or_lookup_pgp_contacts_by_address_list(
+                context,
+                &mime_parser.past_members,
+                &mime_parser.gossiped_keys,
+                &past_members_fingerprints,
+                Origin::Hidden
+            )
+            .await?;
         }
     } else {
         if pgp_to_ids.len() == 1
@@ -3176,17 +3176,22 @@ async fn add_or_lookup_pgp_contacts_by_address_list(
     origin: Origin,
 ) -> Result<Vec<Option<ContactId>>> {
     let mut contact_ids = Vec::new();
+    let mut fingerprint_iter = fingerprints.iter();
     for info in address_list {
         let addr = &info.addr;
         if !may_be_valid_addr(addr) {
             contact_ids.push(None);
             continue;
         }
-        let Some(key) = gossiped_keys.get(addr) else {
+        let fingerprint: String = if let Some(fp) = fingerprint_iter.next() {
+            // Iterator has not ran out of fingerprints yet.
+            fp.hex()
+        } else if let Some(key) = gossiped_keys.get(addr) {
+            key.dc_fingerprint().hex()
+        } else {
             contact_ids.push(None);
             continue;
         };
-        let fingerprint = key.dc_fingerprint().hex();
         let display_name = info.display_name.as_deref();
         if let Ok(addr) = ContactAddress::new(addr) {
             let (contact_id, _) = Contact::add_or_lookup_ex(
@@ -3279,6 +3284,8 @@ async fn lookup_pgp_contacts_by_address_list(
     fingerprints: &[Fingerprint],
     chat_id: ChatId,
 ) -> Result<Vec<Option<ContactId>>> {
+    // TODO: create a contact with a given fingerprint
+    // if fingerprint is available.
     let mut contact_ids = Vec::new();
     for info in address_list {
         let addr = &info.addr;