Add promise to reload_attach_menu_bots.

td/telegram/AttachMenuManager.cpp

@@ -236,7 +236,7 @@ void AttachMenuManager::init() {
 
     if (!attach_menu_bots_string.empty()) {
       AttachMenuBotsLogEvent attach_menu_bots_log_event;
-      log_event_parse(attach_menu_bots_string, attach_menu_bots_string).ensure();
+      log_event_parse(attach_menu_bots_log_event, attach_menu_bots_string).ensure();
 
       Dependencies dependencies;
       bool is_valid = true;
@@ -257,7 +257,7 @@ void AttachMenuManager::init() {
   }
 
   send_update_attach_menu_bots();
-  reload_attach_menu_bots();
+  reload_attach_menu_bots(Promise<Unit>());
 }
 
 void AttachMenuManager::timeout_expired() {
@@ -265,24 +265,13 @@ void AttachMenuManager::timeout_expired() {
     return;
   }
 
-  reload_attach_menu_bots();
+  reload_attach_menu_bots(Promise<Unit>());
 }
 
 bool AttachMenuManager::is_active() const {
   return !G()->close_flag() && td_->auth_manager_->is_authorized() && !td_->auth_manager_->is_bot();
 }
 
-void AttachMenuManager::reload_attach_menu_bots() {
-  if (!is_active()) {
-    return;
-  }
-  auto promise = PromiseCreator::lambda(
-      [actor_id = actor_id(this)](Result<telegram_api::object_ptr<telegram_api::AttachMenuBots>> &&result) {
-        send_closure(actor_id, &AttachMenuManager::on_reload_attach_menu_bots, std::move(result));
-      });
-  td_->create_handler<GetAttachMenuBotsQuery>(std::move(promise))->send(hash_);
-}
-
 Result<AttachMenuManager::AttachMenuBot> AttachMenuManager::get_attach_menu_bot(
     tl_object_ptr<telegram_api::attachMenuBot> &&bot) const {
   UserId user_id(bot->bot_id_);
@@ -343,14 +332,26 @@ Result<AttachMenuManager::AttachMenuBot> AttachMenuManager::get_attach_menu_bot(
   return std::move(attach_menu_bot);
 }
 
-void AttachMenuManager::on_reload_attach_menu_bots(
+void AttachMenuManager::reload_attach_menu_bots(Promise<Unit> &&promise) {
-    Result<telegram_api::object_ptr<telegram_api::AttachMenuBots>> &&result) {
   if (!is_active()) {
     return;
   }
+  auto query_promise =
+      PromiseCreator::lambda([actor_id = actor_id(this), promise = std::move(promise)](
+                                 Result<telegram_api::object_ptr<telegram_api::AttachMenuBots>> &&result) mutable {
+        send_closure(actor_id, &AttachMenuManager::on_reload_attach_menu_bots, std::move(result), std::move(promise));
+      });
+  td_->create_handler<GetAttachMenuBotsQuery>(std::move(query_promise))->send(hash_);
+}
+
+void AttachMenuManager::on_reload_attach_menu_bots(
+    Result<telegram_api::object_ptr<telegram_api::AttachMenuBots>> &&result, Promise<Unit> &&promise) {
+  if (!is_active()) {
+    return promise.set_value(Unit());
+  }
   if (result.is_error()) {
     set_timeout_in(Random::fast(60, 120));
-    return;
+    return promise.set_value(Unit());
   }
 
   is_inited_ = true;
@@ -360,7 +361,7 @@ void AttachMenuManager::on_reload_attach_menu_bots(
   auto attach_menu_bots_ptr = result.move_as_ok();
   auto constructor_id = attach_menu_bots_ptr->get_id();
   if (constructor_id == telegram_api::attachMenuBotsNotModified::ID) {
-    return;
+    return promise.set_value(Unit());
   }
   CHECK(constructor_id == telegram_api::attachMenuBots::ID);
   auto attach_menu_bots = move_tl_object_as<telegram_api::attachMenuBots>(attach_menu_bots_ptr);
@@ -397,6 +398,20 @@ void AttachMenuManager::on_reload_attach_menu_bots(
 
     save_attach_menu_bots();
   }
+  promise.set_value(Unit());
+}
+
+void AttachMenuManager::remove_bot_from_attach_menu(UserId user_id) {
+  for (auto it = attach_menu_bots_.begin(); it != attach_menu_bots_.end(); ++it) {
+    if (it->user_id_ == user_id) {
+      hash_ = 0;
+      attach_menu_bots_.erase(it);
+
+      send_update_attach_menu_bots();
+      save_attach_menu_bots();
+      return;
+    }
+  }
 }
 
 void AttachMenuManager::get_attach_menu_bot(UserId user_id,
@@ -451,15 +466,7 @@ void AttachMenuManager::on_get_attach_menu_bot(
     send_update_attach_menu_bots();
     save_attach_menu_bots();
   } else {
-    for (auto it = attach_menu_bots_.begin(); it != attach_menu_bots_.end(); ++it) {
+    remove_bot_from_attach_menu(user_id);
-      if (it->user_id_ == user_id) {
-        hash_ = 0;
-        attach_menu_bots_.erase(it);
-
-        send_update_attach_menu_bots();
-        save_attach_menu_bots();
-      }
-    }
   }
   promise.set_value(get_attach_menu_bot_object(attach_menu_bot));
 }
@@ -485,6 +492,8 @@ void AttachMenuManager::toggle_bot_is_added_to_attach_menu(UserId user_id, bool
     if (!bot_data.can_be_added_to_attach_menu) {
       return promise.set_error(Status::Error(400, "The bot can't be added to attach menu"));
     }
+  } else {
+    remove_bot_from_attach_menu(user_id);
   }
 
   td_->create_handler<ToggleBotInAttachMenuQuery>(std::move(promise))->send(std::move(input_user), is_added);

td/telegram/AttachMenuManager.h

@@ -27,7 +27,7 @@ class AttachMenuManager final : public Actor {
 
   void init();
 
-  void reload_attach_menu_bots();
+  void reload_attach_menu_bots(Promise<Unit> &&promise);
 
   void get_attach_menu_bot(UserId user_id, Promise<td_api::object_ptr<td_api::attachMenuBot>> &&promise);
 
@@ -73,13 +73,16 @@ class AttachMenuManager final : public Actor {
 
   td_api::object_ptr<td_api::updateAttachMenuBots> get_update_attach_menu_bots_object() const;
 
+  void remove_bot_from_attach_menu(UserId user_id);
+
   void send_update_attach_menu_bots() const;
 
   static string get_attach_menu_bots_database_key();
 
   void save_attach_menu_bots();
 
-  void on_reload_attach_menu_bots(Result<telegram_api::object_ptr<telegram_api::AttachMenuBots>> &&result);
+  void on_reload_attach_menu_bots(Result<telegram_api::object_ptr<telegram_api::AttachMenuBots>> &&result,
+                                  Promise<Unit> &&promise);
 
   void on_get_attach_menu_bot(UserId user_id,
                               Result<telegram_api::object_ptr<telegram_api::attachMenuBotsBot>> &&result,

td/telegram/ContactsManager.h

@@ -221,8 +221,6 @@ class ContactsManager final : public Actor {
   void on_update_dialog_administrators(DialogId dialog_id, vector<DialogAdministrator> &&administrators,
                                        bool have_access, bool from_database);
 
-  void reload_attach_menu_bots();
-
   void speculative_add_channel_participants(ChannelId channel_id, const vector<UserId> &added_user_ids,
                                             UserId inviter_user_id, int32 date, bool by_me);
 

td/telegram/UpdatesManager.cpp

@@ -2726,8 +2726,7 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateMessageReaction
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateAttachMenuBots> update, Promise<Unit> &&promise) {
-  td_->attach_menu_manager_->reload_attach_menu_bots();
+  td_->attach_menu_manager_->reload_attach_menu_bots(std::move(promise));
-  promise.set_value(Unit());
 }
 
 void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateFolderPeers> update, Promise<Unit> &&promise) {