use update_chats_contacts_timestamps

Author: link2xt

src/receive_imf.rs

@@ -2059,58 +2059,16 @@ async fn create_group(
         chat_id_blocked = create_blocked;
 
         // Create initial member list.
-        if let Some(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=MAX(add_timestamp, ?3)",
-                        )?;
-
-                        for (contact_id, ts) in iter::zip(
-                            to_ids.iter(),
-                            chat_group_member_timestamps.iter().take(to_ids.len()),
-                        ) {
-                            add_statement.execute((chat_id, contact_id, ts))?;
-                        }
-
-                        let mut remove_statement = transaction.prepare(
-                            "UPDATE chats_contacts
-                             SET remove_timestamp=MAX(remove_timestamp, ?)
-                             WHERE chat_id=? AND contact_id=?",
-                        )?;
-
-                        for (contact_id, ts) in iter::zip(
-                            past_ids.iter(),
-                            chat_group_member_timestamps.iter().skip(to_ids.len()),
-                        ) {
-                            remove_statement.execute((ts, chat_id, contact_id))?;
-                        }
-
-                        if !to_ids.contains(&from_id) {
-                            add_statement.execute((
-                                chat_id,
-                                from_id,
-                                mime_parser.timestamp_sent,
-                            ))?;
-                        }
-
-                        Ok(())
-                    })
-                    .await?;
-            } else {
-                warn!(
-                    context,
-                    "Chat-Group-Member-Timestamps has wrong number of timestamps, got {}, expected {}.",
-                    chat_group_member_timestamps.len(),
-                    expected_timestamps_count
-                );
+        if let Some(mut chat_group_member_timestamps) = mime_parser.chat_group_member_timestamps() {
+            let mut new_to_ids = to_ids.to_vec();
+            if !new_to_ids.contains(&from_id) {
+                new_to_ids.insert(0, from_id);
+                chat_group_member_timestamps.insert(0, mime_parser.timestamp_sent);
             }
+
+            update_chats_contacts_timestamps(
+                context, new_chat_id, None,
+                &new_to_ids, past_ids, &chat_group_member_timestamps).await?;
         } else {
             let mut members = vec![ContactId::SELF];
             if !from_id.is_special() {