From 10c743a839db25d557969a215e0b25c24bf245af Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 30 Nov 2019 19:41:23 +0300
Subject: [PATCH] Add separate speculatively_update_channel_participants
 function.

GitOrigin-RevId: 73cb67adffb5488686e181d460640e0682e418e3
---
 td/telegram/MessagesManager.cpp | 49 ++++++++++++++++++---------------
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 207ae8367..dcad902eb 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -25186,28 +25186,6 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
   add_message_file_sources(dialog_id, m);
   register_message_content(td_, m->content.get(), {dialog_id, message_id});
 
-  if (from_update && message_id.is_server() && dialog_id.get_type() == DialogType::Channel &&
-      m->sender_user_id.is_valid()) {
-    switch (message_content_type) {
-      case MessageContentType::ChatAddUsers:
-        td_->contacts_manager_->speculative_add_channel_participants(
-            dialog_id.get_channel_id(), get_message_content_added_user_ids(m->content.get()), m->sender_user_id,
-            m->date, m->sender_user_id == my_user_id);
-        break;
-      case MessageContentType::ChatJoinedByLink:
-        td_->contacts_manager_->speculative_add_channel_participants(dialog_id.get_channel_id(), {m->sender_user_id},
-                                                                     m->sender_user_id, m->date,
-                                                                     m->sender_user_id == my_user_id);
-        break;
-      case MessageContentType::ChatDeleteUser:
-        td_->contacts_manager_->speculative_delete_channel_participant(
-            dialog_id.get_channel_id(), get_message_content_deleted_user_id(m->content.get()),
-            m->sender_user_id == my_user_id);
-        break;
-      default:
-        break;
-    }
-  }
   if (from_update && message_id.is_server() && message_content_type == MessageContentType::PinMessage) {
     auto pinned_message_id = get_message_content_pinned_message_id(m->content.get());
     on_update_dialog_pinned_message_id(dialog_id, pinned_message_id);
@@ -25218,6 +25196,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     on_sent_message_content(td_, m->content.get());
   }
   if (from_update) {
+    speculatively_update_channel_participants(dialog_id, m);
     update_used_hashtags(dialog_id, m);
     update_top_dialogs(dialog_id, m);
   }
@@ -27781,6 +27760,32 @@ void MessagesManager::after_get_channel_difference(DialogId dialog_id, bool succ
   }
 }
 
+void MessagesManager::speculatively_update_channel_participants(DialogId dialog_id, const Message *m) {
+  if (!m->message_id.is_any_server() || dialog_id.get_type() != DialogType::Channel || !m->sender_user_id.is_valid()) {
+    return;
+  }
+
+  auto channel_id = dialog_id.get_channel_id();
+  UserId my_user_id(td_->contacts_manager_->get_my_id());
+  bool by_me = m->sender_user_id == my_user_id;
+  switch (m->content->get_type()) {
+    case MessageContentType::ChatAddUsers:
+      td_->contacts_manager_->speculative_add_channel_participants(
+          channel_id, get_message_content_added_user_ids(m->content.get()), m->sender_user_id, m->date, by_me);
+      break;
+    case MessageContentType::ChatJoinedByLink:
+      td_->contacts_manager_->speculative_add_channel_participants(channel_id, {m->sender_user_id}, m->sender_user_id,
+                                                                   m->date, by_me);
+      break;
+    case MessageContentType::ChatDeleteUser:
+      td_->contacts_manager_->speculative_delete_channel_participant(
+          channel_id, get_message_content_deleted_user_id(m->content.get()), by_me);
+      break;
+    default:
+      break;
+  }
+}
+
 void MessagesManager::update_used_hashtags(DialogId dialog_id, const Message *m) {
   CHECK(m != nullptr);
   if (td_->auth_manager_->is_bot() || (!m->is_outgoing && dialog_id != get_my_dialog_id()) ||
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 75514d47d..221e9c89a 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 speculatively_update_channel_participants(DialogId dialog_id, const Message *m);
+
   void update_used_hashtags(DialogId dialog_id, const Message *m);
 
   void update_top_dialogs(DialogId dialog_id, const Message *m);