refactor: receive_imf: Don't abort processing message on non-critical errors

Follow-up to f27d54f. Non-critical errors shouldn't lead to missing messages.

Author: iequidoo

src/receive_imf.rs

@@ -1952,7 +1952,9 @@ async fn add_parts(
             None,
             added_removed_id,
         )
-        .await?;
+        .await
+        .log_err(context)
+        .ok();
     }
 
     if let Some(node_addr) = mime_parser.get_header(HeaderDef::IrohNodeAddr) {
@@ -2156,13 +2158,19 @@ RETURNING id
             if let Some(topic) = mime_parser.get_header(HeaderDef::IrohGossipTopic) {
                 // default encoding of topic ids is `hex`.
                 let mut topic_raw = [0u8; 32];
-                BASE32_NOPAD
+                if BASE32_NOPAD
                     .decode_mut(topic.to_ascii_uppercase().as_bytes(), &mut topic_raw)
                     .map_err(|e| e.error)
-                    .context("Wrong gossip topic header")?;
-
-                let topic = TopicId::from_bytes(topic_raw);
-                insert_topic_stub(context, *msg_id, topic).await?;
+                    .context("Wrong gossip topic header")
+                    .log_err(context)
+                    .is_ok()
+                {
+                    let topic = TopicId::from_bytes(topic_raw);
+                    insert_topic_stub(context, *msg_id, topic)
+                        .await
+                        .log_err(context)
+                        .ok();
+                }
             } else {
                 warn!(context, "webxdc doesn't have a gossip topic")
             }
@@ -2175,7 +2183,9 @@ RETURNING id
             part.param.get(Param::Filename),
             *msg_id,
         )
-        .await?;
+        .await
+        .log_err(context)
+        .ok();
     }
 
     if let Some(replace_msg_id) = replace_msg_id {
@@ -3647,7 +3657,10 @@ async fn mark_recipients_as_verified(
         }
 
         mark_contact_id_as_verified(context, to_id, from_id).await?;
-        ChatId::set_protection_for_contact(context, to_id, mimeparser.timestamp_sent).await?;
+        ChatId::set_protection_for_contact(context, to_id, mimeparser.timestamp_sent)
+            .await
+            .log_err(context)
+            .ok();
     }
 
     Ok(())
@@ -3709,21 +3722,24 @@ async fn add_or_lookup_contacts_by_address_list(
 ) -> Result<Vec<Option<ContactId>>> {
     let mut contact_ids = Vec::new();
     for info in address_list {
+        contact_ids.push(None);
         let addr = &info.addr;
         if !may_be_valid_addr(addr) {
-            contact_ids.push(None);
             continue;
         }
         let display_name = info.display_name.as_deref();
-        if let Ok(addr) = ContactAddress::new(addr) {
-            let (contact_id, _) =
-                Contact::add_or_lookup(context, display_name.unwrap_or_default(), &addr, origin)
-                    .await?;
-            contact_ids.push(Some(contact_id));
-        } else {
+        let Ok(addr) = ContactAddress::new(addr) else {
             warn!(context, "Contact with address {:?} cannot exist.", addr);
-            contact_ids.push(None);
-        }
+            continue;
+        };
+        let contact_id =
+            Contact::add_or_lookup(context, display_name.unwrap_or_default(), &addr, origin)
+                .await
+                .log_err(context)
+                .ok()
+                .map(|(id, _)| id);
+        contact_ids.pop();
+        contact_ids.push(contact_id);
     }
 
     Ok(contact_ids)
@@ -3740,9 +3756,9 @@ async fn add_or_lookup_key_contacts_by_address_list(
     let mut contact_ids = Vec::new();
     let mut fingerprint_iter = fingerprints.iter();
     for info in address_list {
+        contact_ids.push(None);
         let addr = &info.addr;
         if !may_be_valid_addr(addr) {
-            contact_ids.push(None);
             continue;
         }
         let fingerprint: String = if let Some(fp) = fingerprint_iter.next() {
@@ -3751,24 +3767,26 @@ async fn add_or_lookup_key_contacts_by_address_list(
         } else if let Some(key) = gossiped_keys.get(addr) {
             key.dc_fingerprint().hex()
         } else {
-            contact_ids.push(None);
             continue;
         };
         let display_name = info.display_name.as_deref();
-        if let Ok(addr) = ContactAddress::new(addr) {
-            let (contact_id, _) = Contact::add_or_lookup_ex(
-                context,
-                display_name.unwrap_or_default(),
-                &addr,
-                &fingerprint,
-                origin,
-            )
-            .await?;
-            contact_ids.push(Some(contact_id));
-        } else {
+        let Ok(addr) = ContactAddress::new(addr) else {
             warn!(context, "Contact with address {:?} cannot exist.", addr);
-            contact_ids.push(None);
-        }
+            continue;
+        };
+        let contact_id = Contact::add_or_lookup_ex(
+            context,
+            display_name.unwrap_or_default(),
+            &addr,
+            &fingerprint,
+            origin,
+        )
+        .await
+        .log_err(context)
+        .ok()
+        .map(|(id, _)| id);
+        contact_ids.pop();
+        contact_ids.push(contact_id);
     }
 
     ensure_and_debug_assert_eq!(contact_ids.len(), address_list.len(),);
@@ -3899,35 +3917,41 @@ async fn lookup_key_contacts_by_address_list(
     let mut contact_ids = Vec::new();
     let mut fingerprint_iter = fingerprints.iter();
     for info in address_list {
+        contact_ids.push(None);
         let addr = &info.addr;
         if !may_be_valid_addr(addr) {
-            contact_ids.push(None);
             continue;
         }
 
-        if let Some(fp) = fingerprint_iter.next() {
+        let contact_id = if let Some(fp) = fingerprint_iter.next() {
             // Iterator has not ran out of fingerprints yet.
             let display_name = info.display_name.as_deref();
             let fingerprint: String = fp.hex();
 
-            if let Ok(addr) = ContactAddress::new(addr) {
-                let (contact_id, _) = Contact::add_or_lookup_ex(
-                    context,
-                    display_name.unwrap_or_default(),
-                    &addr,
-                    &fingerprint,
-                    Origin::Hidden,
-                )
-                .await?;
-                contact_ids.push(Some(contact_id));
-            } else {
+            let Ok(addr) = ContactAddress::new(addr) else {
                 warn!(context, "Contact with address {:?} cannot exist.", addr);
-                contact_ids.push(None);
-            }
+                continue;
+            };
+            Contact::add_or_lookup_ex(
+                context,
+                display_name.unwrap_or_default(),
+                &addr,
+                &fingerprint,
+                Origin::Hidden,
+            )
+            .await
+            .log_err(context)
+            .ok()
+            .map(|(id, _)| id)
         } else {
-            let contact_id = lookup_key_contact_by_address(context, addr, chat_id).await?;
-            contact_ids.push(contact_id);
-        }
+            lookup_key_contact_by_address(context, addr, chat_id)
+                .await
+                .log_err(context)
+                .ok()
+                .flatten()
+        };
+        contact_ids.pop();
+        contact_ids.push(contact_id);
     }
     ensure_and_debug_assert_eq!(address_list.len(), contact_ids.len(),);
     Ok(contact_ids)