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

Improve getMessageThread for forums.

Browse Source
This commit is contained in:
levlam 2022-10-31 11:51:08 +03:00
parent fee05c93b5
commit f58737a0c9
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
td/generate/scheme/td_api.tl
View File

@ -1298,7 +1298,7 @@ webAppInfo launch_id:int64 url:string = WebAppInfo;
//@description Contains information about a message thread //@description Contains information about a message thread
//@chat_id Identifier of the chat to which the message thread belongs //@chat_id Identifier of the chat to which the message thread belongs
//@message_thread_id Message thread identifier, unique within the chat //@message_thread_id Message thread identifier, unique within the chat
//@reply_info Information about the message thread //@reply_info Information about the message thread; may be null for forum topic threads
//@unread_message_count Approximate number of unread messages in the message thread //@unread_message_count Approximate number of unread messages in the message thread
//@messages The messages from which the thread starts. The messages are returned in a reverse chronological order (i.e., in order of decreasing message_id) //@messages The messages from which the thread starts. The messages are returned in a reverse chronological order (i.e., in order of decreasing message_id)
//@draft_message A draft of a message in the message thread; may be null //@draft_message A draft of a message in the message thread; may be null

7
td/telegram/MessagesManager.cpp
View File

@ -18827,6 +18827,7 @@ td_api::object_ptr<td_api::messageThreadInfo> MessagesManager::get_message_threa
td_api::object_ptr<td_api::messageReplyInfo> reply_info; td_api::object_ptr<td_api::messageReplyInfo> reply_info;
vector<td_api::object_ptr<td_api::message>> messages; vector<td_api::object_ptr<td_api::message>> messages;
messages.reserve(info.message_ids.size()); messages.reserve(info.message_ids.size());
bool is_forum_topic = false;
for (auto message_id : info.message_ids) { for (auto message_id : info.message_ids) {
const Message *m = get_message_force(d, message_id, "get_message_thread_info_object"); const Message *m = get_message_force(d, message_id, "get_message_thread_info_object");
auto message = get_message_object(d->dialog_id, m, "get_message_thread_info_object"); auto message = get_message_object(d->dialog_id, m, "get_message_thread_info_object");
@ -18835,10 +18836,14 @@ td_api::object_ptr<td_api::messageThreadInfo> MessagesManager::get_message_threa
reply_info = m->reply_info.get_message_reply_info_object(td_); reply_info = m->reply_info.get_message_reply_info_object(td_);
CHECK(reply_info != nullptr); CHECK(reply_info != nullptr);
} }
is_forum_topic = message->is_topic_message_;
messages.push_back(std::move(message)); messages.push_back(std::move(message));
} }
} }
if (reply_info == nullptr) { if (messages.size() != 1) {
is_forum_topic = false;
}
if (reply_info == nullptr && !is_forum_topic) {
return nullptr; return nullptr;
} }