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

Add cancel_send_deleted_message function.

Browse Source 
GitOrigin-RevId: 64f33bc1540da85a4c2c81ca28d8f4e1849dd9fb
This commit is contained in:
levlam 2019-11-29 15:52:18 +03:00
parent c65004efde
commit 1a636768b9
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
td/telegram/MessagesManager.cpp
View File

@ -12239,11 +12239,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
d->debug_being_deleted_message_id_source = "";
if (!only_from_memory) {
if (message_id.is_yet_unsent()) {
cancel_send_message_query(d->dialog_id, result.get());
} else {
cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted");
}
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)) {
get_history_from_the_end(d->dialog_id, true, false, Auto());
@ -12348,13 +12344,9 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_scheduled_messag
remove_message_file_sources(d->dialog_id, m);
// TODO delete the message
/*
if (message_id.is_yet_unsent()) {
cancel_send_message_query(d->dialog_id, result.get());
} else {
cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted");
}
*/
// cancel_send_deleted_message(d->dialog_id, result.get());
return nullptr;
}
@ -12379,11 +12371,7 @@ void MessagesManager::do_delete_all_dialog_messages(Dialog *d, unique_ptr<Messag
delete_active_live_location(d->dialog_id, m.get());
remove_message_file_sources(d->dialog_id, m.get());
if (message_id.is_yet_unsent()) {
cancel_send_message_query(d->dialog_id, m.get());
} else {
cancel_edit_message_media(d->dialog_id, m.get(), "Message was deleted");
}
cancel_send_deleted_message(d->dialog_id, m.get());
on_message_deleted(d, m.get(), "do_delete_all_dialog_messages");
@ -17220,6 +17208,14 @@ void MessagesManager::cancel_send_message_query(DialogId dialog_id, Message *m)
}
}
void MessagesManager::cancel_send_deleted_message(DialogId dialog_id, Message *m) {
if (m->message_id.is_yet_unsent()) {
cancel_send_message_query(dialog_id, m);
} else {
cancel_edit_message_media(dialog_id, m, "Message was deleted");
}
}
bool MessagesManager::is_message_auto_read(DialogId dialog_id, bool is_outgoing) const {
switch (dialog_id.get_type()) {
case DialogType::User: {

2
td/telegram/MessagesManager.h
View File

@ -2049,6 +2049,8 @@ class MessagesManager : public Actor {
void cancel_send_message_query(DialogId dialog_id, Message *m);
void cancel_send_deleted_message(DialogId dialog_id, Message *m);
static int32 get_message_flags(const Message *m);
static bool is_forward_info_sender_hidden(const MessageForwardInfo *forward_info);