andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Use fail_send_message directly if possible.

Browse Source 
GitOrigin-RevId: f537f3f2517a7775d5714e38b57a7ce11b2042f6
This commit is contained in:
levlam 2018-09-19 19:59:23 +03:00
parent 91950e9452
commit 4b2e3619f7
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/MessagesManager.cpp
View File

@ -6957,8 +6957,7 @@ void MessagesManager::on_upload_media(FileId file_id, tl_object_ptr<telegram_api
// user has left the chat during upload of the file or lost his privileges // user has left the chat during upload of the file or lost his privileges
LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error(); LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error();
int64 random_id = begin_send_message(dialog_id, m); fail_send_message(full_message_id, can_send_status.move_as_error());
on_send_message_fail(random_id, can_send_status.move_as_error());
return; return;
} }
@ -7060,8 +7059,7 @@ void MessagesManager::on_upload_media_error(FileId file_id, Status status) {
if (is_edit) { if (is_edit) {
fail_edit_message_media(full_message_id, Status::Error(status.code() > 0 ? status.code() : 500, status.message())); fail_edit_message_media(full_message_id, Status::Error(status.code() > 0 ? status.code() : 500, status.message()));
} else { } else {
fail_send_message(full_message_id, status.code() > 0 ? status.code() : 500, fail_send_message(full_message_id, std::move(status));
status.message().str()); // TODO CHECK that status has always a code
} }
} }
@ -7105,8 +7103,7 @@ void MessagesManager::on_load_secret_thumbnail(FileId thumbnail_file_id, BufferS
// secret chat was closed during load of the file // secret chat was closed during load of the file
LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error(); LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error();
int64 random_id = begin_send_message(dialog_id, m); fail_send_message(full_message_id, can_send_status.move_as_error());
on_send_message_fail(random_id, can_send_status.move_as_error());
return; return;
} }
@ -7154,8 +7151,7 @@ void MessagesManager::on_upload_thumbnail(FileId thumbnail_file_id,
// user has left the chat during upload of the thumbnail or lost his privileges // user has left the chat during upload of the thumbnail or lost his privileges
LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error(); LOG(INFO) << "Can't send a message to " << dialog_id << ": " << can_send_status.error();
int64 random_id = begin_send_message(dialog_id, m); fail_send_message(full_message_id, can_send_status.move_as_error());
on_send_message_fail(random_id, can_send_status.move_as_error());
return; return;
} }
@ -20540,6 +20536,11 @@ void MessagesManager::fail_send_message(FullMessageId full_message_id, int error
} }
} }
void MessagesManager::fail_send_message(FullMessageId full_message_id, Status error) {
fail_send_message(full_message_id, error.code() > 0 ? error.code() : 500,
error.message().str()); // TODO CHECK that status has always a code
}
void MessagesManager::fail_edit_message_media(FullMessageId full_message_id, Status &&error) { void MessagesManager::fail_edit_message_media(FullMessageId full_message_id, Status &&error) {
auto dialog_id = full_message_id.get_dialog_id(); auto dialog_id = full_message_id.get_dialog_id();
Dialog *d = get_dialog(dialog_id); Dialog *d = get_dialog(dialog_id);
@ -26208,8 +26209,7 @@ MessagesManager::Message *MessagesManager::continue_send_message(DialogId dialog
if (can_send_status.is_error()) { if (can_send_status.is_error()) {
LOG(INFO) << "Can't resend a message to " << dialog_id << ": " << can_send_status.error(); LOG(INFO) << "Can't resend a message to " << dialog_id << ": " << can_send_status.error();
int64 random_id = begin_send_message(dialog_id, result_message); fail_send_message({dialog_id, result_message->message_id}, can_send_status.move_as_error());
on_send_message_fail(random_id, can_send_status.move_as_error());
return nullptr; return nullptr;
} }

2
td/telegram/MessagesManager.h
View File

@ -2198,6 +2198,8 @@ class MessagesManager : public Actor {
void fail_send_message(FullMessageId full_message_id, int error_code, const string &error_message); void fail_send_message(FullMessageId full_message_id, int error_code, const string &error_message);
void fail_send_message(FullMessageId full_message_id, Status error);
void fail_edit_message_media(FullMessageId full_message_id, Status &&error); void fail_edit_message_media(FullMessageId full_message_id, Status &&error);
void on_dialog_updated(DialogId dialog_id, const char *source); void on_dialog_updated(DialogId dialog_id, const char *source);