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

Improve RepliedMessageInfo::get_same_chat_reply_to_message_id.

Browse Source
This commit is contained in:
levlam 2023-11-07 03:43:48 +03:00
parent 1522779b97
commit 21d5184e9f
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/MessageContent.cpp
View File

@ -5978,7 +5978,7 @@ unique_ptr<MessageContent> get_action_message_content(Td *td, tl_object_ptr<tele
return td::make_unique<MessageChannelMigrateFrom>(std::move(action->title_), chat_id);
}
case telegram_api::messageActionPinMessage::ID: {
auto reply_to_message_id = replied_message_info.get_same_chat_reply_to_message_id();
auto reply_to_message_id = replied_message_info.get_same_chat_reply_to_message_id(true);
if (!reply_to_message_id.is_valid()) {
// possible in basic groups
LOG(INFO) << "Receive pinned message with " << reply_to_message_id << " in " << owner_dialog_id;
@ -5987,7 +5987,7 @@ unique_ptr<MessageContent> get_action_message_content(Td *td, tl_object_ptr<tele
return make_unique<MessagePinMessage>(reply_to_message_id);
}
case telegram_api::messageActionGameScore::ID: {
auto reply_to_message_id = replied_message_info.get_same_chat_reply_to_message_id();
auto reply_to_message_id = replied_message_info.get_same_chat_reply_to_message_id(true);
if (!reply_to_message_id.is_valid()) {
// possible in basic groups
LOG(INFO) << "Receive game score with " << reply_to_message_id << " in " << owner_dialog_id;
@ -6230,7 +6230,7 @@ unique_ptr<MessageContent> get_action_message_content(Td *td, tl_object_ptr<tele
if (!background_info.is_valid()) {
break;
}
auto reply_to_message_id = replied_message_info.get_same_chat_reply_to_message_id();
auto reply_to_message_id = replied_message_info.get_same_chat_reply_to_message_id(true);
if (!reply_to_message_id.is_valid()) {
reply_to_message_id = MessageId();
}

2
td/telegram/MessageReplyHeader.cpp
View File

@ -48,7 +48,7 @@ MessageReplyHeader::MessageReplyHeader(Td *td, tl_object_ptr<telegram_api::Messa
if (!message_id.is_scheduled() && can_have_thread) {
if (!top_thread_message_id_.is_valid()) {
auto same_chat_reply_to_message_id = replied_message_info_.get_same_chat_reply_to_message_id();
auto same_chat_reply_to_message_id = replied_message_info_.get_same_chat_reply_to_message_id(false);
if (same_chat_reply_to_message_id.is_valid()) {
CHECK(same_chat_reply_to_message_id.is_server());
top_thread_message_id_ = same_chat_reply_to_message_id;

11
td/telegram/MessagesManager.cpp
View File

@ -24135,7 +24135,7 @@ tl_object_ptr<td_api::message> MessagesManager::get_message_object(DialogId dial
auto reply_to = [&]() -> td_api::object_ptr<td_api::MessageReplyTo> {
if (!m->replied_message_info.is_empty()) {
if (m->is_topic_message &&
m->replied_message_info.get_same_chat_reply_to_message_id() == m->top_thread_message_id &&
m->replied_message_info.get_same_chat_reply_to_message_id(false) == m->top_thread_message_id &&
!td_->auth_manager_->is_bot()) {
return nullptr;
}
@ -28078,7 +28078,8 @@ Result<MessagesManager::ForwardedMessages> MessagesManager::get_forwarded_messag
}
if (is_local_copy) {
auto original_reply_to_message_id = forwarded_message->replied_message_info.get_same_chat_reply_to_message_id();
auto original_reply_to_message_id =
forwarded_message->replied_message_info.get_same_chat_reply_to_message_id(true);
copied_messages.push_back(
{std::move(content), std::move(input_reply_to), forwarded_message->message_id, original_reply_to_message_id,
std::move(reply_markup), forwarded_message->media_album_id,
@ -28159,7 +28160,7 @@ Result<td_api::object_ptr<td_api::messages>> MessagesManager::forward_messages(
auto forward_info =
drop_author ? nullptr : create_message_forward_info(from_dialog_id, to_dialog_id, forwarded_message);
MessageInputReplyTo input_reply_to;
auto original_reply_to_message_id = forwarded_message->replied_message_info.get_same_chat_reply_to_message_id();
auto original_reply_to_message_id = forwarded_message->replied_message_info.get_same_chat_reply_to_message_id(true);
if (original_reply_to_message_id.is_valid()) {
auto it = forwarded_message_id_to_new_message_id.find(original_reply_to_message_id);
if (it != forwarded_message_id_to_new_message_id.end()) {
@ -28616,7 +28617,7 @@ Result<MessageId> MessagesManager::add_local_message(
m->replied_message_info = RepliedMessageInfo(td_, input_reply_to);
m->reply_to_story_full_id = input_reply_to.get_story_full_id();
if (!message_id.is_scheduled()) {
auto reply_to_message_id = m->replied_message_info.get_same_chat_reply_to_message_id();
auto reply_to_message_id = input_reply_to.get_same_chat_reply_to_message_id();
const Message *reply_m = get_message(d, reply_to_message_id);
if (reply_m != nullptr) {
m->top_thread_message_id = reply_m->top_thread_message_id;
@ -36093,7 +36094,7 @@ bool MessagesManager::update_message(Dialog *d, Message *old_message, unique_ptr
old_message->top_thread_message_id = new_message->top_thread_message_id;
old_message->reply_to_random_id = 0;
auto same_chat_reply_to_message_id = old_message->replied_message_info.get_same_chat_reply_to_message_id();
auto same_chat_reply_to_message_id = old_message->replied_message_info.get_same_chat_reply_to_message_id(false);
if (same_chat_reply_to_message_id != MessageId() && message_id.is_yet_unsent() &&
(dialog_id.get_type() == DialogType::SecretChat || same_chat_reply_to_message_id.is_yet_unsent())) {
auto *replied_m = get_message(d, same_chat_reply_to_message_id);

10
td/telegram/RepliedMessageInfo.cpp
View File

@ -366,8 +366,14 @@ MessageInputReplyTo RepliedMessageInfo::get_input_reply_to() const {
return {};
}
MessageId RepliedMessageInfo::get_same_chat_reply_to_message_id() const {
return dialog_id_ == DialogId() && origin_.is_empty() ? message_id_ : MessageId();
MessageId RepliedMessageInfo::get_same_chat_reply_to_message_id(bool ignore_external) const {
if (message_id_ == MessageId()) {
return {};
}
if (ignore_external && !origin_.is_empty()) {
return {};
}
return dialog_id_ == DialogId() ? message_id_ : MessageId();
}
MessageFullId RepliedMessageInfo::get_reply_message_full_id(DialogId owner_dialog_id, bool ignore_external) const {

2
td/telegram/RepliedMessageInfo.h
View File

@ -98,7 +98,7 @@ class RepliedMessageInfo {
message_id_ = new_message_id;
}
MessageId get_same_chat_reply_to_message_id() const;
MessageId get_same_chat_reply_to_message_id(bool ignore_external) const;
MessageFullId get_reply_message_full_id(DialogId owner_dialog_id, bool ignore_external) const;