Do not allow to add self to fix AEAP

deltachat · Jan 7, 2025 · 2f93ea9 · 2f93ea9
1 parent c5b004e
commit 2f93ea9
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/receive_imf.rs b/src/receive_imf.rs
@@ -2283,13 +2283,15 @@ async fn apply_group_changes(
                         to_ids.iter(),
                         chat_group_member_timestamps.iter().take(to_ids.len()),
                     ) {
-                        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)",
-                            (chat_id, contact_id, ts),
-                        )?;
+                        if *contact_id != from_id {
+                            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)",
+                                (chat_id, contact_id, ts),
+                            )?;
+                        }
                     }
 
                     for (contact_id, ts) in std::iter::zip(