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

Use exact ID of deleted message in updateDeleteMessages.

Browse Source 
GitOrigin-RevId: cbed7d24434e07f5925044fdb65152f9e4809737
This commit is contained in:
levlam 2019-12-06 04:56:27 +03:00
parent 3d4ae6e26c
commit 2baa52f975
1 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
td/telegram/MessagesManager.cpp
View File

@ -8179,7 +8179,7 @@ void MessagesManager::on_get_scheduled_server_messages(DialogId dialog_id, uint3
auto message_id = it.second; auto message_id = it.second;
auto message = do_delete_scheduled_message(d, message_id, true, "on_get_scheduled_server_messages"); auto message = do_delete_scheduled_message(d, message_id, true, "on_get_scheduled_server_messages");
CHECK(message != nullptr); CHECK(message != nullptr);
send_update_delete_messages(dialog_id, {message_id.get()}, true, false); send_update_delete_messages(dialog_id, {message->message_id.get()}, true, false);
} }
send_update_chat_has_scheduled_messages(d); send_update_chat_has_scheduled_messages(d);
@ -8240,16 +8240,16 @@ void MessagesManager::delete_messages_from_updates(const vector<MessageId> &mess
Dialog *d = get_dialog_by_message_id(message_id); Dialog *d = get_dialog_by_message_id(message_id);
if (d != nullptr) { if (d != nullptr) {
auto m = delete_message(d, message_id, true, &need_update_dialog_pos[d->dialog_id], "updates"); auto message = delete_message(d, message_id, true, &need_update_dialog_pos[d->dialog_id], "updates");
CHECK(m != nullptr); CHECK(message != nullptr);
LOG_CHECK(m->message_id == message_id) << message_id << " " << m->message_id << " " << d->dialog_id; LOG_CHECK(message->message_id == message_id) << message_id << " " << message->message_id << " " << d->dialog_id;
deleted_message_ids[d->dialog_id].push_back(message_id.get()); deleted_message_ids[d->dialog_id].push_back(message->message_id.get());
} }
if (last_clear_history_message_id_to_dialog_id_.count(message_id)) { if (last_clear_history_message_id_to_dialog_id_.count(message_id)) {
d = get_dialog(last_clear_history_message_id_to_dialog_id_[message_id]); d = get_dialog(last_clear_history_message_id_to_dialog_id_[message_id]);
CHECK(d != nullptr); CHECK(d != nullptr);
auto m = delete_message(d, message_id, true, &need_update_dialog_pos[d->dialog_id], "updates"); auto message = delete_message(d, message_id, true, &need_update_dialog_pos[d->dialog_id], "updates");
CHECK(m == nullptr); CHECK(message == nullptr);
} }
} }
for (auto &it : need_update_dialog_pos) { for (auto &it : need_update_dialog_pos) {
@ -8283,8 +8283,8 @@ void MessagesManager::delete_dialog_messages_from_updates(DialogId dialog_id, co
continue; continue;
} }
delete_message(d, message_id, true, &need_update_dialog_pos, "updates"); auto message = delete_message(d, message_id, true, &need_update_dialog_pos, "updates");
deleted_message_ids.push_back(message_id.get()); deleted_message_ids.push_back(message == nullptr ? message_id.get() : message->message_id.get());
} }
if (need_update_dialog_pos) { if (need_update_dialog_pos) {
send_update_chat_last_message(d, "delete_dialog_messages_from_updates"); send_update_chat_last_message(d, "delete_dialog_messages_from_updates");
@ -8906,9 +8906,9 @@ void MessagesManager::delete_dialog_messages_from_user(DialogId dialog_id, UserI
CHECK(m->sender_user_id == user_id); CHECK(m->sender_user_id == user_id);
CHECK(m->message_id == message_id); CHECK(m->message_id == message_id);
if (can_delete_channel_message(channel_status, m, is_bot)) { if (can_delete_channel_message(channel_status, m, is_bot)) {
deleted_message_ids.push_back(message_id.get());
auto p = delete_message(d, message_id, true, &need_update_dialog_pos, "delete messages from user"); auto p = delete_message(d, message_id, true, &need_update_dialog_pos, "delete messages from user");
CHECK(p.get() == m); CHECK(p.get() == m);
deleted_message_ids.push_back(p->message_id.get());
} }
} }
@ -9703,10 +9703,10 @@ void MessagesManager::set_dialog_max_unavailable_message_id(DialogId dialog_id,
CHECK(m != nullptr); CHECK(m != nullptr);
CHECK(m->message_id <= max_unavailable_message_id); CHECK(m->message_id <= max_unavailable_message_id);
CHECK(m->message_id == message_id); CHECK(m->message_id == message_id);
deleted_message_ids.push_back(message_id.get());
auto p = auto p =
delete_message(d, message_id, !from_update, &need_update_dialog_pos, "set_dialog_max_unavailable_message_id"); delete_message(d, message_id, !from_update, &need_update_dialog_pos, "set_dialog_max_unavailable_message_id");
CHECK(p.get() == m); CHECK(p.get() == m);
deleted_message_ids.push_back(p->message_id.get());
} }
if (need_update_dialog_pos) { if (need_update_dialog_pos) {
@ -11256,7 +11256,7 @@ FullMessageId MessagesManager::on_get_message(MessageInfo &&message_info, bool f
auto p = delete_message(d, message_id, false, &need_update_dialog_pos, "get a message in inaccessible chat"); auto p = delete_message(d, message_id, false, &need_update_dialog_pos, "get a message in inaccessible chat");
CHECK(p.get() == m); CHECK(p.get() == m);
// CHECK(d->messages == nullptr); // CHECK(d->messages == nullptr);
send_update_delete_messages(dialog_id, {message_id.get()}, false, false); send_update_delete_messages(dialog_id, {p->message_id.get()}, false, false);
// don't need to update dialog pos // don't need to update dialog pos
return FullMessageId(); return FullMessageId();
} }
@ -11357,9 +11357,9 @@ void MessagesManager::set_dialog_last_new_message_id(Dialog *d, MessageId last_n
vector<int64> deleted_message_ids; vector<int64> deleted_message_ids;
bool need_update_dialog_pos = false; bool need_update_dialog_pos = false;
for (auto message_id : to_delete_message_ids) { for (auto message_id : to_delete_message_ids) {
if (delete_message(d, message_id, false, &need_update_dialog_pos, "set_dialog_last_new_message_id") != auto message = delete_message(d, message_id, false, &need_update_dialog_pos, "set_dialog_last_new_message_id");
nullptr) { if (message != nullptr) {
deleted_message_ids.push_back(message_id.get()); deleted_message_ids.push_back(message->message_id.get());
} }
} }
if (need_update_dialog_pos) { if (need_update_dialog_pos) {
@ -21663,7 +21663,7 @@ void MessagesManager::remove_message_notifications_by_message_ids(DialogId dialo
d->mention_notification_group.group_id, message_id, true, "remove_message_notifications_by_message_ids"); d->mention_notification_group.group_id, message_id, true, "remove_message_notifications_by_message_ids");
continue; continue;
} }
deleted_message_ids.push_back(message_id.get()); deleted_message_ids.push_back(message->message_id.get());
} }
if (need_update_dialog_pos) { if (need_update_dialog_pos) {
@ -25497,10 +25497,12 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
} }
if (message_content_type == MessageContentType::ChatDeleteHistory) { if (message_content_type == MessageContentType::ChatDeleteHistory) {
{
auto m = delete_message(d, message_id, true, need_update_dialog_pos, "message chat delete history"); auto m = delete_message(d, message_id, true, need_update_dialog_pos, "message chat delete history");
if (m != nullptr) { if (m != nullptr) {
send_update_delete_messages(dialog_id, {m->message_id.get()}, true, false); send_update_delete_messages(dialog_id, {m->message_id.get()}, true, false);
} }
}
int32 last_message_date = 0; int32 last_message_date = 0;
if (d->last_message_id != MessageId()) { if (d->last_message_id != MessageId()) {
auto last_message = get_message(d, d->last_message_id); auto last_message = get_message(d, d->last_message_id);
@ -26117,7 +26119,7 @@ MessagesManager::Message *MessagesManager::add_scheduled_message_to_dialog(Dialo
if (old_message_id != message_id) { if (old_message_id != message_id) {
message = do_delete_scheduled_message(d, old_message_id, false, "add_scheduled_message_to_dialog"); message = do_delete_scheduled_message(d, old_message_id, false, "add_scheduled_message_to_dialog");
CHECK(message != nullptr); CHECK(message != nullptr);
send_update_delete_messages(dialog_id, {old_message_id.get()}, false, false); send_update_delete_messages(dialog_id, {message->message_id.get()}, false, false);
set_message_id(message, message_id); set_message_id(message, message_id);
} else { } else {
*need_update = false; *need_update = false;