tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add StoryFullId to dependencies.

Browse Source
This commit is contained in:
levlam 2023-07-10 15:36:38 +03:00
parent 958aab66e6
commit 4ae098c3a8
4 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/Dependencies.cpp
View File

@ -8,6 +8,7 @@
#include "td/telegram/ContactsManager.h" #include "td/telegram/ContactsManager.h"
#include "td/telegram/MessagesManager.h" #include "td/telegram/MessagesManager.h"
#include "td/telegram/StoryManager.h"
#include "td/telegram/Td.h" #include "td/telegram/Td.h"
#include "td/telegram/WebPagesManager.h" #include "td/telegram/WebPagesManager.h"
@ -46,6 +47,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) { void Dependencies::add_dialog_and_dependencies(DialogId dialog_id) {
if (dialog_id.is_valid() && dialog_ids.insert(dialog_id).second) { if (dialog_id.is_valid() && dialog_ids.insert(dialog_id).second) {
add_dialog_dependencies(dialog_id); add_dialog_dependencies(dialog_id);
@ -121,7 +129,11 @@ bool Dependencies::resolve_force(Td *td, const char *source) const {
for (auto web_page_id : web_page_ids) { for (auto web_page_id : web_page_ids) {
if (!td->web_pages_manager_->have_web_page_force(web_page_id)) { if (!td->web_pages_manager_->have_web_page_force(web_page_id)) {
LOG(INFO) << "Can't find " << web_page_id << " from " << source; 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; return success;

4
td/telegram/Dependencies.h
View File

@ -10,6 +10,7 @@
#include "td/telegram/ChatId.h" #include "td/telegram/ChatId.h"
#include "td/telegram/DialogId.h" #include "td/telegram/DialogId.h"
#include "td/telegram/SecretChatId.h" #include "td/telegram/SecretChatId.h"
#include "td/telegram/StoryFullId.h"
#include "td/telegram/UserId.h" #include "td/telegram/UserId.h"
#include "td/telegram/WebPageId.h" #include "td/telegram/WebPageId.h"
@ -26,6 +27,7 @@ class Dependencies {
FlatHashSet<SecretChatId, SecretChatIdHash> secret_chat_ids; FlatHashSet<SecretChatId, SecretChatIdHash> secret_chat_ids;
FlatHashSet<DialogId, DialogIdHash> dialog_ids; FlatHashSet<DialogId, DialogIdHash> dialog_ids;
FlatHashSet<WebPageId, WebPageIdHash> web_page_ids; FlatHashSet<WebPageId, WebPageIdHash> web_page_ids;
FlatHashSet<StoryFullId, StoryFullIdHash> story_full_ids;
public: public:
void add(UserId user_id); void add(UserId user_id);
@ -38,6 +40,8 @@ class Dependencies {
void add(WebPageId web_page_id); void add(WebPageId web_page_id);
void add(StoryFullId story_full_id);
void add_dialog_and_dependencies(DialogId dialog_id); void add_dialog_and_dependencies(DialogId dialog_id);
void add_dialog_dependencies(DialogId dialog_id); void add_dialog_dependencies(DialogId dialog_id);

2
td/telegram/MessageContent.cpp
View File

@ -6740,7 +6740,7 @@ void add_message_content_dependencies(Dependencies &dependencies, const MessageC
break; break;
case MessageContentType::Story: { case MessageContentType::Story: {
const auto *content = static_cast<const MessageStory *>(message_content); const auto *content = static_cast<const MessageStory *>(message_content);
dependencies.add_dialog_and_dependencies(content->story_full_id.get_dialog_id()); dependencies.add(content->story_full_id);
break; break;
} }
default: default:

7
td/telegram/WebPagesManager.cpp
View File

@ -588,16 +588,11 @@ void WebPagesManager::update_web_page(unique_ptr<WebPage> web_page, WebPageId we
if (!web_page->story_full_ids.empty()) { if (!web_page->story_full_ids.empty()) {
Dependencies dependencies; Dependencies dependencies;
for (auto story_full_id : web_page->story_full_ids) { for (auto story_full_id : web_page->story_full_ids) {
dependencies.add_dialog_and_dependencies(story_full_id.get_dialog_id()); dependencies.add(story_full_id);
} }
if (!dependencies.resolve_force(td_, "update_web_page")) { if (!dependencies.resolve_force(td_, "update_web_page")) {
web_page->story_full_ids = {}; web_page->story_full_ids = {};
} }
for (auto story_full_id : web_page->story_full_ids) {
if (!td_->story_manager_->have_story_force(story_full_id)) {
LOG(INFO) << "Have unknown story " << story_full_id << " in " << web_page_id;
}
}
} }
} }