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

fix: get_contacts logic was broken

Browse Source
This commit is contained in:
dignifiedquire
2019-07-12 11:17:49 +02:00
parent 08d8eebc37
commit 9d2ee5c0f7
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/dc_contact.rs
View File

@@ -13,6 +13,8 @@ use crate::peerstate::*;
use crate::types::*;
use crate::x::*;
const DC_GCL_VERIFIED_ONLY: u32 = 0x01;
#[derive(Copy, Clone)]
#[repr(C)]
pub struct dc_contact_t<'a> {
@@ -523,23 +525,9 @@ pub fn dc_get_contacts(
let mut add_self = false;
let ret = unsafe { dc_array_new(100) };
if 0 == listflags & 0x1 || query.is_null() {
add_self = true;
context.sql.query_map(
"SELECT id FROM contacts WHERE addr!=?1 AND id>?2 AND origin>=?3 AND blocked=0 ORDER BY LOWER(name||addr),id;",
params![self_addr, 9, 0x100],
|row| row.get::<_, i32>(0),
|ids| {
for id in ids {
unsafe { dc_array_add_id(ret, id? as u32) };
}
Ok(())
}
).unwrap(); // TODO: better error handling
} else {
if (listflags & DC_GCL_VERIFIED_ONLY) > 0 || !query.is_null() {
let s3strLikeCmd = format!("%{}%", if !query.is_null() { as_str(query) } else { "" });
eprintln!("query '{}'", &s3strLikeCmd);
context
.sql
.query_map(
@@ -583,6 +571,20 @@ pub fn dc_get_contacts(
add_self = true;
}
unsafe { free(self_name2 as *mut _) };
} else {
add_self = true;
context.sql.query_map(
"SELECT id FROM contacts WHERE addr!=?1 AND id>?2 AND origin>=?3 AND blocked=0 ORDER BY LOWER(name||addr),id;",
params![self_addr, 9, 0x100],
|row| row.get::<_, i32>(0),
|ids| {
for id in ids {
unsafe { dc_array_add_id(ret, id? as u32) };
}
Ok(())
}
).unwrap(); // TODO: better error handling
}
if 0 != listflags & 0x2 && add_self {