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

Move cancel_send_deleted_message call to on_message_deleted.

Browse Source 
GitOrigin-RevId: 84a141e575f8a1b87508c208fe5f1649ab0900df
This commit is contained in:
levlam 2019-11-29 15:57:03 +03:00
parent 1a636768b9
commit c710403382
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
td/telegram/MessagesManager.cpp
View File

@ -12239,8 +12239,6 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
d->debug_being_deleted_message_id_source = ""; d->debug_being_deleted_message_id_source = "";
if (!only_from_memory) { if (!only_from_memory) {
cancel_send_deleted_message(d->dialog_id, result.get());
if (need_get_history && !td_->auth_manager_->is_bot() && have_input_peer(d->dialog_id, AccessRights::Read)) { if (need_get_history && !td_->auth_manager_->is_bot() && have_input_peer(d->dialog_id, AccessRights::Read)) {
get_history_from_the_end(d->dialog_id, true, false, Auto()); get_history_from_the_end(d->dialog_id, true, false, Auto());
} }
@ -12290,6 +12288,9 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
void MessagesManager::on_message_deleted(Dialog *d, Message *m, const char *source) { void MessagesManager::on_message_deleted(Dialog *d, Message *m, const char *source) {
// also called for unloaded messages // also called for unloaded messages
cancel_send_deleted_message(d->dialog_id, m);
CHECK(m->message_id.is_valid()); CHECK(m->message_id.is_valid());
switch (d->dialog_id.get_type()) { switch (d->dialog_id.get_type()) {
case DialogType::User: case DialogType::User:
@ -12371,8 +12372,6 @@ void MessagesManager::do_delete_all_dialog_messages(Dialog *d, unique_ptr<Messag
delete_active_live_location(d->dialog_id, m.get()); delete_active_live_location(d->dialog_id, m.get());
remove_message_file_sources(d->dialog_id, m.get()); remove_message_file_sources(d->dialog_id, m.get());
cancel_send_deleted_message(d->dialog_id, m.get());
on_message_deleted(d, m.get(), "do_delete_all_dialog_messages"); on_message_deleted(d, m.get(), "do_delete_all_dialog_messages");
m = nullptr; m = nullptr;