Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-16 05:16:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix try2

Browse Source
This commit is contained in:
holger krekel
2019-09-08 18:41:05 +02:00
parent 87c8c5a363
commit 1c359bcd88
1 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/dc_receive_imf.rs
View File

@@ -1,6 +1,8 @@
use std::ptr; use std::ptr;
use itertools::join; use itertools::join;
use std::collections::HashMap;
use mmime::mailimf::*; use mmime::mailimf::*;
use mmime::mailimf_types::*; use mmime::mailimf_types::*;
use mmime::mailmime::*; use mmime::mailmime::*;
@@ -1682,7 +1684,7 @@ fn search_chat_ids_by_contact_ids(
) -> Vec<u32> { ) -> Vec<u32> {
/* searches chat_id's by the given contact IDs, may return zero, one or more chat_id's */ /* searches chat_id's by the given contact IDs, may return zero, one or more chat_id's */
let mut contact_ids = Vec::with_capacity(23); let mut match_contact_ids = Vec::with_capacity(23);
let mut chat_ids = Vec::with_capacity(23); let mut chat_ids = Vec::with_capacity(23);
if unsorted_contact_ids.is_empty() { if unsorted_contact_ids.is_empty() {
@@ -1691,46 +1693,40 @@ fn search_chat_ids_by_contact_ids(
/* copy array, remove duplicates and SELF, sort by ID */ /* copy array, remove duplicates and SELF, sort by ID */
for &curr_id in unsorted_contact_ids { for &curr_id in unsorted_contact_ids {
if curr_id != DC_CONTACT_ID_SELF && !contact_ids.contains(&curr_id) { if curr_id != DC_CONTACT_ID_SELF && !match_contact_ids.contains(&curr_id) {
contact_ids.push(curr_id); match_contact_ids.push(curr_id);
} }
} }
if contact_ids.is_empty() { if match_contact_ids.is_empty() {
return chat_ids; return chat_ids;
} }
/* collect all possible chats with the contact count as the data (as contact_ids have no doubles, this is sufficient) */ /* collect all possible chats which contain at least one contact */
contact_ids.sort();
let contact_ids_str = join(contact_ids.iter().map(|x| x.to_string()), ",");
context.sql.query_map( context.sql.query_map(
format!( format!(
"SELECT DISTINCT cc.chat_id, cc.contact_id FROM chats_contacts cc LEFT JOIN chats c ON c.id=cc.chat_id WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({})) AND c.type=120 AND cc.contact_id!=1 ORDER BY cc.chat_id, cc.contact_id;", "SELECT DISTINCT cc.chat_id, cc.contact_id FROM chats_contacts cc LEFT JOIN chats c ON c.id=cc.chat_id WHERE cc.chat_id IN(SELECT chat_id FROM chats_contacts WHERE contact_id IN({})) AND c.type=120 AND cc.contact_id!=1 ORDER BY cc.chat_id, cc.contact_id;",
contact_ids_str join(match_contact_ids.iter().map(|x| x.to_string()), ",")
), ),
params![], params![],
|row| Ok((row.get::<_, u32>(0)?, row.get::<_, u32>(1)?)), |row| Ok((row.get::<_, u32>(0)?, row.get::<_, u32>(1)?)),
|rows| { |rows| {
let mut chat2contacts = HashMap<u32, Vec<u32>>::new(); // per-chat count all matching contacts and add chat-id
// if all matching contacts are seen
let mut chat2matches = HashMap::new();
for row in rows { for row in rows {
let (chat_id, contact_id) = row?; let (chat_id, contact_id) = row?;
let mut contacts: Vec<u32>; if match_contact_ids.contains(&contact_id) {
contacts = match chat2contacts.get(chat_id) { let count = if let Some(x) = chat2matches.get_mut(&chat_id) {
Some(c) => c, *x = *x + 1;
None => { *x
l = Vec<u32>::default(); } else {
chat2contacts.insert(chat_id, l); chat2matches.insert(chat_id, 1);
l 1
} };
} if count == match_contact_ids.len() {
contacts.push(contact_id); chat_ids.push(chat_id)
} }
for (&chat_id, &contacts) in chat2contacts.iter_mut() {
contacts.retain(|x| {
contact_ids.contains(x)
});
if contacts.len() == contact_ids.len() {
chat_ids.push(chat_id)
} }
} }
Ok(()) Ok(())