RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

First send delete request, then destroy locally.

This commit is contained in:
John Preston 2020-02-20 12:51:53 +04:00
parent c8d2ac9583
commit 7cffb0ef9d
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Telegram/SourceFiles/boxes/confirm_box.cpp
View File

@ -785,6 +785,8 @@ void DeleteMessagesBox::deleteAndClear() {
_deleteConfirmedCallback();
}
auto remove = std::vector<not_null<HistoryItem*>>();
remove.reserve(_ids.size());
base::flat_map<not_null<PeerData*>, QVector<MTPint>> idsByPeer;
base::flat_map<not_null<PeerData*>, QVector<MTPint>> scheduledIdsByPeer;
for (const auto itemId : _ids) {
@ -801,15 +803,9 @@ void DeleteMessagesBox::deleteAndClear() {
}
continue;
}
const auto wasOnServer = IsServerMsgId(item->id);
const auto wasLast = (history->lastMessage() == item);
const auto wasInChats = (history->chatListMessage() == item);
item->destroy();
if (wasOnServer) {
remove.push_back(item);
if (IsServerMsgId(item->id)) {
idsByPeer[history->peer].push_back(MTP_int(itemId.msg));
} else if (wasLast || wasInChats) {
history->requestChatListMessage();
}
}
}
@ -826,6 +822,17 @@ void DeleteMessagesBox::deleteAndClear() {
}).send();
}
for (const auto item : remove) {
const auto history = item->history();
const auto wasLast = (history->lastMessage() == item);
const auto wasInChats = (history->chatListMessage() == item);
item->destroy();
if (wasLast || wasInChats) {
history->requestChatListMessage();
}
}
const auto session = _session;
Ui::hideLayer();
session->data().sendHistoryChangeNotifications();