From 82e109a4d51b3e3e7aaf3cd822f23ebbaf762251 Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 2 Mar 2024 02:09:56 +0300 Subject: [PATCH] Simplify search_private_chat_participants. --- td/telegram/DialogParticipantManager.cpp | 11 +++++------ td/telegram/DialogParticipantManager.h | 4 ++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/td/telegram/DialogParticipantManager.cpp b/td/telegram/DialogParticipantManager.cpp index 5a593b92b..4147c2e56 100644 --- a/td/telegram/DialogParticipantManager.cpp +++ b/td/telegram/DialogParticipantManager.cpp @@ -1605,9 +1605,10 @@ void DialogParticipantManager::finish_get_channel_participant(ChannelId channel_ promise.set_value(std::move(dialog_participant)); } -DialogParticipants DialogParticipantManager::search_private_chat_participants(UserId my_user_id, UserId peer_user_id, - const string &query, int32 limit, +DialogParticipants DialogParticipantManager::search_private_chat_participants(UserId peer_user_id, const string &query, + int32 limit, DialogParticipantFilter filter) const { + auto my_user_id = td_->contacts_manager_->get_my_id(); vector dialog_ids; if (filter.is_dialog_participant_suitable(td_, DialogParticipant::private_member(my_user_id, peer_user_id))) { dialog_ids.push_back(DialogId(my_user_id)); @@ -1638,8 +1639,7 @@ void DialogParticipantManager::search_dialog_participants(DialogId dialog_id, co switch (dialog_id.get_type()) { case DialogType::User: - return promise.set_value(search_private_chat_participants(td_->contacts_manager_->get_my_id(), - dialog_id.get_user_id(), query, limit, filter)); + return promise.set_value(search_private_chat_participants(dialog_id.get_user_id(), query, limit, filter)); case DialogType::Chat: return td_->contacts_manager_->search_chat_participants(dialog_id.get_chat_id(), query, limit, filter, std::move(promise)); @@ -1656,8 +1656,7 @@ void DialogParticipantManager::search_dialog_participants(DialogId dialog_id, co } case DialogType::SecretChat: { auto peer_user_id = td_->contacts_manager_->get_secret_chat_user_id(dialog_id.get_secret_chat_id()); - return promise.set_value( - search_private_chat_participants(td_->contacts_manager_->get_my_id(), peer_user_id, query, limit, filter)); + return promise.set_value(search_private_chat_participants(peer_user_id, query, limit, filter)); } case DialogType::None: default: diff --git a/td/telegram/DialogParticipantManager.h b/td/telegram/DialogParticipantManager.h index ac76da85e..2d4af6ae3 100644 --- a/td/telegram/DialogParticipantManager.h +++ b/td/telegram/DialogParticipantManager.h @@ -182,8 +182,8 @@ class DialogParticipantManager final : public Actor { void finish_get_channel_participant(ChannelId channel_id, DialogParticipant &&dialog_participant, Promise &&promise); - DialogParticipants search_private_chat_participants(UserId my_user_id, UserId peer_user_id, const string &query, - int32 limit, DialogParticipantFilter filter) const; + DialogParticipants search_private_chat_participants(UserId peer_user_id, const string &query, int32 limit, + DialogParticipantFilter filter) const; void set_chat_participant_status(ChatId chat_id, UserId user_id, DialogParticipantStatus status, bool is_recursive, Promise &&promise);