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

Make NotificationGroupInfo.max_removed_message_id_ private.

Browse Source
This commit is contained in:
levlam 2023-08-21 21:43:26 +03:00
parent c40b2b95d2
commit 4e031ed7fd
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/MessagesManager.cpp
View File

@ -29906,7 +29906,7 @@ bool MessagesManager::add_new_message_notification(Dialog *d, Message *m, bool f
from_mentions ? m->contains_unread_mention || is_pinned : m->message_id > d->last_read_inbox_message_id;
if (is_active) {
auto &group_info = get_notification_group_info(d, from_mentions);
if (group_info.max_removed_message_id_ >= m->message_id) {
if (group_info.is_removed_message_id(m->message_id)) {
is_active = false;
}
}
@ -36697,7 +36697,7 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
on_dialog_updated(dialog_id, "fix pinned message notification");
} else if (is_dialog_pinned_message_notifications_disabled(d) ||
pinned_message_id <= d->last_read_inbox_message_id ||
pinned_message_id <= d->notification_info->mention_notification_group_.max_removed_message_id_) {
d->notification_info->mention_notification_group_.is_removed_message_id(pinned_message_id)) {
VLOG(notifications) << "Remove disabled pinned message notification in " << pinned_message_id << " in "
<< dialog_id;
send_closure_later(G()->notification_manager(), &NotificationManager::remove_temporary_notification_by_message_id,
@ -36709,7 +36709,7 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
}
if (d->notification_info != nullptr && d->notification_info->new_secret_chat_notification_id_.is_valid()) {
auto &group_info = d->notification_info->message_notification_group_;
if (d->notification_info->new_secret_chat_notification_id_.get() <= group_info.max_removed_notification_id_.get() ||
if (group_info.is_removed_notification_id(d->notification_info->new_secret_chat_notification_id_) ||
(group_info.last_notification_date_ == 0 && group_info.max_removed_notification_id_.get() == 0)) {
VLOG(notifications) << "Fix removing new secret chat " << d->notification_info->new_secret_chat_notification_id_
<< " in " << dialog_id;

10
td/telegram/NotificationGroupInfo.cpp
View File

@ -56,7 +56,15 @@ void NotificationGroupInfo::drop_max_removed_notification_id() {
}
bool NotificationGroupInfo::is_removed_notification(NotificationId notification_id, MessageId message_id) const {
return notification_id.get() <= max_removed_notification_id_.get() || message_id <= max_removed_message_id_;
return is_removed_notification_id(notification_id) || is_removed_message_id(message_id);
}
bool NotificationGroupInfo::is_removed_notification_id(NotificationId notification_id) const {
return notification_id.get() <= max_removed_notification_id_.get();
}
bool NotificationGroupInfo::is_removed_message_id(MessageId message_id) const {
return message_id <= max_removed_message_id_;
}
bool NotificationGroupInfo::is_used_notification_id(NotificationId notification_id) const {

12
td/telegram/NotificationGroupInfo.h
View File

@ -15,15 +15,17 @@
namespace td {
class NotificationGroupInfo {
bool is_changed_ = false; // true, if the group needs to be saved to database
bool try_reuse_ = false; // true, if the group needs to be deleted from database and tried to be reused
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
bool try_reuse_ = false; // true, if the group needs to be deleted from database and tried to be reused
friend StringBuilder &operator<<(StringBuilder &string_builder, const NotificationGroupInfo &group_info);
public:
NotificationGroupId group_id_;
int32 last_notification_date_ = 0; // date of last notification in the group
NotificationId last_notification_id_; // identifier of last notification in the group
NotificationId max_removed_notification_id_; // notification identifier, up to which all notifications are removed
MessageId max_removed_message_id_; // message identifier, up to which all notifications are removed
NotificationGroupInfo() = default;
@ -43,6 +45,10 @@ class NotificationGroupInfo {
bool is_removed_notification(NotificationId notification_id, MessageId message_id) const;
bool is_removed_notification_id(NotificationId notification_id) const;
bool is_removed_message_id(MessageId message_id) const;
bool is_used_notification_id(NotificationId notification_id) const;
void try_reuse();