From 411d30e1c716a1bc92c959430d046197dba6b6cf Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 10 Jun 2021 21:56:05 +0300
Subject: [PATCH] Remove Td::on_channel_unban_timeout proxy.

---
 td/telegram/ContactsManager.cpp | 13 +++++++++++--
 td/telegram/ContactsManager.h   |  4 ++--
 td/telegram/Td.cpp              |  7 -------
 td/telegram/Td.h                |  2 --
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp
index 8b9f5f3f1..1e40b9ee9 100644
--- a/td/telegram/ContactsManager.cpp
+++ b/td/telegram/ContactsManager.cpp
@@ -3507,11 +3507,20 @@ void ContactsManager::on_user_online_timeout(UserId user_id) {
 }
 
 void ContactsManager::on_channel_unban_timeout_callback(void *contacts_manager_ptr, int64 channel_id_long) {
-  auto td = static_cast<ContactsManager *>(contacts_manager_ptr)->td_;
-  send_closure_later(td->actor_id(td), &Td::on_channel_unban_timeout, channel_id_long);
+  if (G()->close_flag()) {
+    return;
+  }
+
+  auto contacts_manager = static_cast<ContactsManager *>(contacts_manager_ptr);
+  send_closure_later(contacts_manager->actor_id(contacts_manager), &ContactsManager::on_channel_unban_timeout,
+                     ChannelId(narrow_cast<int32>(channel_id_long)));
 }
 
 void ContactsManager::on_channel_unban_timeout(ChannelId channel_id) {
+  if (G()->close_flag()) {
+    return;
+  }
+
   auto c = get_channel(channel_id);
   CHECK(c != nullptr);
 
diff --git a/td/telegram/ContactsManager.h b/td/telegram/ContactsManager.h
index 1fcf94df7..148d2c752 100644
--- a/td/telegram/ContactsManager.h
+++ b/td/telegram/ContactsManager.h
@@ -284,8 +284,6 @@ class ContactsManager : public Actor {
 
   void invalidate_user_full(UserId user_id);
 
-  void on_channel_unban_timeout(ChannelId channel_id);
-
   void check_dialog_username(DialogId dialog_id, const string &username, Promise<CheckDialogUsernameResult> &&promise);
 
   static td_api::object_ptr<td_api::CheckChatUsernameResult> get_check_chat_username_result_object(
@@ -1554,6 +1552,8 @@ class ContactsManager : public Actor {
 
   void on_user_online_timeout(UserId user_id);
 
+  void on_channel_unban_timeout(ChannelId channel_id);
+
   void on_user_nearby_timeout(UserId user_id);
 
   void on_slow_mode_delay_timeout(ChannelId channel_id);
diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 82f3ff7e6..6503816e9 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -3186,13 +3186,6 @@ void Td::schedule_get_promo_data(int32 expires_in) {
   }
 }
 
-void Td::on_channel_unban_timeout(int64 channel_id_long) {
-  if (close_flag_ >= 2) {
-    return;
-  }
-  contacts_manager_->on_channel_unban_timeout(ChannelId(narrow_cast<int32>(channel_id_long)));
-}
-
 bool Td::is_online() const {
   return is_online_;
 }
diff --git a/td/telegram/Td.h b/td/telegram/Td.h
index 97fdb2127..47344d626 100644
--- a/td/telegram/Td.h
+++ b/td/telegram/Td.h
@@ -121,8 +121,6 @@ class Td final : public NetQueryCallback {
   void on_online_updated(bool force, bool send_update);
   void on_update_status_success(bool is_online);
 
-  void on_channel_unban_timeout(int64 channel_id_long);
-
   bool is_online() const;
 
   void set_is_bot_online(bool is_bot_online);