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

Immediately delete already deleted sent message instead of storing updateMessageID.

Browse Source
This commit is contained in:
levlam 2021-04-04 23:17:01 +03:00
parent 0b53ace8d0
commit 2246b81d6f
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
td/telegram/MessagesManager.cpp
View File

@ -10439,11 +10439,11 @@ void MessagesManager::delete_messages(DialogId dialog_id, const vector<MessageId
bool need_update_chat_has_scheduled_messages = false; bool need_update_chat_has_scheduled_messages = false;
vector<int64> deleted_message_ids; vector<int64> deleted_message_ids;
for (auto message_id : message_ids) { for (auto message_id : message_ids) {
need_update_chat_has_scheduled_messages |= message_id.is_scheduled();
auto m = delete_message(d, message_id, true, &need_update_dialog_pos, DELETE_MESSAGE_USER_REQUEST_SOURCE); auto m = delete_message(d, message_id, true, &need_update_dialog_pos, DELETE_MESSAGE_USER_REQUEST_SOURCE);
if (m == nullptr) { if (m == nullptr) {
LOG(INFO) << "Can't delete " << message_id << " because it is not found"; LOG(INFO) << "Can't delete " << message_id << " because it is not found";
} else { } else {
need_update_chat_has_scheduled_messages |= m->message_id.is_scheduled();
deleted_message_ids.push_back(m->message_id.get()); deleted_message_ids.push_back(m->message_id.get());
} }
} }
@ -10467,7 +10467,9 @@ void MessagesManager::delete_sent_message_from_server(DialogId dialog_id, Messag
} }
LOG(INFO) << "Delete already deleted sent " << message_id << " in " << dialog_id << " from server"; LOG(INFO) << "Delete already deleted sent " << message_id << " in " << dialog_id << " from server";
if (have_message_force({dialog_id, message_id}, "delete_sent_message_from_server")) { Dialog *d = get_dialog(dialog_id);
CHECK(d != nullptr);
if (get_message(d, message_id) != nullptr) {
delete_messages(dialog_id, {message_id}, true, Auto()); delete_messages(dialog_id, {message_id}, true, Auto());
} else { } else {
if (message_id.is_valid()) { if (message_id.is_valid()) {
@ -10477,6 +10479,11 @@ void MessagesManager::delete_sent_message_from_server(DialogId dialog_id, Messag
CHECK(message_id.is_scheduled_server()); CHECK(message_id.is_scheduled_server());
delete_scheduled_messages_from_server(dialog_id, {message_id}, 0, Auto()); delete_scheduled_messages_from_server(dialog_id, {message_id}, 0, Auto());
} }
bool need_update_dialog_pos = false;
auto m = delete_message(d, message_id, true, &need_update_dialog_pos, "delete_sent_message_from_server");
CHECK(m == nullptr);
CHECK(need_update_dialog_pos == false);
} }
} }
@ -26969,6 +26976,11 @@ bool MessagesManager::on_update_message_id(int64 random_id, MessageId new_messag
being_sent_messages_.erase(it); being_sent_messages_.erase(it);
if (!have_message_force({dialog_id, old_message_id}, "on_update_message_id")) {
delete_sent_message_from_server(dialog_id, new_message_id);
return true;
}
LOG(INFO) << "Save correspondence from " << new_message_id << " in " << dialog_id << " to " << old_message_id; LOG(INFO) << "Save correspondence from " << new_message_id << " in " << dialog_id << " to " << old_message_id;
CHECK(old_message_id.is_yet_unsent()); CHECK(old_message_id.is_yet_unsent());
update_message_ids_[FullMessageId(dialog_id, new_message_id)] = old_message_id; update_message_ids_[FullMessageId(dialog_id, new_message_id)] = old_message_id;
@ -26994,6 +27006,11 @@ bool MessagesManager::on_update_scheduled_message_id(int64 random_id, ScheduledS
being_sent_messages_.erase(it); being_sent_messages_.erase(it);
if (!have_message_force({dialog_id, old_message_id}, "on_update_scheduled_message_id")) {
delete_sent_message_from_server(dialog_id, MessageId(new_message_id, std::numeric_limits<int32>::max()));
return true;
}
LOG(INFO) << "Save correspondence from " << new_message_id << " in " << dialog_id << " to " << old_message_id; LOG(INFO) << "Save correspondence from " << new_message_id << " in " << dialog_id << " to " << old_message_id;
CHECK(old_message_id.is_yet_unsent()); CHECK(old_message_id.is_yet_unsent());
update_scheduled_message_ids_[dialog_id][new_message_id] = old_message_id; update_scheduled_message_ids_[dialog_id][new_message_id] = old_message_id;