From 30c17d200bff4bc6a4207b116a0605e8f9550899 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 18 Oct 2020 00:07:39 +0300 Subject: [PATCH] Use MessageSender to represent recent repliers. GitOrigin-RevId: 2078a6b936d2087a1672eb96851494508f28a465 --- td/generate/scheme/td_api.tl | 4 ++-- td/generate/scheme/td_api.tlo | Bin 183832 -> 183824 bytes td/telegram/MessageReplyInfo.cpp | 22 ++++++++++++++++------ td/telegram/MessageReplyInfo.h | 4 +++- td/telegram/MessagesManager.cpp | 6 ++++-- 5 files changed, 25 insertions(+), 11 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 19919fa95..9ebf37532 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -652,11 +652,11 @@ messageForwardInfo origin:MessageForwardOrigin date:int32 public_service_announc //@description Contains information about message replies //@reply_count Number of times the message was directly or indirectly replied -//@recent_replier_user_ids User identifiers of the recent repliers to the message; available in channels with a discussion supergroup +//@recent_repliers Recent repliers to the message; available in channels with a discussion supergroup //@last_read_inbox_message_id Identifier of the last read incoming reply to the message //@last_read_outbox_message_id Identifier of the last read outgoing reply to the message //@last_message_id Identifier of the last reply to the message -messageReplyInfo reply_count:int32 recent_replier_user_ids:vector last_read_inbox_message_id:int53 last_read_outbox_message_id:int53 last_message_id:int53 = MessageReplyInfo; +messageReplyInfo reply_count:int32 recent_repliers:vector last_read_inbox_message_id:int53 last_read_outbox_message_id:int53 last_message_id:int53 = MessageReplyInfo; //@description Contains information about interactions with a message //@view_count Number of times the message was viewed diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo index 5a36925d64feb686a05ca2f5e81b896a8e189b8d..f458a0dc76b75f95c528af827dff30ead528335c 100644 GIT binary patch delta 107 zcmbO+hkL>t?gi2;`}BUTY-W+(&LYj|!3XAT571<+VFWX$U(jL{fv{d^F&gml7o{er u=9R=3r55C5PEPESpB^H}BrrWjn{f(6>lbat2o^B2J-~o*dw>DciMarfB`EL! delta 115 zcmbO*hkM2x?gi2;@kjstZf23*&LYj|!3XAT571<+VFWX$U(jL{fv{d^F&glS7o{er z=9R=3r55C5PA)7lpZ?}NqsjCRZN>zM);HRW5iDTlG($#*$p^w&+ItKbxAzz@waf(o D{oOFJ diff --git a/td/telegram/MessageReplyInfo.cpp b/td/telegram/MessageReplyInfo.cpp index 509063d61..f262251e3 100644 --- a/td/telegram/MessageReplyInfo.cpp +++ b/td/telegram/MessageReplyInfo.cpp @@ -7,6 +7,7 @@ #include "td/telegram/MessageReplyInfo.h" #include "td/telegram/ContactsManager.h" +#include "td/telegram/MessagesManager.h" #include "td/telegram/ServerMessageId.h" #include "td/utils/logging.h" @@ -40,6 +41,7 @@ MessageReplyInfo::MessageReplyInfo(tl_object_ptr & for (const auto &peer : reply_info->recent_repliers_) { DialogId dialog_id(peer); if (dialog_id.is_valid()) { + // save all valid dialog_id, despite we can have no info about some of them recent_replier_dialog_ids.push_back(dialog_id); } else { LOG(ERROR) << "Receive " << dialog_id << " as a recent replier"; @@ -125,20 +127,28 @@ void MessageReplyInfo::add_reply(DialogId replier_dialog_id, MessageId reply_mes } td_api::object_ptr MessageReplyInfo::get_message_reply_info_object( - ContactsManager *contacts_manager) const { + ContactsManager *contacts_manager, const MessagesManager *messages_manager) const { if (is_empty()) { return nullptr; } - vector recent_replier_user_ids; + vector> recent_repliers; for (auto recent_replier_dialog_id : recent_replier_dialog_ids) { if (recent_replier_dialog_id.get_type() == DialogType::User) { - recent_replier_user_ids.push_back(recent_replier_dialog_id.get_user_id()); + auto user_id = recent_replier_dialog_id.get_user_id(); + if (contacts_manager->have_min_user(user_id)) { + recent_repliers.push_back(td_api::make_object( + contacts_manager->get_user_id_object(user_id, "get_message_reply_info_object"))); + } + } else { + if (messages_manager->have_dialog(recent_replier_dialog_id)) { + recent_repliers.push_back(td_api::make_object(recent_replier_dialog_id.get())); + } } } - return td_api::make_object( - reply_count, contacts_manager->get_user_ids_object(recent_replier_user_ids, "get_message_reply_info_object"), - last_read_inbox_message_id.get(), last_read_outbox_message_id.get(), max_message_id.get()); + return td_api::make_object(reply_count, std::move(recent_repliers), + last_read_inbox_message_id.get(), + last_read_outbox_message_id.get(), max_message_id.get()); } StringBuilder &operator<<(StringBuilder &string_builder, const MessageReplyInfo &reply_info) { diff --git a/td/telegram/MessageReplyInfo.h b/td/telegram/MessageReplyInfo.h index 0c1b4e8d9..46a083396 100644 --- a/td/telegram/MessageReplyInfo.h +++ b/td/telegram/MessageReplyInfo.h @@ -19,6 +19,7 @@ namespace td { class ContactsManager; +class MessagesManager; struct MessageReplyInfo { int32 reply_count = -1; @@ -47,7 +48,8 @@ struct MessageReplyInfo { void add_reply(DialogId replier_dialog_id, MessageId reply_message_id); - td_api::object_ptr get_message_reply_info_object(ContactsManager *contacts_manager) const; + td_api::object_ptr get_message_reply_info_object( + ContactsManager *contacts_manager, const MessagesManager *messages_manager) const; template void store(StorerT &storer) const { diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index 2a9aeacc8..d49f9c6dc 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -6577,7 +6577,7 @@ td_api::object_ptr MessagesManager::get_message_ td_api::object_ptr reply_info; if (is_visible_reply_info) { - reply_info = m->reply_info.get_message_reply_info_object(td_->contacts_manager_.get()); + reply_info = m->reply_info.get_message_reply_info_object(td_->contacts_manager_.get(), this); CHECK(reply_info != nullptr); } @@ -16108,7 +16108,7 @@ td_api::object_ptr MessagesManager::get_message_threa auto message = get_message_object(d->dialog_id, m); if (message != nullptr) { if (message->interaction_info_ != nullptr && message->interaction_info_->reply_info_ != nullptr) { - reply_info = m->reply_info.get_message_reply_info_object(td_->contacts_manager_.get()); + reply_info = m->reply_info.get_message_reply_info_object(td_->contacts_manager_.get(), this); CHECK(reply_info != nullptr); } messages.push_back(std::move(message)); @@ -22368,6 +22368,8 @@ void MessagesManager::add_message_dependencies(Dependencies &dependencies, Dialo for (auto recent_replier_dialog_id : m->reply_info.recent_replier_dialog_ids) { if (recent_replier_dialog_id.get_type() == DialogType::User) { dependencies.user_ids.insert(recent_replier_dialog_id.get_user_id()); + } else { + add_dialog_and_dependencies(dependencies, recent_replier_dialog_id); } } add_message_content_dependencies(dependencies, m->content.get());