From 399b971986c4854bc94cb1739d7f981641c2bcb8 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 5 Dec 2018 20:42:28 +0300 Subject: [PATCH] Slightly improve chat message notification count. GitOrigin-RevId: 5b57095c09a70b559528faeb9c16b741d5e1f034 --- td/telegram/MessagesManager.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index a7a6ccf5..ee6d15bb 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -17993,7 +17993,14 @@ int32 MessagesManager::get_dialog_pending_notification_count(Dialog *d) { return d->unread_mention_count; } - return d->server_unread_count + d->local_unread_count; // TODO remove/add messages with unread mentions + auto unread_count = d->server_unread_count + d->local_unread_count; + if (d->unread_mention_count == 0) { + return unread_count; + } + if (unread_count == 0) { + return d->unread_mention_count; + } + return unread_count; // TODO remove/add messages with unread mentions } bool MessagesManager::add_new_message_notification(Dialog *d, Message *m, bool force) {