1 files changed, 40 insertions, 17 deletions

diff --git a/protocols/Telegram/tdlib/td/td/telegram/Dependencies.cpp b/protocols/Telegram/tdlib/td/td/telegram/Dependencies.cpp
index 91e544179e..bbd43b05c0 100644
--- a/protocols/Telegram/tdlib/td/td/telegram/Dependencies.cpp
+++ b/protocols/Telegram/tdlib/td/td/telegram/Dependencies.cpp
@@ -1,14 +1,16 @@
 //
-// Copyright Aliaksei Levin (levlam@telegram.org), Arseny Smirnov (arseny30@gmail.com) 2014-2023
+// Copyright Aliaksei Levin (levlam@telegram.org), Arseny Smirnov (arseny30@gmail.com) 2014-2024
 //
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 //
 #include "td/telegram/Dependencies.h"
 
-#include "td/telegram/ContactsManager.h"
-#include "td/telegram/MessagesManager.h"
+#include "td/telegram/ChatManager.h"
+#include "td/telegram/DialogManager.h"
+#include "td/telegram/StoryManager.h"
 #include "td/telegram/Td.h"
+#include "td/telegram/UserManager.h"
 #include "td/telegram/WebPagesManager.h"
 
 #include "td/utils/common.h"
@@ -46,6 +48,13 @@ void Dependencies::add(WebPageId web_page_id) {
   }
 }
 
+void Dependencies::add(StoryFullId story_full_id) {
+  if (story_full_id.is_valid()) {
+    add_dialog_and_dependencies(story_full_id.get_dialog_id());
+    story_full_ids.insert(story_full_id);
+  }
+}
+
 void Dependencies::add_dialog_and_dependencies(DialogId dialog_id) {
   if (dialog_id.is_valid() && dialog_ids.insert(dialog_id).second) {
     add_dialog_dependencies(dialog_id);
@@ -81,47 +90,61 @@ void Dependencies::add_message_sender_dependencies(DialogId dialog_id) {
   }
 }
 
-bool Dependencies::resolve_force(Td *td, const char *source) const {
+bool Dependencies::resolve_force(Td *td, const char *source, bool ignore_errors) const {
   bool success = true;
   for (auto user_id : user_ids) {
-    if (!td->contacts_manager_->have_user_force(user_id)) {
-      LOG(ERROR) << "Can't find " << user_id << " from " << source;
+    if (!td->user_manager_->have_user_force(user_id, source)) {
+      if (!ignore_errors) {
+        LOG(ERROR) << "Can't find " << user_id << " from " << source;
+      }
       success = false;
     }
   }
   for (auto chat_id : chat_ids) {
-    if (!td->contacts_manager_->have_chat_force(chat_id)) {
-      LOG(ERROR) << "Can't find " << chat_id << " from " << source;
+    if (!td->chat_manager_->have_chat_force(chat_id, source)) {
+      if (!ignore_errors) {
+        LOG(ERROR) << "Can't find " << chat_id << " from " << source;
+      }
       success = false;
     }
   }
   for (auto channel_id : channel_ids) {
-    if (!td->contacts_manager_->have_channel_force(channel_id)) {
-      if (td->contacts_manager_->have_min_channel(channel_id)) {
+    if (!td->chat_manager_->have_channel_force(channel_id, source)) {
+      if (td->chat_manager_->have_min_channel(channel_id)) {
         LOG(INFO) << "Can't find " << channel_id << " from " << source << ", but have it as a min-channel";
         continue;
       }
-      LOG(ERROR) << "Can't find " << channel_id << " from " << source;
+      if (!ignore_errors) {
+        LOG(ERROR) << "Can't find " << channel_id << " from " << source;
+      }
       success = false;
     }
   }
   for (auto secret_chat_id : secret_chat_ids) {
-    if (!td->contacts_manager_->have_secret_chat_force(secret_chat_id)) {
-      LOG(ERROR) << "Can't find " << secret_chat_id << " from " << source;
+    if (!td->user_manager_->have_secret_chat_force(secret_chat_id, source)) {
+      if (!ignore_errors) {
+        LOG(ERROR) << "Can't find " << secret_chat_id << " from " << source;
+      }
       success = false;
     }
   }
   for (auto dialog_id : dialog_ids) {
-    if (!td->messages_manager_->have_dialog_force(dialog_id, source)) {
-      LOG(ERROR) << "Can't find " << dialog_id << " from " << source;
-      td->messages_manager_->force_create_dialog(dialog_id, "resolve_dependencies_force", true);
+    if (!td->dialog_manager_->have_dialog_force(dialog_id, source)) {
+      if (!ignore_errors) {
+        LOG(ERROR) << "Can't find " << dialog_id << " from " << source;
+      }
+      td->dialog_manager_->force_create_dialog(dialog_id, source, true);
       success = false;
     }
   }
   for (auto web_page_id : web_page_ids) {
     if (!td->web_pages_manager_->have_web_page_force(web_page_id)) {
       LOG(INFO) << "Can't find " << web_page_id << " from " << source;
-      success = false;
+    }
+  }
+  for (auto story_full_id : story_full_ids) {
+    if (!td->story_manager_->have_story_force(story_full_id)) {
+      LOG(INFO) << "Can't find " << story_full_id << " from " << source;
     }
   }
   return success;