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

Load message notification groups by group_id.

Browse Source 
GitOrigin-RevId: 51169f873ea08a971f53f6c75cd7fe4ad5978b4d
This commit is contained in:
levlam 2018-11-28 19:21:18 +03:00
parent b5abe4b751
commit 1b14cffb19
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
td/telegram/MessagesManager.cpp
View File

@ -17419,6 +17419,8 @@ NotificationGroupId MessagesManager::get_dialog_message_notification_group_id(Di
VLOG(notifications) << "Assign " << d->message_notification_group_id << " to " << d->dialog_id; VLOG(notifications) << "Assign " << d->message_notification_group_id << " to " << d->dialog_id;
on_dialog_updated(d->dialog_id, "get_dialog_message_notification_group_id"); on_dialog_updated(d->dialog_id, "get_dialog_message_notification_group_id");
notification_group_id_to_dialog_id_.emplace(d->message_notification_group_id, d->dialog_id);
if (running_get_channel_difference(d->dialog_id) || if (running_get_channel_difference(d->dialog_id) ||
get_channel_difference_to_logevent_id_.count(d->dialog_id) != 0) { get_channel_difference_to_logevent_id_.count(d->dialog_id) != 0) {
send_closure_later(td_->notification_manager_actor_, &NotificationManager::before_get_chat_difference, send_closure_later(td_->notification_manager_actor_, &NotificationManager::before_get_chat_difference,
@ -17432,10 +17434,31 @@ NotificationGroupId MessagesManager::get_dialog_message_notification_group_id(Di
MessagesManager::MessageNotificationGroup MessagesManager::get_message_notification_group_force( MessagesManager::MessageNotificationGroup MessagesManager::get_message_notification_group_force(
NotificationGroupId group_id) { NotificationGroupId group_id) {
CHECK(group_id.is_valid());
MessageNotificationGroup result; MessageNotificationGroup result;
if (G()->parameters().use_message_db) { Dialog *d = nullptr;
// TODO load message notification group auto it = notification_group_id_to_dialog_id_.find(group_id);
if (it != notification_group_id_to_dialog_id_.end()) {
d = get_dialog(it->second);
CHECK(d != nullptr);
} else if (G()->parameters().use_message_db) {
auto r_value = G()->td_db()->get_dialog_db_sync()->get_dialog_by_notification_group_id(group_id);
if (r_value.is_ok()) {
VLOG(notifications) << "Loaded " << group_id << " from database";
d = on_load_dialog_from_database(DialogId(), r_value.move_as_ok());
CHECK(d == nullptr || d->message_notification_group_id == group_id);
} else {
VLOG(notifications) << "Failed to load " << group_id << " from database";
} }
}
if (d != nullptr) {
VLOG(notifications) << "Found " << d->dialog_id << " by " << group_id;
result.dialog_id = d->dialog_id;
result.total_count = get_dialog_pending_notification_count(d);
// TODO load result.notifications
}
return result; return result;
} }
@ -21269,6 +21292,10 @@ MessagesManager::Dialog *MessagesManager::add_new_dialog(unique_ptr<Dialog> &&d,
d->last_clear_history_date = 0; d->last_clear_history_date = 0;
d->last_clear_history_message_id = MessageId(); d->last_clear_history_message_id = MessageId();
if (d->message_notification_group_id.is_valid()) {
notification_group_id_to_dialog_id_.emplace(d->message_notification_group_id, d->dialog_id);
}
if (!is_loaded_from_database) { if (!is_loaded_from_database) {
CHECK(order == DEFAULT_ORDER); CHECK(order == DEFAULT_ORDER);
CHECK(last_database_message == nullptr); CHECK(last_database_message == nullptr);

2
td/telegram/MessagesManager.h
View File

@ -2085,6 +2085,8 @@ class MessagesManager : public Actor {
ScopeNotificationSettings users_notification_settings_; ScopeNotificationSettings users_notification_settings_;
ScopeNotificationSettings chats_notification_settings_; ScopeNotificationSettings chats_notification_settings_;
std::unordered_map<NotificationGroupId, DialogId, NotificationGroupIdHash> notification_group_id_to_dialog_id_;
bool include_sponsored_dialog_to_unread_count_ = false; bool include_sponsored_dialog_to_unread_count_ = false;
bool have_postponed_unread_message_count_update_ = false; bool have_postponed_unread_message_count_update_ = false;
bool have_postponed_unread_chat_count_update_ = false; bool have_postponed_unread_chat_count_update_ = false;