From 6356d8193c5ad85d3b2e2e7244f0518cddf3cc19 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Wed, 19 Feb 2020 03:09:18 +0300
Subject: [PATCH] Repair again server unread count until it is successfully
 repaired.

GitOrigin-RevId: 6ec55caaba86e8374a56aeeb22c6486a5b19f508
---
 td/telegram/MessagesManager.cpp | 39 ++++++++++++++++++++++++++++-----
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 73e30e19a..be63a08e0 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -9464,9 +9464,12 @@ int32 MessagesManager::calc_new_unread_count(Dialog *d, MessageId max_message_id
 }
 
 void MessagesManager::repair_server_unread_count(DialogId dialog_id, int32 unread_count) {
-  if (td_->auth_manager_->is_bot()) {
+  if (td_->auth_manager_->is_bot() || !have_input_peer(dialog_id, AccessRights::Read)) {
     return;
   }
+  if (pending_read_history_timeout_.has_timeout(dialog_id.get())) {
+    return;  // postpone until read history request is sent
+  }
 
   LOG(INFO) << "Repair server unread count in " << dialog_id << " from " << unread_count;
   create_actor<SleepActor>("RepairServerUnreadCountSleepActor", 0.2,
@@ -12231,13 +12234,36 @@ void MessagesManager::on_get_dialogs(FolderId folder_id, vector<tl_object_ptr<te
 
     if (!G()->parameters().use_message_db || is_new || !d->is_last_read_inbox_message_id_inited ||
         d->need_repair_server_unread_count) {
-      if (d->need_repair_server_unread_count) {
+      if (d->last_read_inbox_message_id.is_valid() && !d->last_read_inbox_message_id.is_server() &&
+          read_inbox_max_message_id == d->last_read_inbox_message_id.get_prev_server_message_id()) {
+        read_inbox_max_message_id = d->last_read_inbox_message_id;
+      }
+      if (d->need_repair_server_unread_count && d->last_read_inbox_message_id <= read_inbox_max_message_id) {
         LOG(INFO) << "Repaired server unread count in " << dialog_id << " from " << d->last_read_inbox_message_id << "/"
                   << d->server_unread_count << " to " << read_inbox_max_message_id << "/" << dialog->unread_count_;
         d->need_repair_server_unread_count = false;
-        on_dialog_updated(dialog_id, "repair dialog server unread count");
+        on_dialog_updated(dialog_id, "repaired dialog server unread count");
       }
-      if (d->server_unread_count != dialog->unread_count_ ||
+      if (d->need_repair_server_unread_count) {
+        auto &previous_message_id = previous_repaired_read_inbox_max_message_id_[dialog_id];
+        if (previous_message_id >= read_inbox_max_message_id) {
+          // protect from sending the request in a loop
+          LOG(ERROR) << "Failed to repair server unread count in " << dialog_id
+                     << ", because receive read_inbox_max_message_id = " << read_inbox_max_message_id << " after "
+                     << previous_message_id << ", but messages are read up to " << d->last_read_inbox_message_id;
+          d->need_repair_server_unread_count = false;
+          on_dialog_updated(dialog_id, "failed to repair dialog server unread count");
+        } else {
+          LOG(INFO) << "Have last_read_inbox_message_id = " << d->last_read_inbox_message_id << ", but received only "
+                    << read_inbox_max_message_id << " from the server, trying to repair server unread count again";
+          previous_message_id = read_inbox_max_message_id;
+          repair_server_unread_count(dialog_id, d->server_unread_count);
+        }
+      } else {
+        previous_repaired_read_inbox_max_message_id_.erase(dialog_id);
+      }
+      if ((d->server_unread_count != dialog->unread_count_ &&
+           d->last_read_inbox_message_id == read_inbox_max_message_id) ||
           d->last_read_inbox_message_id < read_inbox_max_message_id) {
         set_dialog_last_read_inbox_message_id(d, read_inbox_max_message_id, dialog->unread_count_,
                                               d->local_unread_count, true, "on_get_dialogs");
@@ -15954,6 +15980,9 @@ void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId
       }
     });
   }
+  if (d->need_repair_server_unread_count) {
+    repair_server_unread_count(dialog_id, d->server_unread_count);
+  }
 
   if (!max_message_id.is_valid()) {
     return promise.set_value(Unit());
@@ -27829,7 +27858,7 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
     get_history_from_the_end(dialog_id, true, false, Auto());
   }
 
-  if (d->need_repair_server_unread_count && have_input_peer(dialog_id, AccessRights::Read)) {
+  if (d->need_repair_server_unread_count) {
     CHECK(dialog_type != DialogType::SecretChat);
     repair_server_unread_count(dialog_id, d->server_unread_count);
   }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 1e1b0314f..def6058c3 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -2742,6 +2742,8 @@ class MessagesManager : public Actor {
 
   std::unordered_map<string, int32> auth_notification_id_date_;
 
+  std::unordered_map<DialogId, MessageId, DialogIdHash> previous_repaired_read_inbox_max_message_id_;
+
   uint32 scheduled_messages_sync_generation_ = 1;
 
   DialogId sponsored_dialog_id_;