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

Add NotificationGroupInfo.has_group_id.

Browse Source
This commit is contained in:
levlam 2023-08-22 02:34:26 +03:00
parent 5144656f2b
commit ce1fdf097c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/MessagesManager.cpp
View File

@ -16092,8 +16092,8 @@ bool MessagesManager::is_notification_info_group_id(const NotificationInfo *noti
if (!group_id.is_valid() || notification_info == nullptr) {
return false;
}
return notification_info->message_notification_group_.get_group_id() == group_id ||
notification_info->mention_notification_group_.get_group_id() == group_id;
return notification_info->message_notification_group_.has_group_id(group_id) ||
notification_info->mention_notification_group_.has_group_id(group_id);
}
bool MessagesManager::is_dialog_notification_group_id(const Dialog *d, NotificationGroupId group_id) {
@ -29106,7 +29106,7 @@ MessagesManager::MessageNotificationGroup MessagesManager::get_message_notificat
CHECK(is_dialog_notification_group_id(d, group_id));
}
bool from_mentions = d->notification_info->mention_notification_group_.get_group_id() == group_id;
bool from_mentions = d->notification_info->mention_notification_group_.has_group_id(group_id);
auto &group_info = get_notification_group_info(d, from_mentions);
MessageNotificationGroup result;
@ -29444,7 +29444,7 @@ void MessagesManager::get_message_notifications_from_database(DialogId dialog_id
VLOG(notifications) << "Get " << limit << " message notifications from database in " << group_id << " from "
<< dialog_id << " from " << from_notification_id << "/" << from_message_id;
bool from_mentions = d->notification_info->mention_notification_group_.get_group_id() == group_id;
bool from_mentions = d->notification_info->mention_notification_group_.has_group_id(group_id);
if (d->notification_info->new_secret_chat_notification_id_.is_valid()) {
CHECK(dialog_id.get_type() == DialogType::SecretChat);
vector<Notification> notifications;
@ -29631,7 +29631,7 @@ void MessagesManager::remove_message_notification(DialogId dialog_id, Notificati
return; // there can be no notification with this ID
}
bool from_mentions = d->notification_info->mention_notification_group_.get_group_id() == group_id;
bool from_mentions = d->notification_info->mention_notification_group_.has_group_id(group_id);
if (d->notification_info->new_secret_chat_notification_id_.is_valid()) {
if (!from_mentions && d->notification_info->new_secret_chat_notification_id_ == notification_id) {
return remove_new_secret_chat_notification(d, false);
@ -29728,7 +29728,7 @@ void MessagesManager::remove_message_notifications(DialogId dialog_id, Notificat
}
CHECK(!max_message_id.is_scheduled());
bool from_mentions = d->notification_info->mention_notification_group_.get_group_id() == group_id;
bool from_mentions = d->notification_info->mention_notification_group_.has_group_id(group_id);
if (d->notification_info->new_secret_chat_notification_id_.is_valid()) {
if (!from_mentions && d->notification_info->new_secret_chat_notification_id_.get() <= max_notification_id.get()) {
return remove_new_secret_chat_notification(d, false);

4
td/telegram/NotificationGroupInfo.h
View File

@ -43,6 +43,10 @@ class NotificationGroupInfo {
return group_id_;
}
bool has_group_id(NotificationGroupId group_id) const {
return group_id_ == group_id;
}
NotificationId get_last_notification_id() const {
return last_notification_id_;
}