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

chat: make get_msg_cnt() and get_fresh_msg_cnt() work for deaddrop

Browse Source 
Also do not count hidden messages in get_msg_cnt().
This commit is contained in:
link2xt
2021-06-13 20:54:30 +03:00
parent ad7c7e90b3
commit 62388514dd
2 changed files with 45 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
python/tests/test_account.py
View File

@@ -983,7 +983,7 @@ class TestOnlineAccount:
chat2 = msg2.chat chat2 = msg2.chat
assert msg2 in chat2.get_messages() assert msg2 in chat2.get_messages()
assert chat2.is_deaddrop() assert chat2.is_deaddrop()
assert chat2.count_fresh_messages() == 0 assert chat2.count_fresh_messages() == 1
assert msg2.time_received >= msg1.time_sent assert msg2.time_received >= msg1.time_sent
lp.sec("create new chat with contact and verify it's proper") lp.sec("create new chat with contact and verify it's proper")

56
src/chat.rs
View File

@@ -574,10 +574,26 @@ impl ChatId {
/// Returns number of messages in a chat. /// Returns number of messages in a chat.
pub async fn get_msg_cnt(self, context: &Context) -> Result<usize> { pub async fn get_msg_cnt(self, context: &Context) -> Result<usize> {
let count = context let count = if self.is_deaddrop() {
.sql context
.count("SELECT COUNT(*) FROM msgs WHERE chat_id=?", paramsv![self]) .sql
.await?; .count(
"SELECT COUNT(*)
FROM msgs
WHERE hidden=0
AND chat_id IN (SELECT id FROM chats WHERE blocked=?)",
paramsv![Blocked::Deaddrop],
)
.await?
} else {
context
.sql
.count(
"SELECT COUNT(*) FROM msgs WHERE hidden=0 AND chat_id=?",
paramsv![self],
)
.await?
};
Ok(count as usize) Ok(count as usize)
} }
@@ -592,17 +608,31 @@ impl ChatId {
// the times are average, no matter if there are fresh messages or not - // the times are average, no matter if there are fresh messages or not -
// and have to be multiplied by the number of items shown at once on the chatlist, // and have to be multiplied by the number of items shown at once on the chatlist,
// so savings up to 2 seconds are possible on older devices - newer ones will feel "snappier" :) // so savings up to 2 seconds are possible on older devices - newer ones will feel "snappier" :)
let count = context let count = if self.is_deaddrop() {
.sql context
.count( .sql
"SELECT COUNT(*) .count(
"SELECT COUNT(*)
FROM msgs
WHERE state=?
AND hidden=0
AND chat_id IN (SELECT id FROM chats WHERE blocked=?)",
paramsv![MessageState::InFresh, Blocked::Deaddrop],
)
.await?
} else {
context
.sql
.count(
"SELECT COUNT(*)
FROM msgs FROM msgs
WHERE state=10 WHERE state=?
AND hidden=0 AND hidden=0
AND chat_id=?;", AND chat_id=?;",
paramsv![self], paramsv![MessageState::InFresh, self],
) )
.await?; .await?
};
Ok(count as usize) Ok(count as usize)
} }
@@ -4005,6 +4035,8 @@ mod tests {
let chats = Chatlist::try_load(&t, 0, None, None).await?; let chats = Chatlist::try_load(&t, 0, None, None).await?;
assert_eq!(chats.len(), 1); assert_eq!(chats.len(), 1);
assert_eq!(chats.get_chat_id(0), DC_CHAT_ID_DEADDROP); assert_eq!(chats.get_chat_id(0), DC_CHAT_ID_DEADDROP);
assert_eq!(DC_CHAT_ID_DEADDROP.get_msg_cnt(&t).await?, 1);
assert_eq!(DC_CHAT_ID_DEADDROP.get_fresh_msg_cnt(&t).await?, 1);
let msgs = get_chat_msgs(&t, DC_CHAT_ID_DEADDROP, 0, None).await?; let msgs = get_chat_msgs(&t, DC_CHAT_ID_DEADDROP, 0, None).await?;
assert_eq!(msgs.len(), 1); assert_eq!(msgs.len(), 1);
let msg_id = match msgs.first().unwrap() { let msg_id = match msgs.first().unwrap() {