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

target comments of @link2xt, fix ci

Browse Source
This commit is contained in:
B. Petersen
2020-03-09 12:11:01 +01:00
committed by Alexander Krotov
parent 9f19d20344
commit be0afdebfd
3 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/message.rs
View File

@@ -1385,17 +1385,10 @@ pub fn estimate_deletion_cnt(
"SELECT COUNT(*)
FROM msgs m
WHERE m.id > ?
AND (state = ? OR state >= ?)
AND chat_id != ?
AND timestamp < ?
AND chat_id != ?
AND server_uid != 0;",
params![
DC_MSG_ID_LAST_SPECIAL,
MessageState::InSeen,
MessageState::OutFailed,
self_chat_id,
threshold_timestamp
],
params![DC_MSG_ID_LAST_SPECIAL, threshold_timestamp, self_chat_id],
|row| row.get(0),
)?;
} else {
@@ -1403,16 +1396,13 @@ pub fn estimate_deletion_cnt(
"SELECT COUNT(*)
FROM msgs m
WHERE m.id > ?
AND (state = ? OR state >= ?)
AND chat_id != ?
AND timestamp < ?
AND chat_id != ?;",
AND chat_id != ?
AND chat_id != ? AND hidden = 0;",
params![
DC_MSG_ID_LAST_SPECIAL,
MessageState::InSeen,
MessageState::OutFailed,
self_chat_id,
threshold_timestamp,
self_chat_id,
ChatId::new(DC_CHAT_ID_TRASH)
],
|row| row.get(0),