feat: expire past members after 60 days

Author: link2xt

src/chat.rs

@@ -3464,16 +3464,19 @@ pub async fn get_chat_contacts(context: &Context, chat_id: ChatId) -> Result<Vec
 
 /// Returns a vector of contact IDs for given chat ID that are no longer part of the group.
 pub async fn get_past_chat_contacts(context: &Context, chat_id: ChatId) -> Result<Vec<ContactId>> {
+    let now = time();
     let list = context
         .sql
         .query_map(
             "SELECT cc.contact_id
              FROM chats_contacts cc
              LEFT JOIN contacts c
                   ON c.id=cc.contact_id
-             WHERE cc.chat_id=? AND cc.add_timestamp < cc.remove_timestamp
+             WHERE cc.chat_id=?
+             AND cc.add_timestamp < cc.remove_timestamp
+             AND ? < cc.remove_timestamp
              ORDER BY c.id=1, c.last_seen DESC, c.id DESC",
-            (chat_id,),
+            (chat_id, now.saturating_sub(60 * 24 * 3600)),
             |row| row.get::<_, ContactId>(0),
             |ids| ids.collect::<Result<Vec<_>, _>>().map_err(Into::into),
         )
@@ -7896,4 +7899,40 @@ mod tests {
 
         Ok(())
     }
+
+    /// Test that past members expire after 60 days.
+    #[tokio::test(flavor = "multi_thread", worker_threads = 2)]
+    async fn test_expire_past_members_after_60_days() -> Result<()> {
+        let mut tcm = TestContextManager::new();
+
+        let alice = &tcm.alice().await;
+        let fiona_addr = "[email protected]";
+        let alice_fiona_contact_id = Contact::create(alice, "Fiona", fiona_addr).await?;
+
+        let alice_chat_id =
+            create_group_chat(alice, ProtectionStatus::Unprotected, "Group chat").await?;
+        add_contact_to_chat(alice, alice_chat_id, alice_fiona_contact_id).await?;
+        alice
+            .send_text(alice_chat_id, "Hi! I created a group.")
+            .await;
+        remove_contact_from_chat(alice, alice_chat_id, alice_fiona_contact_id).await?;
+        assert_eq!(get_past_chat_contacts(alice, alice_chat_id).await?.len(), 1);
+
+        SystemTime::shift(Duration::from_secs(60 * 24 * 60 * 60 + 1));
+        assert_eq!(get_past_chat_contacts(alice, alice_chat_id).await?.len(), 0);
+
+        let bob = &tcm.bob().await;
+        let bob_addr = bob.get_config(Config::Addr).await?.unwrap();
+        let alice_bob_contact_id = Contact::create(alice, "Bob", &bob_addr).await?;
+        add_contact_to_chat(alice, alice_chat_id, alice_bob_contact_id).await?;
+
+        let add_message = alice.pop_sent_msg().await;
+        assert_eq!(add_message.payload.contains(fiona_addr), false);
+        let bob_add_message = bob.recv_msg(&add_message).await;
+        let bob_chat_id = bob_add_message.chat_id;
+        assert_eq!(get_chat_contacts(bob, bob_chat_id).await?.len(), 2);
+        assert_eq!(get_past_chat_contacts(bob, bob_chat_id).await?.len(), 0);
+
+        Ok(())
+    }
 }

src/mimefactory.rs

@@ -154,6 +154,7 @@ fn new_address_with_name(name: &str, address: String) -> Address {
 
 impl MimeFactory {
     pub async fn from_msg(context: &Context, msg: Message) -> Result<MimeFactory> {
+        let now = time();
         let chat = Chat::load_from_db(context, msg.chat_id).await?;
         let attach_profile_data = Self::should_attach_profile_data(&msg);
         let undisclosed_recipients = chat.typ == Chattype::Broadcast;
@@ -239,7 +240,7 @@ impl MimeFactory {
                                     }
                                 }
                                 recipient_ids.insert(id);
-                            } else {
+                            } else if remove_timestamp.saturating_add(60 * 24 * 3600) > now {
                                 // Row is a tombstone,
                                 // member is not actually part of the group.
                                 if !recipients_contain_addr(&past_members, &addr) {