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

Improve updateMessageId handling.

Browse Source 
GitOrigin-RevId: 6eb271f26f3bfda0544bb887e8b763f3b5b4b452
This commit is contained in:
levlam 2019-12-30 02:56:52 +03:00
parent ea3c65b3aa
commit 05a99dedb1
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
td/telegram/MessagesManager.cpp
View File

@ -6596,6 +6596,7 @@ void MessagesManager::after_get_difference() {
send_update_unread_chat_count(DialogId(), false, "after_get_difference"); send_update_unread_chat_count(DialogId(), false, "after_get_difference");
} }
vector<FullMessageId> update_message_ids_to_delete;
for (auto &it : update_message_ids_) { for (auto &it : update_message_ids_) {
// this is impossible for ordinary chats because updates coming during getDifference have already been applied // this is impossible for ordinary chats because updates coming during getDifference have already been applied
auto dialog_id = it.first.get_dialog_id(); auto dialog_id = it.first.get_dialog_id();
@ -6608,6 +6609,19 @@ void MessagesManager::after_get_difference() {
// fallthrough // fallthrough
case DialogType::User: case DialogType::User:
case DialogType::Chat: case DialogType::Chat:
if (!have_message({dialog_id, it.second})) {
// The sent message has already been deleted by the user or sent to inaccessible channel.
// The sent message may never be received, but we will need updateMessageId in case the message is received
// to delete it from the server and to not add to the chat.
// But if the chat is inaccessible, then likely we will be unable to delete the message from server and
// will delete it from the chat just after it is added. So we remove updateMessageId for such messages in
// order to not check them over and over.
if (!have_input_peer(dialog_id, AccessRights::Read)) {
update_message_ids_to_delete.push_back(it.first);
}
break;
}
LOG(ERROR) << "Receive updateMessageId from " << it.second << " to " << it.first LOG(ERROR) << "Receive updateMessageId from " << it.second << " to " << it.first
<< " but not receive corresponding message. " << td_->updates_manager_->get_state(); << " but not receive corresponding message. " << td_->updates_manager_->get_state();
if (dialog_id.get_type() != DialogType::Channel) { if (dialog_id.get_type() != DialogType::Channel) {
@ -6631,6 +6645,9 @@ void MessagesManager::after_get_difference() {
break; break;
} }
} }
for (auto full_message_id : update_message_ids_to_delete) {
update_message_ids_.erase(full_message_id);
}
if (!G()->td_db()->get_binlog_pmc()->isset("fetched_marks_as_unread") && !td_->auth_manager_->is_bot()) { if (!G()->td_db()->get_binlog_pmc()->isset("fetched_marks_as_unread") && !td_->auth_manager_->is_bot()) {
td_->create_handler<GetDialogUnreadMarksQuery>()->send(); td_->create_handler<GetDialogUnreadMarksQuery>()->send();