factor out update_chats_contacts_timestamps

Author: link2xt

src/receive_imf.rs

@@ -2150,6 +2150,76 @@ async fn create_group(
     }
 }
 
+async fn update_chats_contacts_timestamps(
+    context: &Context,
+    chat_id: ChatId,
+    from_id: ContactId,
+    to_ids: &[ContactId],
+    past_ids: &[ContactId],
+    chat_group_member_timestamps: &[i64],
+) -> Result<bool> {
+    let expected_timestamps_count = to_ids.len() + past_ids.len();
+
+    if chat_group_member_timestamps.len() != expected_timestamps_count {
+        warn!(
+            context,
+            "Chat-Group-Member-Timestamps has wrong number of timestamps, got {}, expected {}.",
+            chat_group_member_timestamps.len(),
+            expected_timestamps_count
+        );
+        return Ok(false);
+    }
+
+    let mut modified = false;
+
+    context
+        .sql
+        .transaction(|transaction| {
+            let mut add_statement = transaction.prepare(
+                "INSERT INTO chats_contacts (chat_id, contact_id, add_timestamp)
+                         VALUES                     (?1,      ?2,         ?3)
+                         ON CONFLICT (chat_id, contact_id)
+                         DO
+                           UPDATE SET add_timestamp=?3
+                           WHERE ?3>add_timestamp AND ?3>=remove_timestamp",
+            )?;
+
+            for (contact_id, ts) in iter::zip(
+                to_ids.iter(),
+                chat_group_member_timestamps.iter().take(to_ids.len()),
+            ) {
+                if *contact_id != from_id {
+                    // It could be that member was already added,
+                    // but updated addition timestamp
+                    // is also a modification worth notifying about.
+                    modified |= add_statement.execute((chat_id, contact_id, ts))? > 0;
+                }
+            }
+
+            let mut remove_statement = transaction.prepare(
+                "UPDATE chats_contacts
+                 SET remove_timestamp=?1
+                 WHERE chat_id=?2 AND contact_id=?3
+                 AND ?1>remove_timestamp AND ?1>add_timestamp",
+            )?;
+
+            for (contact_id, ts) in iter::zip(
+                past_ids.iter(),
+                chat_group_member_timestamps.iter().skip(to_ids.len()),
+            ) {
+                // It could be that member was already removed,
+                // but updated removal timestamp
+                // is also a modification worth notifying about.
+                modified |= remove_statement.execute((ts, chat_id, contact_id))? > 0;
+            }
+
+            Ok(())
+        })
+        .await?;
+
+    Ok(modified)
+}
+
 /// Apply group member list, name, avatar and protection status changes from the MIME message.
 ///
 /// Returns `Vec` of group changes messages and, optionally, a better message to replace the
@@ -2286,69 +2356,9 @@ async fn apply_group_changes(
     let mut removed_ids = HashSet::<ContactId>::new();
 
     if let Some(ref chat_group_member_timestamps) = mime_parser.chat_group_member_timestamps() {
-        let expected_timestamps_count = to_ids.len() + past_ids.len();
-        if chat_group_member_timestamps.len() == expected_timestamps_count {
-            context
-                .sql
-                .transaction(|transaction| {
-                    let mut add_statement = transaction.prepare(
-                        "INSERT INTO chats_contacts (chat_id, contact_id, add_timestamp)
-                         VALUES                     (?1,      ?2,         ?3)
-                         ON CONFLICT (chat_id, contact_id)
-                         DO
-                           UPDATE SET add_timestamp=?3
-                           WHERE ?3>add_timestamp AND ?3>=remove_timestamp",
-                    )?;
-
-                    for (contact_id, ts) in iter::zip(
-                        to_ids.iter(),
-                        chat_group_member_timestamps.iter().take(to_ids.len()),
-                    ) {
-                        if *contact_id != from_id {
-                            let modified = add_statement.execute((chat_id, contact_id, ts))? > 0;
-
-                            if modified {
-                                // It could be that member was already added,
-                                // but updated addition timestamp
-                                // is also a modification worth notifying about.
-                                send_event_chat_modified = true;
-                            }
-                        }
-                    }
-
-                    let mut remove_statement = transaction.prepare(
-                        "UPDATE chats_contacts
-                         SET remove_timestamp=?1
-                         WHERE chat_id=?2 AND contact_id=?3
-                         AND ?1>remove_timestamp AND ?1>add_timestamp",
-                    )?;
-
-                    for (contact_id, ts) in iter::zip(
-                        past_ids.iter(),
-                        chat_group_member_timestamps.iter().skip(to_ids.len()),
-                    ) {
-                        let modified = remove_statement.execute((ts, chat_id, contact_id))? > 0;
-
-                        if modified {
-                            // It could be that member was already removed,
-                            // but updated removal timestamp
-                            // is also a modification worth notifying about.
-                            send_event_chat_modified = true;
-                        }
-                    }
-
-                    Ok(())
-                })
+        send_event_chat_modified |=
+            update_chats_contacts_timestamps(context, chat_id, from_id, to_ids, past_ids, &chat_group_member_timestamps)
                 .await?;
-        } else {
-            warn!(
-                context,
-                "Chat-Group-Member-Timestamps has wrong number of timestamps, got {}, expected {}.",
-                chat_group_member_timestamps.len(),
-                expected_timestamps_count
-            );
-        }
-
         let new_chat_contacts = HashSet::<ContactId>::from_iter(
             chat::get_chat_contacts(context, chat_id)
                 .await?