From 3afa9fb5f5d40be433dadb763ae7ef1343987a0f Mon Sep 17 00:00:00 2001 From: levlam Date: Fri, 7 Jul 2023 16:13:12 +0300 Subject: [PATCH] Improve update name. --- td/generate/scheme/td_api.tl | 4 ++-- td/telegram/StoryManager.cpp | 22 +++++++++++++--------- td/telegram/StoryManager.h | 4 +++- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index fe620af05..9e24cec98 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -5726,10 +5726,10 @@ updateStory story:story = Update; //@description A story became inaccessible @story_sender_chat_id Identifier of the chat that posted the story @story_id Story identifier updateStoryDeleted story_sender_chat_id:int53 story_id:int32 = Update; -//@description The list of active stories of a specific sender has changed +//@description The list of active stories posted by a specific chat has changed //@chat_id Identifier of the chat that posted the stories //@active_stories The new list of active stories -updateActiveStories chat_id:int53 active_stories:activeStories = Update; +updateChatActiveStories chat_id:int53 active_stories:activeStories = Update; //@description An option changed its value @name The option name @value The new option value updateOption name:string value:OptionValue = Update; diff --git a/td/telegram/StoryManager.cpp b/td/telegram/StoryManager.cpp index 54a40f3d6..8cbfd9a63 100644 --- a/td/telegram/StoryManager.cpp +++ b/td/telegram/StoryManager.cpp @@ -2316,7 +2316,7 @@ void StoryManager::on_update_active_stories(DialogId owner_dialog_id, StoryId ma if (story_ids.empty()) { if (active_stories_.erase(owner_dialog_id) > 0) { - send_update_active_stories(owner_dialog_id); + send_update_chat_active_stories(owner_dialog_id); } else { max_read_story_ids_.erase(owner_dialog_id); } @@ -2341,9 +2341,9 @@ void StoryManager::on_update_active_stories(DialogId owner_dialog_id, StoryId ma active_stories->max_read_story_id_ = max_read_story_id; active_stories->story_ids_ = std::move(story_ids); update_active_stories_order(owner_dialog_id, active_stories.get()); - send_update_active_stories(owner_dialog_id); + send_update_chat_active_stories(owner_dialog_id); } else if (update_active_stories_order(owner_dialog_id, active_stories.get())) { - send_update_active_stories(owner_dialog_id); + send_update_chat_active_stories(owner_dialog_id); } } @@ -2419,11 +2419,15 @@ void StoryManager::delete_active_stories_from_story_list(DialogId owner_dialog_i CHECK(is_deleted); } -void StoryManager::send_update_active_stories(DialogId owner_dialog_id) { - send_closure(G()->td(), &Td::send_update, - td_api::make_object( - td_->messages_manager_->get_chat_id_object(owner_dialog_id, "updateActiveStories"), - get_active_stories_object(owner_dialog_id))); +td_api::object_ptr StoryManager::get_update_chat_active_stories( + DialogId owner_dialog_id) const { + return td_api::make_object( + td_->messages_manager_->get_chat_id_object(owner_dialog_id, "updateChatActiveStories"), + get_active_stories_object(owner_dialog_id)); +} + +void StoryManager::send_update_chat_active_stories(DialogId owner_dialog_id) { + send_closure(G()->td(), &Td::send_update, get_update_chat_active_stories(owner_dialog_id)); } bool StoryManager::on_update_read_stories(DialogId owner_dialog_id, StoryId max_read_story_id) { @@ -2489,7 +2493,7 @@ void StoryManager::on_dialog_active_stories_order_updated(DialogId owner_dialog_ LOG(INFO) << "Update order of active stories in " << owner_dialog_id << " from " << source; auto active_stories = get_active_stories_editable(owner_dialog_id); if (active_stories != nullptr && update_active_stories_order(owner_dialog_id, active_stories)) { - send_update_active_stories(owner_dialog_id); + send_update_chat_active_stories(owner_dialog_id); } } diff --git a/td/telegram/StoryManager.h b/td/telegram/StoryManager.h index 370064271..518d25750 100644 --- a/td/telegram/StoryManager.h +++ b/td/telegram/StoryManager.h @@ -368,7 +368,9 @@ class StoryManager final : public Actor { void delete_active_stories_from_story_list(DialogId owner_dialog_id, const ActiveStories *active_stories); - void send_update_active_stories(DialogId owner_dialog_id); + td_api::object_ptr get_update_chat_active_stories(DialogId owner_dialog_id) const; + + void send_update_chat_active_stories(DialogId owner_dialog_id); void increment_story_views(DialogId owner_dialog_id, PendingStoryViews &story_views);