Fix python/tests/test_1_online.py::test_add_remove_member_remote_events

Author: link2xt

src/receive_imf.rs

@@ -2284,26 +2284,43 @@ async fn apply_group_changes(
                         chat_group_member_timestamps.iter().take(to_ids.len()),
                     ) {
                         if *contact_id != from_id {
-                            transaction.execute(
+                            let modified = transaction.execute(
                                 "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)",
+                                 DO
+                                   UPDATE SET add_timestamp=?3
+                                   WHERE ?3>add_timestamp AND ?3>=remove_timestamp",
                                 (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;
+                            }
                         }
                     }
 
                     for (contact_id, ts) in std::iter::zip(
                         past_ids.iter(),
                         chat_group_member_timestamps.iter().skip(to_ids.len()),
                     ) {
-                        transaction.execute(
+                        let modified = transaction.execute(
                             "UPDATE chats_contacts
-                             SET remove_timestamp=MAX(remove_timestamp, ?)
-                             WHERE chat_id=? AND contact_id=?",
+                             SET remove_timestamp=?1
+                             WHERE chat_id=?2 AND contact_id=?3
+                             AND ?1>remove_timestamp AND ?1>add_timestamp",
                             (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(())