From d22fbcaba6578ac9ad059bf6d648fb8edcea263d Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 21 Aug 2023 19:54:12 +0300 Subject: [PATCH] Add NotificationGroupInfo constructors. --- td/telegram/MessagesManager.cpp | 5 ++--- td/telegram/NotificationGroupInfo.h | 5 +++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index b21ceb7b7..bdd29ab6c 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -28893,8 +28893,7 @@ NotificationGroupId MessagesManager::get_dialog_notification_group_id(DialogId d return NotificationGroupId(); } } while (get_message_notification_group_force(next_notification_group_id).dialog_id.is_valid()); - group_info.group_id_ = next_notification_group_id; - group_info.is_changed_ = true; + group_info = NotificationGroupInfo(next_notification_group_id); VLOG(notifications) << "Assign " << next_notification_group_id << " to " << dialog_id; on_dialog_updated(dialog_id, "get_dialog_notification_group_id"); @@ -29091,7 +29090,7 @@ MessagesManager::MessageNotificationGroup MessagesManager::get_message_notificat !d->notification_info->mention_notification_group_.group_id_.is_valid()) { // the group was reused, but wasn't deleted from the database, trying to resave it auto &group_info = d->notification_info->message_notification_group_; - group_info.group_id_ = group_id; + group_info = NotificationGroupInfo(group_id); group_info.try_reuse(); save_dialog_to_database(d->dialog_id); group_info = NotificationGroupInfo(); diff --git a/td/telegram/NotificationGroupInfo.h b/td/telegram/NotificationGroupInfo.h index 0ee8bf53c..a35e50703 100644 --- a/td/telegram/NotificationGroupInfo.h +++ b/td/telegram/NotificationGroupInfo.h @@ -25,6 +25,11 @@ class NotificationGroupInfo { MessageId max_removed_message_id_; // message identifier, up to which all notifications are removed bool is_changed_ = false; // true, if the group needs to be saved to database + NotificationGroupInfo() = default; + + explicit NotificationGroupInfo(NotificationGroupId group_id) : group_id_(group_id), is_changed_(true) { + } + bool is_active() const { return group_id_.is_valid() && !try_reuse_; }