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

Make NotificationGroupInfo::try_reuse_ private.

Browse Source
This commit is contained in:
levlam 2023-08-21 19:28:05 +03:00
parent d2cf780a1f
commit 6c4545fb3f
3 changed files with 77 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
td/telegram/MessagesManager.cpp
View File

@ -5219,12 +5219,10 @@ void MessagesManager::Dialog::store(StorerT &storer) const {
bool has_deleted_last_message = delete_last_message_date > 0;
bool has_last_clear_history_message_id = last_clear_history_message_id.is_valid();
bool has_last_database_message_id = !has_last_database_message && last_database_message_id.is_valid();
bool has_message_notification_group = notification_info != nullptr &&
notification_info->message_notification_group_.group_id.is_valid() &&
!notification_info->message_notification_group_.try_reuse;
bool has_mention_notification_group = notification_info != nullptr &&
notification_info->mention_notification_group_.group_id.is_valid() &&
!notification_info->mention_notification_group_.try_reuse;
bool has_message_notification_group =
notification_info != nullptr && notification_info->message_notification_group_.is_active();
bool has_mention_notification_group =
notification_info != nullptr && notification_info->mention_notification_group_.is_active();
bool has_new_secret_chat_notification_id =
notification_info != nullptr && notification_info->new_secret_chat_notification_id_.is_valid();
bool has_pinned_message_notification =
@ -6084,18 +6082,15 @@ void MessagesManager::save_dialog_to_database(DialogId dialog_id) {
CHECK(d != nullptr);
LOG(INFO) << "Save " << dialog_id << " to database";
vector<NotificationGroupKey> changed_group_keys;
bool can_reuse_notification_group = false;
if (d->notification_info != nullptr) {
auto add_group_key = [&](auto &group_info) {
if (group_info.is_changed) {
can_reuse_notification_group |= group_info.try_reuse;
changed_group_keys.emplace_back(group_info.group_id, group_info.try_reuse ? DialogId() : dialog_id,
group_info.last_notification_date);
group_info.is_changed = false;
}
};
add_group_key(d->notification_info->message_notification_group_);
add_group_key(d->notification_info->mention_notification_group_);
d->notification_info->message_notification_group_.add_group_key_if_changed(changed_group_keys, dialog_id);
d->notification_info->mention_notification_group_.add_group_key_if_changed(changed_group_keys, dialog_id);
}
bool can_reuse_notification_group = false;
for (auto &group_key : changed_group_keys) {
if (group_key.dialog_id == DialogId()) {
can_reuse_notification_group = true;
}
}
G()->td_db()->get_dialog_db_async()->add_dialog(
dialog_id, d->folder_id, d->order, get_dialog_database_value(d), std::move(changed_group_keys),
@ -6121,26 +6116,11 @@ void MessagesManager::on_save_dialog_to_database(DialogId dialog_id, bool can_re
}
void MessagesManager::try_reuse_notification_group(NotificationGroupInfo &group_info) {
if (!group_info.try_reuse) {
return;
auto group_id = group_info.get_reused_group_id();
if (group_id.is_valid()) {
send_closure_later(G()->notification_manager(), &NotificationManager::try_reuse_notification_group_id, group_id);
notification_group_id_to_dialog_id_.erase(group_id);
}
if (group_info.is_changed) {
LOG(ERROR) << "Failed to reuse changed " << group_info.group_id;
return;
}
group_info.try_reuse = false;
if (!group_info.group_id.is_valid()) {
LOG(ERROR) << "Failed to reuse invalid " << group_info.group_id;
return;
}
CHECK(group_info.last_notification_id == NotificationId());
CHECK(group_info.last_notification_date == 0);
send_closure_later(G()->notification_manager(), &NotificationManager::try_reuse_notification_group_id,
group_info.group_id);
notification_group_id_to_dialog_id_.erase(group_info.group_id);
group_info.group_id = NotificationGroupId();
group_info.max_removed_notification_id = NotificationId();
group_info.max_removed_message_id = MessageId();
}
void MessagesManager::invalidate_message_indexes(Dialog *d) {
@ -14051,9 +14031,7 @@ void MessagesManager::on_update_secret_chat_state(SecretChatId secret_chat_id, S
if (d->notification_info->message_notification_group_.group_id.is_valid() &&
get_dialog_pending_notification_count(d, false) == 0 &&
!d->notification_info->message_notification_group_.last_notification_id.is_valid()) {
CHECK(d->notification_info->message_notification_group_.last_notification_date == 0);
d->notification_info->message_notification_group_.try_reuse = true;
d->notification_info->message_notification_group_.is_changed = true;
d->notification_info->message_notification_group_.try_reuse();
on_dialog_updated(d->dialog_id, "on_update_secret_chat_state");
}
CHECK(!d->notification_info->mention_notification_group_.group_id
@ -29115,12 +29093,9 @@ MessagesManager::MessageNotificationGroup MessagesManager::get_message_notificat
// 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.is_changed = true;
group_info.try_reuse = true;
group_info.try_reuse();
save_dialog_to_database(d->dialog_id);
group_info.group_id = NotificationGroupId();
group_info.is_changed = false;
group_info.try_reuse = false;
group_info = NotificationGroupInfo();
}
}

42
td/telegram/NotificationGroupInfo.cpp
View File

@ -6,8 +6,50 @@
//
#include "td/telegram/NotificationGroupInfo.h"
#include "td/utils/logging.h"
namespace td {
void NotificationGroupInfo::try_reuse() {
CHECK(group_id.is_valid());
CHECK(last_notification_date == 0);
if (!try_reuse_) {
try_reuse_ = true;
is_changed = true;
}
}
void NotificationGroupInfo::add_group_key_if_changed(vector<NotificationGroupKey> &group_keys, DialogId dialog_id) {
if (!is_changed) {
return;
}
is_changed = false;
group_keys.emplace_back(group_id, try_reuse_ ? DialogId() : dialog_id, last_notification_date);
}
NotificationGroupId NotificationGroupInfo::get_reused_group_id() {
if (!try_reuse_) {
return {};
}
if (is_changed) {
LOG(ERROR) << "Failed to reuse changed " << group_id;
return {};
}
try_reuse_ = false;
if (!group_id.is_valid()) {
LOG(ERROR) << "Failed to reuse invalid " << group_id;
return {};
}
CHECK(last_notification_id == NotificationId());
CHECK(last_notification_date == 0);
auto result = group_id;
group_id = NotificationGroupId();
max_removed_notification_id = NotificationId();
max_removed_message_id = MessageId();
return result;
}
StringBuilder &operator<<(StringBuilder &string_builder, const NotificationGroupInfo &group_info) {
return string_builder << group_info.group_id << " with last " << group_info.last_notification_id << " sent at "
<< group_info.last_notification_date << ", max removed "

18
td/telegram/NotificationGroupInfo.h
View File

@ -6,20 +6,34 @@
//
#pragma once
#include "td/telegram/DialogId.h"
#include "td/telegram/MessageId.h"
#include "td/telegram/NotificationGroupId.h"
#include "td/telegram/NotificationGroupKey.h"
#include "td/telegram/NotificationId.h"
namespace td {
struct NotificationGroupInfo {
class NotificationGroupInfo {
bool try_reuse_ = false; // true, if the group needs to be deleted from database and tried to be reused
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
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
bool is_active() const {
return group_id.is_valid() && !try_reuse_;
}
void try_reuse();
void add_group_key_if_changed(vector<NotificationGroupKey> &group_keys, DialogId dialog_id);
NotificationGroupId get_reused_group_id();
template <class StorerT>
void store(StorerT &storer) const;