Merge pull request #636 from ReagentX/feat/cs/fix-contact-filter

Fix #635

Author: ReagentX

imessage-exporter/src/app/contacts.rs

@@ -1,5 +1,5 @@
 use std::{
-    collections::HashMap,
+    collections::{HashMap, HashSet},
     fs,
     path::{Path, PathBuf},
 };
@@ -23,6 +23,8 @@ pub struct Name {
     pub full: String,
     /// Combined handle details from iMessage's database
     pub details: String,
+    /// Set of original handle IDs that map to this name
+    pub handle_ids: HashSet<i32>,
 }
 
 impl Name {
@@ -50,6 +52,7 @@ impl Name {
             last: last.unwrap_or_default(),
             full,
             details: String::new(),
+            handle_ids: HashSet::new(),
         })
     }
 
@@ -82,6 +85,7 @@ impl Name {
             last: String::new(),
             full: String::new(),
             details: details.into(),
+            handle_ids: HashSet::new(),
         }
     }
 }
@@ -95,6 +99,7 @@ impl Name {
             last: String::new(),
             full: String::new(),
             details: name.to_string(),
+            handle_ids: HashSet::new(),
         }
     }
 }
@@ -244,18 +249,28 @@ impl ContactsIndex {
         participants: &HashMap<i32, String>,
         deduped_handles: &HashMap<i32, i32>,
     ) -> HashMap<i32, Name> {
-        let mut result = HashMap::new();
-
-        for (handle_id, details) in participants {
-            if let Some(deduped_id) = deduped_handles.get(handle_id) {
-                let mut name = self
-                    .lookup(details)
-                    .unwrap_or_else(|| Name::from_details(details.clone()));
-
-                // Update details field for the resolved Name
-                name.details = details.clone();
-                result.insert(*deduped_id, name);
-            }
+        let mut result: HashMap<i32, Name> = HashMap::new();
+
+        for (&handle_id, details) in participants {
+            let Some(&deduped_id) = deduped_handles.get(&handle_id) else {
+                continue;
+            };
+
+            result
+                .entry(deduped_id)
+                .and_modify(|name| {
+                    name.handle_ids.insert(handle_id);
+                })
+                .or_insert_with(|| {
+                    let mut name = self
+                        .lookup(details)
+                        .unwrap_or_else(|| Name::from_details(details.clone()));
+
+                    // Keep the original details string for display/fallback
+                    name.details = details.clone();
+                    name.handle_ids.insert(handle_id);
+                    name
+                });
         }
 
         result

imessage-exporter/src/app/runtime.rs

@@ -279,15 +279,13 @@ impl Config {
             let mut included_handles: BTreeSet<i32> = BTreeSet::new();
 
             // First: Scan the list of participants for included handle IDs
-            self.participants
-                .iter()
-                .for_each(|(handle_id, handle_name)| {
-                    for included_name in &parsed_handle_filter {
-                        if handle_name.contains(included_name) {
-                            included_handles.insert(*handle_id);
-                        }
+            self.participants.iter().for_each(|(_, handle_name)| {
+                for included_name in &parsed_handle_filter {
+                    if handle_name.contains(included_name) {
+                        included_handles.extend(&handle_name.handle_ids);
                     }
-                });
+                }
+            });
 
             // Second: scan the list of chatrooms for IDs that contain the selected participants
             self.chatroom_participants
@@ -1111,6 +1109,11 @@ mod chat_filter_tests {
         app.participants.insert(12, Name::fake_name("Person 12")); // Included
         app.participants.insert(13, Name::fake_name("Person 13")); // Excluded
 
+        // Set the chatroom participant IDs
+        for (id, participant) in app.participants.iter_mut() {
+            participant.handle_ids.insert(*id);
+        }
+
         // Chatroom 1: Included
         let mut chatroom_1 = BTreeSet::new();
         chatroom_1.insert(10);
@@ -1169,6 +1172,11 @@ mod chat_filter_tests {
         app.participants.insert(12, Name::fake_name("Person 12")); // Excluded
         app.participants.insert(13, Name::fake_name("Person 13")); // Included
 
+        // Set the chatroom participant IDs
+        for (id, participant) in app.participants.iter_mut() {
+            participant.handle_ids.insert(*id);
+        }
+
         // Chatroom 1: Excluded
         let mut chatroom_1 = BTreeSet::new();
         chatroom_1.insert(10);