From c08df8d3da014018a29f88db490d90a4d5e92f2f Mon Sep 17 00:00:00 2001
From: link2xt <link2xt@testrun.org>
Date: Sun, 20 Jun 2021 00:00:00 +0000
Subject: [PATCH] Do not count info messages for deaddrop chat

Info messages are not displayed in contact requests, so they should
not be counted in get_msg_cnt() and get_fresh_msg_cnt() too.
---
 src/chat.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/chat.rs b/src/chat.rs
index eedf11608..33eed5572 100644
--- a/src/chat.rs
+++ b/src/chat.rs
@@ -587,8 +587,9 @@ impl ChatId {
                     "SELECT COUNT(*)
                     FROM msgs
                     WHERE hidden=0
+                    AND from_id!=?
                     AND chat_id IN (SELECT id FROM chats WHERE blocked=?)",
-                    paramsv![Blocked::Deaddrop],
+                    paramsv![DC_CONTACT_ID_INFO, Blocked::Deaddrop],
                 )
                 .await?
         } else {
@@ -622,8 +623,9 @@ impl ChatId {
                     FROM msgs
                     WHERE state=?
                     AND hidden=0
+                    AND from_id!=?
                     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?
         } else {