tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Extract delete_all_dialog_notifications from delete_all_dialog_messages_from_database.

Browse Source
This commit is contained in:
levlam 2023-09-13 16:29:37 +03:00
parent 721f0ae9e4
commit e65e5b0b49
2 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
td/telegram/MessagesManager.cpp
View File

@ -11969,6 +11969,8 @@ void MessagesManager::delete_all_dialog_messages(Dialog *d, bool remove_from_dia
if (d->notification_info != nullptr) {
// they aren't needed anymore
delete_all_dialog_notifications(d, MessageId::max(), "delete_all_dialog_messages 4");
d->notification_info->message_notification_group_.drop_max_removed_notification_id();
d->notification_info->mention_notification_group_.drop_max_removed_notification_id();
d->notification_info->notification_id_to_message_id_.clear();
@ -15037,6 +15039,7 @@ void MessagesManager::set_dialog_last_new_message_id(Dialog *d, MessageId last_n
<< last_new_message_id << " " << d->last_new_message_id << " " << source;
CHECK(d->dialog_id.get_type() == DialogType::SecretChat || last_new_message_id.is_server());
if (!d->last_new_message_id.is_valid()) {
delete_all_dialog_notifications(d, last_new_message_id, source);
remove_dialog_newer_messages(d, last_new_message_id, source);
auto last_new_message = get_message(d, last_new_message_id);
@ -35393,11 +35396,11 @@ void MessagesManager::add_message_to_database(const Dialog *d, const Message *m,
Auto()); // TODO Promise
}
void MessagesManager::delete_all_dialog_messages_from_database(Dialog *d, MessageId max_message_id,
const char *source) {
void MessagesManager::delete_all_dialog_notifications(Dialog *d, MessageId max_message_id, const char *source) {
CHECK(d != nullptr);
CHECK(max_message_id.is_valid());
if (d->notification_info != nullptr) {
if (d->notification_info == nullptr) {
return;
}
if (d->notification_info->new_secret_chat_notification_id_.is_valid()) {
remove_new_secret_chat_notification(d, true);
}
@ -35409,6 +35412,10 @@ void MessagesManager::delete_all_dialog_messages_from_database(Dialog *d, Messag
remove_message_dialog_notifications(d, max_message_id, true, source);
}
void MessagesManager::delete_all_dialog_messages_from_database(Dialog *d, MessageId max_message_id,
const char *source) {
CHECK(d != nullptr);
CHECK(max_message_id.is_valid());
if (!G()->use_message_database()) {
return;
}
@ -38496,6 +38503,7 @@ void MessagesManager::on_get_channel_dialog(DialogId dialog_id, MessageId last_m
!td_->auth_manager_->is_bot()) { // if last message is really a new message
if (!d->last_new_message_id.is_valid() && last_message_id <= d->max_added_message_id) {
auto prev_message_id = MessageId(ServerMessageId(last_message_id.get_server_message_id().get() - 1));
delete_all_dialog_notifications(d, prev_message_id, "on_get_channel_dialog 14");
remove_dialog_newer_messages(d, prev_message_id, "on_get_channel_dialog 15");
}
d->last_new_message_id = MessageId();

2
td/telegram/MessagesManager.h
View File

@ -2318,6 +2318,8 @@ class MessagesManager final : public Actor {
void add_message_to_database(const Dialog *d, const Message *m, const char *source);
void delete_all_dialog_notifications(Dialog *d, MessageId max_message_id, const char *source);
void delete_all_dialog_messages_from_database(Dialog *d, MessageId max_message_id, const char *source);
void delete_message_from_database(Dialog *d, MessageId message_id, const Message *m, bool is_permanently_deleted,