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

Better force_update in remove_dialog_mention_notifications.

Browse Source 
GitOrigin-RevId: bf18d62c801ff705ba93ea6d56ee69f7b186f30c
This commit is contained in:
levlam 2019-03-27 03:10:24 +03:00
parent 5d00a38046
commit ad2690b2a6
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
td/telegram/MessagesManager.cpp
View File

@ -10251,6 +10251,7 @@ void MessagesManager::remove_dialog_mention_notifications(Dialog *d) {
VLOG(notifications) << "Remove mention notifications in " << d->dialog_id; VLOG(notifications) << "Remove mention notifications in " << d->dialog_id;
vector<MessageId> message_ids; vector<MessageId> message_ids;
vector<NotificationId> removed_notification_ids;
find_unread_mentions(d->messages, message_ids); find_unread_mentions(d->messages, message_ids);
VLOG(notifications) << "Found unread mentions in " << message_ids; VLOG(notifications) << "Found unread mentions in " << message_ids;
for (auto &message_id : message_ids) { for (auto &message_id : message_ids) {
@ -10258,8 +10259,7 @@ void MessagesManager::remove_dialog_mention_notifications(Dialog *d) {
CHECK(m != nullptr); CHECK(m != nullptr);
if (m->notification_id.is_valid() && is_message_notification_active(d, m) && if (m->notification_id.is_valid() && is_message_notification_active(d, m) &&
is_from_mention_notification_group(d, m)) { is_from_mention_notification_group(d, m)) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification, notification_group_id, removed_notification_ids.push_back(m->notification_id);
m->notification_id, false, true, Promise<Unit>());
} }
} }
@ -10270,11 +10270,15 @@ void MessagesManager::remove_dialog_mention_notifications(Dialog *d) {
auto m = get_message_force(d, message_id, "remove_dialog_mention_notifications"); auto m = get_message_force(d, message_id, "remove_dialog_mention_notifications");
if (m != nullptr && m->notification_id.is_valid() && is_message_notification_active(d, m)) { if (m != nullptr && m->notification_id.is_valid() && is_message_notification_active(d, m)) {
CHECK(is_from_mention_notification_group(d, m)); CHECK(is_from_mention_notification_group(d, m));
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification, removed_notification_ids.push_back(m->notification_id);
notification_group_id, m->notification_id, false, true, Promise<Unit>());
} }
} }
} }
for (size_t i = 0; i < removed_notification_ids.size(); i++) {
send_closure_later(G()->notification_manager(), &NotificationManager::remove_notification, notification_group_id,
removed_notification_ids[i], false, i + 1 == removed_notification_ids.size(), Promise<Unit>());
}
} }
bool MessagesManager::set_dialog_last_notification(DialogId dialog_id, NotificationGroupInfo &group_info, bool MessagesManager::set_dialog_last_notification(DialogId dialog_id, NotificationGroupInfo &group_info,