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

Bring back the check that the contact's addr is no self addr in get_all()

Browse Source 
Create params_iter() and params_iterv![] helper functions
This commit is contained in:
Hocuri
2022-04-19 14:52:14 +02:00
committed by holger krekel
parent 684351c753
commit df5eb546e7
2 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/contact.rs
View File

@@ -24,6 +24,7 @@ use crate::message::MessageState;
use crate::mimeparser::AvatarAction; use crate::mimeparser::AvatarAction;
use crate::param::{Param, Params}; use crate::param::{Param, Params};
use crate::peerstate::{Peerstate, PeerstateVerifiedStatus}; use crate::peerstate::{Peerstate, PeerstateVerifiedStatus};
use crate::sql::{self, params_iter};
use crate::{chat, stock_str}; use crate::{chat, stock_str};
/// Contact ID, including reserved IDs. /// Contact ID, including reserved IDs.
@@ -684,6 +685,7 @@ impl Contact {
listflags: u32, listflags: u32,
query: Option<impl AsRef<str>>, query: Option<impl AsRef<str>>,
) -> Result<Vec<ContactId>> { ) -> Result<Vec<ContactId>> {
let self_addrs = context.get_all_self_addrs().await?;
let mut add_self = false; let mut add_self = false;
let mut ret = Vec::new(); let mut ret = Vec::new();
let flag_verified_only = (listflags & DC_GCL_VERIFIED_ONLY) != 0; let flag_verified_only = (listflags & DC_GCL_VERIFIED_ONLY) != 0;
@@ -694,21 +696,25 @@ impl Contact {
context context
.sql .sql
.query_map( .query_map(
"SELECT c.id FROM contacts c \ format!(
"SELECT c.id FROM contacts c \
LEFT JOIN acpeerstates ps ON c.addr=ps.addr \ LEFT JOIN acpeerstates ps ON c.addr=ps.addr \
WHERE c.id>?1 \ WHERE c.addr NOT IN ({})
AND c.origin>=?2 \ AND c.id>? \
AND c.origin>=? \
AND c.blocked=0 \ AND c.blocked=0 \
AND (iif(c.name='',c.authname,c.name) LIKE ?3 OR c.addr LIKE ?4) \ AND (iif(c.name='',c.authname,c.name) LIKE ? OR c.addr LIKE ?) \
AND (1=?5 OR LENGTH(ps.verified_key_fingerprint)!=0) \ AND (1=? OR LENGTH(ps.verified_key_fingerprint)!=0) \
ORDER BY LOWER(iif(c.name='',c.authname,c.name)||c.addr),c.id;", ORDER BY LOWER(iif(c.name='',c.authname,c.name)||c.addr),c.id;",
paramsv![ sql::repeat_vars(self_addrs.len())?
),
rusqlite::params_from_iter(params_iter(&self_addrs).chain(params_iterv![
ContactId::LAST_SPECIAL, ContactId::LAST_SPECIAL,
Origin::IncomingReplyTo, Origin::IncomingReplyTo,
s3str_like_cmd, s3str_like_cmd,
s3str_like_cmd, s3str_like_cmd,
if flag_verified_only { 0i32 } else { 1i32 }, if flag_verified_only { 0i32 } else { 1i32 },
], ])),
|row| row.get::<_, ContactId>(0), |row| row.get::<_, ContactId>(0),
|ids| { |ids| {
for id in ids { for id in ids {
@@ -742,12 +748,19 @@ impl Contact {
context context
.sql .sql
.query_map( .query_map(
"SELECT id FROM contacts format!(
WHERE id>?1 "SELECT id FROM contacts
AND origin>=?2 WHERE addr NOT IN ({})
AND id>?
AND origin>=?
AND blocked=0 AND blocked=0
ORDER BY LOWER(iif(name='',authname,name)||addr),id;", ORDER BY LOWER(iif(name='',authname,name)||addr),id;",
paramsv![ContactId::LAST_SPECIAL, Origin::IncomingReplyTo], sql::repeat_vars(self_addrs.len())?
),
rusqlite::params_from_iter(params_iter(&self_addrs).chain(params_iterv![
ContactId::LAST_SPECIAL,
Origin::IncomingReplyTo
])),
|row| row.get::<_, ContactId>(0), |row| row.get::<_, ContactId>(0),
|ids| { |ids| {
for id in ids { for id in ids {

11
src/sql.rs
View File

@@ -34,6 +34,17 @@ macro_rules! paramsv {
}; };
} }
#[macro_export]
macro_rules! params_iterv {
($($param:expr),+ $(,)?) => {
vec![$(&$param as &dyn $crate::ToSql),+]
};
}
pub(crate) fn params_iter(iter: &[impl crate::ToSql]) -> impl Iterator<Item = &dyn crate::ToSql> {
iter.iter().map(|item| item as &dyn crate::ToSql)
}
mod migrations; mod migrations;
/// A wrapper around the underlying Sqlite3 object. /// A wrapper around the underlying Sqlite3 object.