From 415229bfa6368095223716a869286d2bb75a0b09 Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 30 Nov 2019 18:05:30 +0300 Subject: [PATCH] Pass only dialog_id to need_delete_message_files. GitOrigin-RevId: e5396f6bcaea435dca161d0cd47addfca42bfb79 --- td/telegram/MessagesManager.cpp | 11 +++++------ td/telegram/MessagesManager.h | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index ad22a138e..4a46fbc97 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -24783,7 +24783,7 @@ 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 (need_delete_message_files(d, m)) { + if (need_delete_message_files(dialog_id, m)) { FullMessageId full_message_id{dialog_id, message_id}; for (auto file_id : old_file_ids) { if (!td::contains(new_file_ids, file_id) && need_delete_file(full_message_id, file_id)) { @@ -25383,7 +25383,7 @@ MessagesManager::Message *MessagesManager::add_scheduled_message_to_dialog(Dialo CHECK(need_update_dialog_pos == false); auto new_file_ids = get_message_content_file_ids(m->content.get(), td_); if (new_file_ids != old_file_ids) { - if (need_delete_message_files(d, m)) { + if (need_delete_message_files(dialog_id, m)) { FullMessageId full_message_id{dialog_id, message_id}; for (auto file_id : old_file_ids) { if (!td::contains(new_file_ids, file_id) && need_delete_file(full_message_id, file_id)) { @@ -25603,13 +25603,12 @@ bool MessagesManager::need_delete_file(FullMessageId full_message_id, FileId fil return true; } -bool MessagesManager::need_delete_message_files(Dialog *d, const Message *m) const { +bool MessagesManager::need_delete_message_files(DialogId dialog_id, const Message *m) const { if (m == nullptr) { return false; } - CHECK(d != nullptr); - auto dialog_type = d->dialog_id.get_type(); + auto dialog_type = dialog_id.get_type(); if (!m->message_id.is_scheduled() && !m->message_id.is_server() && dialog_type != DialogType::SecretChat) { return false; } @@ -25664,7 +25663,7 @@ void MessagesManager::delete_message_from_database(Dialog *d, MessageId message_ d->mention_notification_group.group_id, message_id, false, "delete_message_from_database"); } - auto need_delete_files = need_delete_message_files(d, m); + auto need_delete_files = need_delete_message_files(d->dialog_id, m); if (need_delete_files) { delete_message_files(d->dialog_id, m); } diff --git a/td/telegram/MessagesManager.h b/td/telegram/MessagesManager.h index cbb2db943..ae2552cb1 100644 --- a/td/telegram/MessagesManager.h +++ b/td/telegram/MessagesManager.h @@ -1708,7 +1708,7 @@ class MessagesManager : public Actor { bool need_delete_file(FullMessageId full_message_id, FileId file_id) const; - bool need_delete_message_files(Dialog *d, const Message *m) const; + bool need_delete_message_files(DialogId dialog_id, const Message *m) const; void add_message_to_database(const Dialog *d, const Message *m, const char *source);