From af04f95daa42f2a7329286c18117a89c24f6e91e Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 30 Nov 2019 20:22:44 +0300
Subject: [PATCH] Add separate reget_message_from_server_if_needed function.

GitOrigin-RevId: 18b0a4f38ac429890832851370ff6371f6496ff1
---
 td/telegram/MessagesManager.cpp | 24 ++++++++++++------------
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 29a6ac89..ca316810 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -25174,14 +25174,10 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     on_dialog_updated(dialog_id, "update_has_contact_registered_message");
   }
 
-  if (message_id.is_server() && dialog_id.get_type() != DialogType::SecretChat &&
-      (need_reget_message_content(m->content.get()) || (m->legacy_layer != 0 && m->legacy_layer < MTPROTO_LAYER))) {
-    FullMessageId full_message_id{dialog_id, message_id};
-    LOG(INFO) << "Reget from server " << full_message_id;
-    get_message_from_server(full_message_id, Auto());
-  }
+  reget_message_from_server_if_needed(dialog_id, m);
 
   add_message_file_sources(dialog_id, m);
+
   register_message_content(td_, m->content.get(), {dialog_id, message_id});
 
   if (*need_update && message_id.is_server() && message_content_type == MessageContentType::PinMessage) {
@@ -25326,12 +25322,7 @@ MessagesManager::Message *MessagesManager::add_scheduled_message_to_dialog(Dialo
     add_message_to_database(d, m, "add_scheduled_message_to_dialog");
   }
 
-  if (message_id.is_scheduled_server() &&
-      (need_reget_message_content(m->content.get()) || (m->legacy_layer != 0 && m->legacy_layer < MTPROTO_LAYER))) {
-    FullMessageId full_message_id{dialog_id, message_id};
-    LOG(INFO) << "Reget from server " << full_message_id;
-    get_message_from_server(full_message_id, Auto());
-  }
+  reget_message_from_server_if_needed(dialog_id, m);
 
   add_message_file_sources(dialog_id, m);
 
@@ -27753,6 +27744,15 @@ void MessagesManager::after_get_channel_difference(DialogId dialog_id, bool succ
   }
 }
 
+void MessagesManager::reget_message_from_server_if_needed(DialogId dialog_id, const Message *m) {
+  if (m->message_id.is_any_server() && dialog_id.get_type() != DialogType::SecretChat &&
+      (need_reget_message_content(m->content.get()) || (m->legacy_layer != 0 && m->legacy_layer < MTPROTO_LAYER))) {
+    FullMessageId full_message_id{dialog_id, m->message_id};
+    LOG(INFO) << "Reget from server " << full_message_id;
+    get_message_from_server(full_message_id, Auto());
+  }
+}
+
 void MessagesManager::speculatively_update_channel_participants(DialogId dialog_id, const Message *m) {
   CHECK(m != nullptr);
   if (!m->message_id.is_any_server() || dialog_id.get_type() != DialogType::Channel || !m->sender_user_id.is_valid()) {
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 595be0dd..6b721090 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -2268,6 +2268,8 @@ class MessagesManager : public Actor {
   void save_recently_found_dialogs();
   bool load_recently_found_dialogs(Promise<Unit> &promise);
 
+  void reget_message_from_server_if_needed(DialogId dialog_id, const Message *m);
+
   void speculatively_update_channel_participants(DialogId dialog_id, const Message *m);
 
   void update_sent_message_contents(DialogId dialog_id, const Message *m);