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

Padd Message pointer to cancel_send_message_query.

Browse Source 
GitOrigin-RevId: 2e56372571b970d8549f5a8b9223218f1ffa9244
This commit is contained in:
levlam 2019-11-29 15:30:48 +03:00
parent 9948e41aed
commit c65004efde
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/MessagesManager.cpp
View File

@ -12240,7 +12240,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
if (!only_from_memory) { if (!only_from_memory) {
if (message_id.is_yet_unsent()) { if (message_id.is_yet_unsent()) {
cancel_send_message_query(d->dialog_id, result); cancel_send_message_query(d->dialog_id, result.get());
} else { } else {
cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted"); cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted");
} }
@ -12293,6 +12293,7 @@ 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
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:
@ -12349,7 +12350,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_scheduled_messag
// TODO delete the message // TODO delete the message
/* /*
if (message_id.is_yet_unsent()) { if (message_id.is_yet_unsent()) {
cancel_send_message_query(d->dialog_id, result); cancel_send_message_query(d->dialog_id, result.get());
} else { } else {
cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted"); cancel_edit_message_media(d->dialog_id, result.get(), "Message was deleted");
} }
@ -12379,7 +12380,7 @@ void MessagesManager::do_delete_all_dialog_messages(Dialog *d, unique_ptr<Messag
remove_message_file_sources(d->dialog_id, m.get()); remove_message_file_sources(d->dialog_id, m.get());
if (message_id.is_yet_unsent()) { if (message_id.is_yet_unsent()) {
cancel_send_message_query(d->dialog_id, m); cancel_send_message_query(d->dialog_id, m.get());
} else { } else {
cancel_edit_message_media(d->dialog_id, m.get(), "Message was deleted"); cancel_edit_message_media(d->dialog_id, m.get(), "Message was deleted");
} }
@ -17163,7 +17164,7 @@ void MessagesManager::cancel_upload_file(FileId file_id) {
send_closure_later(G()->file_manager(), &FileManager::cancel_upload, file_id); send_closure_later(G()->file_manager(), &FileManager::cancel_upload, file_id);
} }
void MessagesManager::cancel_send_message_query(DialogId dialog_id, unique_ptr<Message> &m) { void MessagesManager::cancel_send_message_query(DialogId dialog_id, Message *m) {
CHECK(m != nullptr); CHECK(m != nullptr);
CHECK(m->content != nullptr); CHECK(m->content != nullptr);
CHECK(m->message_id.is_yet_unsent()); CHECK(m->message_id.is_yet_unsent());

2
td/telegram/MessagesManager.h
View File

@ -2047,7 +2047,7 @@ class MessagesManager : public Actor {
static void cancel_upload_file(FileId file_id); static void cancel_upload_file(FileId file_id);
void cancel_send_message_query(DialogId dialog_id, unique_ptr<Message> &m); void cancel_send_message_query(DialogId dialog_id, Message *m);
static int32 get_message_flags(const Message *m); static int32 get_message_flags(const Message *m);