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

Fix deletion of files from edited messages.

Browse Source 
GitOrigin-RevId: b19cf5878e8fd4857d4e7e4eb8913212f91043c2
This commit is contained in:
levlam 2019-04-14 23:05:48 +03:00
parent 08235274ed
commit a662c5b102
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
td/telegram/MessagesManager.cpp
View File

@ -22351,11 +22351,12 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
}
auto new_file_ids = get_message_content_file_ids(m->content.get(), td_);
if (new_file_ids != old_file_ids) {
if (m->ttl && m->message_id.is_server()) {
if (m->message_id.is_server() &&
(dialog_id.get_type() == DialogType::User || dialog_id.get_type() == DialogType::SecretChat)) {
for (auto file_id : old_file_ids) {
if (std::find(new_file_ids.begin(), new_file_ids.end(), file_id) == new_file_ids.end()) {
send_closure(G()->file_manager(), &FileManager::delete_file, file_id, Promise<>(),
"add_message_to_dialog");
"edit message in add_message_to_dialog");
}
}
}
@ -23468,10 +23469,6 @@ bool MessagesManager::update_message_content(DialogId dialog_id, Message *old_me
if (is_message_in_dialog) {
unregister_message_content(td_, old_content.get(), {dialog_id, old_message->message_id});
}
if (old_message->message_id.is_server() &&
(dialog_id.get_type() == DialogType::User || dialog_id.get_type() == DialogType::SecretChat)) {
delete_message_files(old_message);
}
old_content = std::move(new_content);
if (is_message_in_dialog) {
register_message_content(td_, old_content.get(), {dialog_id, old_message->message_id});