From 283a82cfa3d1bfb202d7c3fdd01326fc3fbae8a3 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 22 Feb 2020 19:03:52 +0300
Subject: [PATCH] Disable automatic dialog action timeout in chats with bots.

GitOrigin-RevId: 69e0d54d329a2bef15269623d14e0770dffd120e
---
 td/telegram/MessagesManager.cpp | 41 +++++++++++++++++++--------------
 td/telegram/MessagesManager.h   |  2 ++
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 8b1528e2..34ee8116 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -24266,6 +24266,27 @@ RestrictedRights MessagesManager::get_dialog_permissions(DialogId dialog_id) con
   }
 }
 
+bool MessagesManager::is_dialog_action_unneded(DialogId dialog_id) const {
+  if (is_broadcast_channel(dialog_id)) {
+    return true;
+  }
+
+  auto dialog_type = dialog_id.get_type();
+  if (dialog_type == DialogType::User || dialog_type == DialogType::SecretChat) {
+    UserId user_id = dialog_type == DialogType::User
+                         ? dialog_id.get_user_id()
+                         : td_->contacts_manager_->get_secret_chat_user_id(dialog_id.get_secret_chat_id());
+    if (!user_id.is_valid() || td_->contacts_manager_->is_user_bot(user_id) ||
+        td_->contacts_manager_->is_user_deleted(user_id)) {
+      return true;
+    }
+    if (!td_->auth_manager_->is_bot() && !td_->contacts_manager_->is_user_status_exact(user_id)) {
+      // return true;
+    }
+  }
+  return false;
+}
+
 void MessagesManager::send_dialog_action(DialogId dialog_id, const tl_object_ptr<td_api::ChatAction> &action,
                                          Promise<Unit> &&promise) {
   if (action == nullptr) {
@@ -24284,25 +24305,11 @@ void MessagesManager::send_dialog_action(DialogId dialog_id, const tl_object_ptr
     return promise.set_value(Unit());
   }
 
-  if (is_broadcast_channel(dialog_id)) {
+  if (is_dialog_action_unneded(dialog_id)) {
     return promise.set_value(Unit());
   }
 
-  auto dialog_type = dialog_id.get_type();
-  if (dialog_type == DialogType::User || dialog_type == DialogType::SecretChat) {
-    UserId user_id = dialog_type == DialogType::User
-                         ? dialog_id.get_user_id()
-                         : td_->contacts_manager_->get_secret_chat_user_id(dialog_id.get_secret_chat_id());
-    if (!user_id.is_valid() || td_->contacts_manager_->is_user_bot(user_id) ||
-        td_->contacts_manager_->is_user_deleted(user_id)) {
-      return promise.set_value(Unit());
-    }
-    if (!td_->auth_manager_->is_bot() && !td_->contacts_manager_->is_user_status_exact(user_id)) {
-      // return promise.set_value(Unit());
-    }
-  }
-
-  if (dialog_type == DialogType::SecretChat) {
+  if (dialog_id.get_type() == DialogType::SecretChat) {
     tl_object_ptr<secret_api::SendMessageAction> send_action;
     switch (action->get_id()) {
       case td_api::chatActionCancel::ID:
@@ -26195,7 +26202,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
     if (queue_id & 1) {
       LOG(INFO) << "Add " << message_id << " from " << source << " to queue " << queue_id;
       yet_unsent_media_queues_[queue_id][message_id.get()];  // reserve place for promise
-      if (!td_->auth_manager_->is_bot() && !is_broadcast_channel(dialog_id)) {
+      if (!td_->auth_manager_->is_bot() && !is_dialog_action_unneded(dialog_id)) {
         pending_send_dialog_action_timeout_.add_timeout_in(dialog_id.get(), 1.0);
       }
     }
diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h
index 35b49ff7..85398261 100644
--- a/td/telegram/MessagesManager.h
+++ b/td/telegram/MessagesManager.h
@@ -2043,6 +2043,8 @@ class MessagesManager : public Actor {
 
   bool update_dialog_silent_send_message(Dialog *d, bool silent_send_message);
 
+  bool is_dialog_action_unneded(DialogId dialog_id) const;
+
   void on_send_dialog_action_timeout(DialogId dialog_id);
 
   void on_active_dialog_action_timeout(DialogId dialog_id);