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

Do not count info messages for deaddrop chat

Browse Source 
Info messages are not displayed in contact requests, so they should
not be counted in get_msg_cnt() and get_fresh_msg_cnt() too.
This commit is contained in:
link2xt
2021-06-20 00:00:00 +00:00
parent 1a830c23b5
commit c08df8d3da
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/chat.rs
View File

@@ -587,8 +587,9 @@ impl ChatId {
"SELECT COUNT(*) "SELECT COUNT(*)
FROM msgs FROM msgs
WHERE hidden=0 WHERE hidden=0
AND from_id!=?
AND chat_id IN (SELECT id FROM chats WHERE blocked=?)", AND chat_id IN (SELECT id FROM chats WHERE blocked=?)",
paramsv![Blocked::Deaddrop], paramsv![DC_CONTACT_ID_INFO, Blocked::Deaddrop],
) )
.await? .await?
} else { } else {
@@ -622,8 +623,9 @@ impl ChatId {
FROM msgs FROM msgs
WHERE state=? WHERE state=?
AND hidden=0 AND hidden=0
AND from_id!=?
AND chat_id IN (SELECT id FROM chats WHERE blocked=?)", AND chat_id IN (SELECT id FROM chats WHERE blocked=?)",
paramsv![MessageState::InFresh, Blocked::Deaddrop], paramsv![MessageState::InFresh, DC_CONTACT_ID_INFO, Blocked::Deaddrop],
) )
.await? .await?
} else { } else {