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

Return message objects from MessagesManager::send_message_group.

Browse Source
This commit is contained in:
levlam 2022-02-22 21:51:35 +03:00
parent 54b143e91d
commit 679b70efa5
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
td/telegram/MessagesManager.cpp
View File

@ -25774,7 +25774,7 @@ int64 MessagesManager::generate_new_media_album_id() {
return media_album_id;
}
Result<vector<MessageId>> MessagesManager::send_message_group(
Result<td_api::object_ptr<td_api::messages>> MessagesManager::send_message_group(
DialogId dialog_id, MessageId top_thread_message_id, MessageId reply_to_message_id,
tl_object_ptr<td_api::messageSendOptions> &&options,
vector<tl_object_ptr<td_api::InputMessageContent>> &&input_message_contents) {
@ -25824,7 +25824,7 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
// there must be no errors after get_message_to_send calls
vector<MessageId> result;
vector<tl_object_ptr<td_api::message>> result;
bool need_update_dialog_pos = false;
for (size_t i = 0; i < message_contents.size(); i++) {
auto &message_content = message_contents[i];
@ -25832,7 +25832,7 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
dup_message_content(td_, dialog_id, message_content.first.get(),
MessageContentDupType::Send, MessageCopyOptions()),
&need_update_dialog_pos, i != 0);
result.push_back(m->message_id);
result.push_back(get_message_object(dialog_id, m, "send_message_group"));
auto ttl = message_content.second;
if (ttl > 0) {
m->ttl = ttl;
@ -25850,7 +25850,7 @@ Result<vector<MessageId>> MessagesManager::send_message_group(
send_update_chat_last_message(d, "send_message_group");
}
return result;
return get_messages_object(-1, std::move(result), false);
}
void MessagesManager::save_send_message_log_event(DialogId dialog_id, const Message *m) {

2
td/telegram/MessagesManager.h
View File

@ -425,7 +425,7 @@ class MessagesManager final : public Actor {
tl_object_ptr<td_api::messageSendOptions> &&options, tl_object_ptr<td_api::ReplyMarkup> &&reply_markup,
tl_object_ptr<td_api::InputMessageContent> &&input_message_content) TD_WARN_UNUSED_RESULT;
Result<vector<MessageId>> send_message_group(
Result<td_api::object_ptr<td_api::messages>> send_message_group(
DialogId dialog_id, MessageId top_thread_message_id, MessageId reply_to_message_id,
tl_object_ptr<td_api::messageSendOptions> &&options,
vector<tl_object_ptr<td_api::InputMessageContent>> &&input_message_contents) TD_WARN_UNUSED_RESULT;

14
td/telegram/Td.cpp
View File

@ -5394,16 +5394,14 @@ void Td::on_request(uint64 id, td_api::sendMessage &request) {
}
void Td::on_request(uint64 id, td_api::sendMessageAlbum &request) {
DialogId dialog_id(request.chat_id_);
auto r_message_ids = messages_manager_->send_message_group(
dialog_id, MessageId(request.message_thread_id_), MessageId(request.reply_to_message_id_),
auto r_messages = messages_manager_->send_message_group(
DialogId(request.chat_id_), MessageId(request.message_thread_id_), MessageId(request.reply_to_message_id_),
std::move(request.options_), std::move(request.input_message_contents_));
if (r_message_ids.is_error()) {
return send_closure(actor_id(this), &Td::send_error, id, r_message_ids.move_as_error());
if (r_messages.is_error()) {
send_closure(actor_id(this), &Td::send_error, id, r_messages.move_as_error());
} else {
send_closure(actor_id(this), &Td::send_result, id, r_messages.move_as_ok());
}
send_closure(actor_id(this), &Td::send_result, id,
messages_manager_->get_messages_object(-1, dialog_id, r_message_ids.ok(), false, "sendMessageAlbum"));
}
void Td::on_request(uint64 id, td_api::sendBotStartMessage &request) {