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

Disallow message threads in not-linked chats.

Browse Source 
GitOrigin-RevId: aaf20c0076c3fe2ceb30b65d1f9fef602aa8e51d
This commit is contained in:
levlam 2020-10-01 15:47:58 +03:00
parent 6c63c859c9
commit 6e9108a69d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/MessagesManager.cpp
View File

@ -6495,6 +6495,12 @@ bool MessagesManager::is_active_message_reply_info(DialogId dialog_id, const Mes
if (dialog_id.get_type() != DialogType::Channel) { if (dialog_id.get_type() != DialogType::Channel) {
return false; return false;
} }
auto channel_id = dialog_id.get_channel_id();
if (!td_->contacts_manager_->get_channel_has_linked_channel(channel_id)) {
return false;
}
if (!info.is_comment) { if (!info.is_comment) {
return true; return true;
} }
@ -6502,10 +6508,6 @@ bool MessagesManager::is_active_message_reply_info(DialogId dialog_id, const Mes
return true; return true;
} }
auto channel_id = dialog_id.get_channel_id();
if (!td_->contacts_manager_->get_channel_has_linked_channel(channel_id)) {
return false;
}
auto linked_channel_id = td_->contacts_manager_->get_channel_linked_channel_id(channel_id); auto linked_channel_id = td_->contacts_manager_->get_channel_linked_channel_id(channel_id);
if (!linked_channel_id.is_valid()) { if (!linked_channel_id.is_valid()) {
// keep the comment button while linked channel is unknown // keep the comment button while linked channel is unknown
@ -16049,7 +16051,7 @@ Result<FullMessageId> MessagesManager::get_top_thread_full_message_id(DialogId d
} }
return FullMessageId{DialogId(m->reply_info.channel_id), m->linked_top_thread_message_id}; return FullMessageId{DialogId(m->reply_info.channel_id), m->linked_top_thread_message_id};
} else { } else {
if (!m->top_thread_message_id.is_valid()) { if (!m->top_thread_message_id.is_valid() || !is_visible_message_reply_info(dialog_id, m)) {
return Status::Error(400, "Message has no thread"); return Status::Error(400, "Message has no thread");
} }
return FullMessageId{dialog_id, m->top_thread_message_id}; return FullMessageId{dialog_id, m->top_thread_message_id};