From b579fcd3e0380d7efcb5841c3bcc6b2ef08f9eb2 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 8 Jan 2024 14:22:44 +0300 Subject: [PATCH] Rename DialogOnlineMemberManager to DialogParticipantManager. --- CMakeLists.txt | 4 +- SplitSource.php | 2 +- td/telegram/ContactsManager.cpp | 12 +++--- ...nager.cpp => DialogParticipantManager.cpp} | 41 +++++++++---------- ...erManager.h => DialogParticipantManager.h} | 6 +-- td/telegram/MessagesManager.cpp | 6 +-- td/telegram/Td.cpp | 17 ++++---- td/telegram/Td.h | 6 +-- 8 files changed, 46 insertions(+), 48 deletions(-) rename td/telegram/{DialogOnlineMemberManager.cpp => DialogParticipantManager.cpp} (80%) rename td/telegram/{DialogOnlineMemberManager.h => DialogParticipantManager.h} (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea8c80658..7d747c56a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -333,7 +333,7 @@ set(TDLIB_SOURCE td/telegram/DialogLocation.cpp td/telegram/DialogManager.cpp td/telegram/DialogNotificationSettings.cpp - td/telegram/DialogOnlineMemberManager.cpp + td/telegram/DialogParticipantManager.cpp td/telegram/DialogParticipant.cpp td/telegram/DialogParticipantFilter.cpp td/telegram/DialogSource.cpp @@ -615,7 +615,7 @@ set(TDLIB_SOURCE td/telegram/DialogLocation.h td/telegram/DialogManager.h td/telegram/DialogNotificationSettings.h - td/telegram/DialogOnlineMemberManager.h + td/telegram/DialogParticipantManager.h td/telegram/DialogParticipant.h td/telegram/DialogParticipantFilter.h td/telegram/DialogSource.h diff --git a/SplitSource.php b/SplitSource.php index a0f8998da..33b217aed 100644 --- a/SplitSource.php +++ b/SplitSource.php @@ -292,7 +292,7 @@ function split_file($file, $chunks, $undo) { 'dialog_filter_manager[_(-][^.]|DialogFilterManager' => "DialogFilterManager", 'dialog_invite_link_manager[_(-][^.]|DialogInviteLinkManager' => "DialogInviteLinkManager", 'dialog_manager[_(-][^.]|DialogManager' => "DialogManager", - 'dialog_online_member_manager[_(-][^.]|DialogOnlineMemberManager' => "DialogOnlineMemberManager", + 'dialog_participant_manager[_(-][^.]|DialogParticipantManager' => "DialogParticipantManager", 'documents_manager[_(-][^.]|DocumentsManager' => "DocumentsManager", 'download_manager[_(-][^.]|DownloadManager' => "DownloadManager", 'file_reference_manager[_(-][^.]|FileReferenceManager|file_references[)]' => 'FileReferenceManager', diff --git a/td/telegram/ContactsManager.cpp b/td/telegram/ContactsManager.cpp index 2006b4634..c0a9a1116 100644 --- a/td/telegram/ContactsManager.cpp +++ b/td/telegram/ContactsManager.cpp @@ -19,7 +19,7 @@ #include "td/telegram/DialogInviteLinkManager.h" #include "td/telegram/DialogLocation.h" #include "td/telegram/DialogManager.h" -#include "td/telegram/DialogOnlineMemberManager.h" +#include "td/telegram/DialogParticipantManager.h" #include "td/telegram/Document.h" #include "td/telegram/DocumentsManager.h" #include "td/telegram/FileReferenceManager.h" @@ -13145,8 +13145,8 @@ void ContactsManager::on_get_chat_full(tl_object_ptr &&c } if (participant_count >= 190 || !can_get_participants || has_hidden_participants) { - td_->dialog_online_member_manager_->on_update_dialog_online_member_count(DialogId(channel_id), - channel->online_count_, true); + td_->dialog_participant_manager_->on_update_dialog_online_member_count(DialogId(channel_id), + channel->online_count_, true); } vector bot_user_ids; @@ -14322,7 +14322,7 @@ void ContactsManager::update_user_online_member_count(UserId user_id) { for (const auto &it : online_member_dialogs) { auto dialog_id = it.first; auto time = it.second; - if (time < now - DialogOnlineMemberManager::ONLINE_MEMBER_COUNT_CACHE_EXPIRE_TIME) { + if (time < now - DialogParticipantManager::ONLINE_MEMBER_COUNT_CACHE_EXPIRE_TIME) { expired_dialog_ids.push_back(dialog_id); continue; } @@ -14402,8 +14402,8 @@ void ContactsManager::update_dialog_online_member_count(const vectordialog_online_member_manager_->on_update_dialog_online_member_count(dialog_id, online_member_count, - is_from_server); + td_->dialog_participant_manager_->on_update_dialog_online_member_count(dialog_id, online_member_count, + is_from_server); } void ContactsManager::on_get_chat_participants(tl_object_ptr &&participants_ptr, diff --git a/td/telegram/DialogOnlineMemberManager.cpp b/td/telegram/DialogParticipantManager.cpp similarity index 80% rename from td/telegram/DialogOnlineMemberManager.cpp rename to td/telegram/DialogParticipantManager.cpp index f32cdb90c..5ab15ab27 100644 --- a/td/telegram/DialogOnlineMemberManager.cpp +++ b/td/telegram/DialogParticipantManager.cpp @@ -4,7 +4,7 @@ // 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/DialogOnlineMemberManager.h" +#include "td/telegram/DialogParticipantManager.h" #include "td/telegram/AuthManager.h" #include "td/telegram/ContactsManager.h" @@ -42,37 +42,36 @@ class GetOnlinesQuery final : public Td::ResultHandler { } auto result = result_ptr.move_as_ok(); - td_->dialog_online_member_manager_->on_update_dialog_online_member_count(dialog_id_, result->onlines_, true); + td_->dialog_participant_manager_->on_update_dialog_online_member_count(dialog_id_, result->onlines_, true); } void on_error(Status status) final { td_->dialog_manager_->on_get_dialog_error(dialog_id_, status, "GetOnlinesQuery"); - td_->dialog_online_member_manager_->on_update_dialog_online_member_count(dialog_id_, 0, true); + td_->dialog_participant_manager_->on_update_dialog_online_member_count(dialog_id_, 0, true); } }; -DialogOnlineMemberManager::DialogOnlineMemberManager(Td *td, ActorShared<> parent) - : td_(td), parent_(std::move(parent)) { +DialogParticipantManager::DialogParticipantManager(Td *td, ActorShared<> parent) : td_(td), parent_(std::move(parent)) { update_dialog_online_member_count_timeout_.set_callback(on_update_dialog_online_member_count_timeout_callback); update_dialog_online_member_count_timeout_.set_callback_data(static_cast(this)); } -void DialogOnlineMemberManager::tear_down() { +void DialogParticipantManager::tear_down() { parent_.reset(); } -void DialogOnlineMemberManager::on_update_dialog_online_member_count_timeout_callback( - void *dialog_online_member_manager_ptr, int64 dialog_id_int) { +void DialogParticipantManager::on_update_dialog_online_member_count_timeout_callback( + void *dialog_participant_manager_ptr, int64 dialog_id_int) { if (G()->close_flag()) { return; } - auto dialog_online_member_manager = static_cast(dialog_online_member_manager_ptr); - send_closure_later(dialog_online_member_manager->actor_id(dialog_online_member_manager), - &DialogOnlineMemberManager::on_update_dialog_online_member_count_timeout, DialogId(dialog_id_int)); + auto dialog_participant_manager = static_cast(dialog_participant_manager_ptr); + send_closure_later(dialog_participant_manager->actor_id(dialog_participant_manager), + &DialogParticipantManager::on_update_dialog_online_member_count_timeout, DialogId(dialog_id_int)); } -void DialogOnlineMemberManager::on_update_dialog_online_member_count_timeout(DialogId dialog_id) { +void DialogParticipantManager::on_update_dialog_online_member_count_timeout(DialogId dialog_id) { if (G()->close_flag()) { return; } @@ -104,8 +103,8 @@ void DialogOnlineMemberManager::on_update_dialog_online_member_count_timeout(Dia } } -void DialogOnlineMemberManager::on_update_dialog_online_member_count(DialogId dialog_id, int32 online_member_count, - bool is_from_server) { +void DialogParticipantManager::on_update_dialog_online_member_count(DialogId dialog_id, int32 online_member_count, + bool is_from_server) { if (td_->auth_manager_->is_bot()) { return; } @@ -130,7 +129,7 @@ void DialogOnlineMemberManager::on_update_dialog_online_member_count(DialogId di "on_update_channel_online_member_count"); } -void DialogOnlineMemberManager::on_dialog_opened(DialogId dialog_id) { +void DialogParticipantManager::on_dialog_opened(DialogId dialog_id) { auto online_count_it = dialog_online_member_counts_.find(dialog_id); if (online_count_it == dialog_online_member_counts_.end()) { return; @@ -143,7 +142,7 @@ void DialogOnlineMemberManager::on_dialog_opened(DialogId dialog_id) { } } -void DialogOnlineMemberManager::on_dialog_closed(DialogId dialog_id) { +void DialogParticipantManager::on_dialog_closed(DialogId dialog_id) { auto online_count_it = dialog_online_member_counts_.find(dialog_id); if (online_count_it != dialog_online_member_counts_.end()) { auto &info = online_count_it->second; @@ -152,8 +151,8 @@ void DialogOnlineMemberManager::on_dialog_closed(DialogId dialog_id) { update_dialog_online_member_count_timeout_.set_timeout_in(dialog_id.get(), ONLINE_MEMBER_COUNT_CACHE_EXPIRE_TIME); } -void DialogOnlineMemberManager::set_dialog_online_member_count(DialogId dialog_id, int32 online_member_count, - bool is_from_server, const char *source) { +void DialogParticipantManager::set_dialog_online_member_count(DialogId dialog_id, int32 online_member_count, + bool is_from_server, const char *source) { if (td_->auth_manager_->is_bot()) { return; } @@ -203,8 +202,8 @@ void DialogOnlineMemberManager::set_dialog_online_member_count(DialogId dialog_i } } -void DialogOnlineMemberManager::send_update_chat_online_member_count(DialogId dialog_id, - int32 online_member_count) const { +void DialogParticipantManager::send_update_chat_online_member_count(DialogId dialog_id, + int32 online_member_count) const { if (td_->auth_manager_->is_bot()) { return; } @@ -215,7 +214,7 @@ void DialogOnlineMemberManager::send_update_chat_online_member_count(DialogId di td_->dialog_manager_->get_chat_id_object(dialog_id, "updateChatOnlineMemberCount"), online_member_count)); } -void DialogOnlineMemberManager::get_current_state(vector> &updates) const { +void DialogParticipantManager::get_current_state(vector> &updates) const { for (const auto &it : dialog_online_member_counts_) { auto dialog_id = it.first; if (it.second.is_update_sent && td_->messages_manager_->is_dialog_opened(dialog_id)) { diff --git a/td/telegram/DialogOnlineMemberManager.h b/td/telegram/DialogParticipantManager.h similarity index 92% rename from td/telegram/DialogOnlineMemberManager.h rename to td/telegram/DialogParticipantManager.h index 471fed53b..099eb07ce 100644 --- a/td/telegram/DialogOnlineMemberManager.h +++ b/td/telegram/DialogParticipantManager.h @@ -19,9 +19,9 @@ namespace td { class Td; -class DialogOnlineMemberManager final : public Actor { +class DialogParticipantManager final : public Actor { public: - DialogOnlineMemberManager(Td *td, ActorShared<> parent); + DialogParticipantManager(Td *td, ActorShared<> parent); static constexpr int32 ONLINE_MEMBER_COUNT_CACHE_EXPIRE_TIME = 30 * 60; @@ -38,7 +38,7 @@ class DialogOnlineMemberManager final : public Actor { static constexpr int32 ONLINE_MEMBER_COUNT_UPDATE_TIME = 5 * 60; - static void on_update_dialog_online_member_count_timeout_callback(void *dialog_online_member_manager_ptr, + static void on_update_dialog_online_member_count_timeout_callback(void *dialog_participant_manager_ptr, int64 dialog_id_int); void set_dialog_online_member_count(DialogId dialog_id, int32 online_member_count, bool is_from_server, diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 01a1c1b17..0fffaa750 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -25,7 +25,7 @@ #include "td/telegram/DialogLocation.h" #include "td/telegram/DialogManager.h" #include "td/telegram/DialogNotificationSettings.hpp" -#include "td/telegram/DialogOnlineMemberManager.h" +#include "td/telegram/DialogParticipantManager.h" #include "td/telegram/DownloadManager.h" #include "td/telegram/DraftMessage.h" #include "td/telegram/DraftMessage.hpp" @@ -18901,7 +18901,7 @@ void MessagesManager::open_dialog(Dialog *d) { } if (!td_->auth_manager_->is_bot()) { - td_->dialog_online_member_manager_->on_dialog_opened(dialog_id); + td_->dialog_participant_manager_->on_dialog_opened(dialog_id); if (d->has_scheduled_database_messages && !d->is_has_scheduled_database_messages_checked) { CHECK(G()->use_message_database()); @@ -18994,7 +18994,7 @@ void MessagesManager::close_dialog(Dialog *d) { send_update_chat_read_inbox(d, false, "close_dialog"); } - td_->dialog_online_member_manager_->on_dialog_closed(dialog_id); + td_->dialog_participant_manager_->on_dialog_closed(dialog_id); } } diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp index 4c7933402..2bb265fc1 100644 --- a/td/telegram/Td.cpp +++ b/td/telegram/Td.cpp @@ -46,9 +46,9 @@ #include "td/telegram/DialogListId.h" #include "td/telegram/DialogLocation.h" #include "td/telegram/DialogManager.h" -#include "td/telegram/DialogOnlineMemberManager.h" #include "td/telegram/DialogParticipant.h" #include "td/telegram/DialogParticipantFilter.h" +#include "td/telegram/DialogParticipantManager.h" #include "td/telegram/DialogSource.h" #include "td/telegram/DocumentsManager.h" #include "td/telegram/DownloadManager.h" @@ -3301,8 +3301,8 @@ void Td::dec_actor_refcnt() { LOG(DEBUG) << "DialogInviteLinkManager was cleared" << timer; dialog_manager_.reset(); LOG(DEBUG) << "DialogManager was cleared" << timer; - dialog_online_member_manager_.reset(); - LOG(DEBUG) << "DialogOnlineMemberManager was cleared" << timer; + dialog_participant_manager_.reset(); + LOG(DEBUG) << "DialogParticipantManager was cleared" << timer; documents_manager_.reset(); LOG(DEBUG) << "DocumentsManager was cleared" << timer; download_manager_.reset(); @@ -3524,8 +3524,8 @@ void Td::clear() { LOG(DEBUG) << "DialogInviteLinkManager actor was cleared" << timer; dialog_manager_actor_.reset(); LOG(DEBUG) << "DialogManager actor was cleared" << timer; - dialog_online_member_manager_actor_.reset(); - LOG(DEBUG) << "DialogOnlineMemberManager actor was cleared" << timer; + dialog_participant_manager_actor_.reset(); + LOG(DEBUG) << "DialogParticipantManager actor was cleared" << timer; download_manager_actor_.reset(); LOG(DEBUG) << "DownloadManager actor was cleared" << timer; file_manager_actor_.reset(); @@ -4031,9 +4031,8 @@ void Td::init_managers() { dialog_manager_ = make_unique(this, create_reference()); dialog_manager_actor_ = register_actor("DialogManager", dialog_manager_.get()); G()->set_dialog_manager(dialog_manager_actor_.get()); - dialog_online_member_manager_ = make_unique(this, create_reference()); - dialog_online_member_manager_actor_ = - register_actor("DialogOnlineMemberManager", dialog_online_member_manager_.get()); + dialog_participant_manager_ = make_unique(this, create_reference()); + dialog_participant_manager_actor_ = register_actor("DialogParticipantManager", dialog_participant_manager_.get()); download_manager_ = DownloadManager::create(td::make_unique(this, create_reference())); download_manager_actor_ = register_actor("DownloadManager", download_manager_.get()); G()->set_download_manager(download_manager_actor_.get()); @@ -4460,7 +4459,7 @@ void Td::on_request(uint64 id, const td_api::getCurrentState &request) { messages_manager_->get_current_state(updates); - dialog_online_member_manager_->get_current_state(updates); + dialog_participant_manager_->get_current_state(updates); notification_manager_->get_current_state(updates); diff --git a/td/telegram/Td.h b/td/telegram/Td.h index 87828a888..78bc77d54 100644 --- a/td/telegram/Td.h +++ b/td/telegram/Td.h @@ -57,7 +57,7 @@ class DialogActionManager; class DialogFilterManager; class DialogInviteLinkManager; class DialogManager; -class DialogOnlineMemberManager; +class DialogParticipantManager; class DocumentsManager; class DownloadManager; class FileManager; @@ -188,8 +188,8 @@ class Td final : public Actor { ActorOwn dialog_invite_link_manager_actor_; unique_ptr dialog_manager_; ActorOwn dialog_manager_actor_; - unique_ptr dialog_online_member_manager_; - ActorOwn dialog_online_member_manager_actor_; + unique_ptr dialog_participant_manager_; + ActorOwn dialog_participant_manager_actor_; unique_ptr download_manager_; ActorOwn download_manager_actor_; unique_ptr file_manager_;