From fbeea0b10862134fd6b4721aed68dc0b1e380e47 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Mon, 12 Oct 2020 10:56:01 +0300
Subject: [PATCH] Add is_deleted_secret_chat method.

GitOrigin-RevId: eae2a7bcdf92587bbd77cf7c42c210b74107d8a4
---
 td/telegram/MessagesManager.cpp | 27 ++++++++++++++++++++++-----
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index cc05c2e4a..8fea014fb 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -23714,6 +23714,26 @@ bool MessagesManager::is_broadcast_channel(DialogId dialog_id) const {
   return td_->contacts_manager_->get_channel_type(dialog_id.get_channel_id()) == ChannelType::Broadcast;
 }
 
+bool MessagesManager::is_deleted_secret_chat(const Dialog *d) const {
+  if (d == nullptr) {
+    return true;
+  }
+  if (d->dialog_id.get_type() != DialogType::SecretChat) {
+    return false;
+  }
+
+  if (d->order != DEFAULT_ORDER || d->messages != nullptr) {
+    return false;
+  }
+
+  auto state = td_->contacts_manager_->get_secret_chat_state(d->dialog_id.get_secret_chat_id());
+  if (state != SecretChatState::Closed) {
+    return false;
+  }
+
+  return true;
+}
+
 int32 MessagesManager::get_message_schedule_date(const Message *m) {
   if (!m->message_id.is_scheduled()) {
     return 0;
@@ -32897,11 +32917,8 @@ void MessagesManager::update_dialog_pos(Dialog *d, const char *source, bool need
       }
     }
     if (dialog_type == DialogType::SecretChat) {
-      auto secret_chat_id = d->dialog_id.get_secret_chat_id();
-      auto date = td_->contacts_manager_->get_secret_chat_date(secret_chat_id);
-      auto state = td_->contacts_manager_->get_secret_chat_state(secret_chat_id);
-      // do not return removed from the chat list closed secret chats
-      if (date != 0 && (d->order != DEFAULT_ORDER || state != SecretChatState::Closed || d->messages != nullptr)) {
+      auto date = td_->contacts_manager_->get_secret_chat_date(d->dialog_id.get_secret_chat_id());
+      if (date != 0 && !is_deleted_secret_chat(d)) {
         LOG(INFO) << "Creation of secret chat at " << date << " found";
         int64 creation_order = get_dialog_order(MessageId(), date);
         if (creation_order > new_order) {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 2b2fbb28e..f6a0333c2 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -2916,6 +2916,8 @@ class MessagesManager : public Actor {
 
   bool is_broadcast_channel(DialogId dialog_id) const;
 
+  bool is_deleted_secret_chat(const Dialog *d) const;
+
   static int32 get_message_schedule_date(const Message *m);
 
   int32 recently_found_dialogs_loaded_ = 0;  // 0 - not loaded, 1 - load request was sent, 2 - loaded