From e046e2ced4777812c2539334a866fe360dbf177b Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 6 Jun 2020 00:53:13 +0300
Subject: [PATCH] Improve need_dialog_in_filter behavior.

GitOrigin-RevId: 56ccaa30c748e1ac4c5850185f0682c61556b17e
---
 td/telegram/MessagesManager.cpp | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index c0e71bbd8..ead2b8c34 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -31090,11 +31090,13 @@ bool MessagesManager::need_dialog_in_filter(const Dialog *d, const DialogFilter
       }
     }
   }
-  if (filter->exclude_muted && is_dialog_muted(d)) {
-    return false;
-  }
-  if (filter->exclude_read && d->server_unread_count + d->local_unread_count == 0 && !d->is_marked_as_unread) {
-    return false;
+  if (d->unread_mention_count == 0 || is_dialog_mention_notifications_disabled(d)) {
+    if (filter->exclude_muted && is_dialog_muted(d)) {
+      return false;
+    }
+    if (filter->exclude_read && d->server_unread_count + d->local_unread_count == 0 && !d->is_marked_as_unread) {
+      return false;
+    }
   }
   if (filter->exclude_archived && d->folder_id == FolderId::archive()) {
     return false;
@@ -31105,7 +31107,7 @@ bool MessagesManager::need_dialog_in_filter(const Dialog *d, const DialogFilter
       if (td_->contacts_manager_->is_user_bot(user_id)) {
         return filter->include_bots;
       }
-      if (td_->contacts_manager_->is_user_contact(user_id)) {
+      if (user_id == td_->contacts_manager_->get_my_id() || td_->contacts_manager_->is_user_contact(user_id)) {
         return filter->include_contacts;
       }
       return filter->include_non_contacts;