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

Do not try to save unread count just after loading.

Browse Source 
GitOrigin-RevId: 63ac7ebd4f04f3705fec95a9c394eb70b238dc57
This commit is contained in:
levlam 2020-05-22 19:20:50 +03:00
parent 17c68176c5
commit 96db150b4b
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
td/telegram/MessagesManager.cpp
View File

@ -11005,7 +11005,7 @@ void MessagesManager::init() {
list->unread_message_total_count_ = r_total_count.ok(); list->unread_message_total_count_ = r_total_count.ok();
list->unread_message_muted_count_ = r_muted_count.ok(); list->unread_message_muted_count_ = r_muted_count.ok();
list->is_message_unread_count_inited_ = true; list->is_message_unread_count_inited_ = true;
send_update_unread_message_count(dialog_list_id, DialogId(), true, "load unread_message_count"); send_update_unread_message_count(dialog_list_id, DialogId(), true, "load unread_message_count", true);
} else { } else {
G()->td_db()->get_binlog_pmc()->erase("unread_message_count" + it.first); G()->td_db()->get_binlog_pmc()->erase("unread_message_count" + it.first);
} }
@ -11043,7 +11043,7 @@ void MessagesManager::init() {
repair_secret_chat_total_count(dialog_list_id); repair_secret_chat_total_count(dialog_list_id);
} }
list->is_dialog_unread_count_inited_ = true; list->is_dialog_unread_count_inited_ = true;
send_update_unread_chat_count(dialog_list_id, DialogId(), true, "load unread_dialog_count"); send_update_unread_chat_count(dialog_list_id, DialogId(), true, "load unread_dialog_count", true);
} else { } else {
G()->td_db()->get_binlog_pmc()->erase("unread_dialog_count" + it.first); G()->td_db()->get_binlog_pmc()->erase("unread_dialog_count" + it.first);
} }
@ -24103,7 +24103,7 @@ void MessagesManager::send_update_chat_filters(bool from_database) {
} }
void MessagesManager::send_update_unread_message_count(DialogListId dialog_list_id, DialogId dialog_id, bool force, void MessagesManager::send_update_unread_message_count(DialogListId dialog_list_id, DialogId dialog_id, bool force,
const char *source) { const char *source, bool from_database) {
if (td_->auth_manager_->is_bot() || !G()->parameters().use_message_db) { if (td_->auth_manager_->is_bot() || !G()->parameters().use_message_db) {
return; return;
} }
@ -24124,9 +24124,11 @@ void MessagesManager::send_update_unread_message_count(DialogListId dialog_list_
} }
} }
G()->td_db()->get_binlog_pmc()->set( if (!from_database) {
PSTRING() << "unread_message_count" << dialog_list_id.get(), G()->td_db()->get_binlog_pmc()->set(
PSTRING() << list.unread_message_total_count_ << ' ' << list.unread_message_muted_count_); PSTRING() << "unread_message_count" << dialog_list_id.get(),
PSTRING() << list.unread_message_total_count_ << ' ' << list.unread_message_muted_count_);
}
int32 unread_unmuted_count = list.unread_message_total_count_ - list.unread_message_muted_count_; int32 unread_unmuted_count = list.unread_message_total_count_ - list.unread_message_muted_count_;
if (!force && running_get_difference_) { if (!force && running_get_difference_) {
@ -24142,7 +24144,7 @@ void MessagesManager::send_update_unread_message_count(DialogListId dialog_list_
} }
void MessagesManager::send_update_unread_chat_count(DialogListId dialog_list_id, DialogId dialog_id, bool force, void MessagesManager::send_update_unread_chat_count(DialogListId dialog_list_id, DialogId dialog_id, bool force,
const char *source) { const char *source, bool from_database) {
if (td_->auth_manager_->is_bot() || !G()->parameters().use_message_db) { if (td_->auth_manager_->is_bot() || !G()->parameters().use_message_db) {
return; return;
} }
@ -24177,11 +24179,13 @@ void MessagesManager::send_update_unread_chat_count(DialogListId dialog_list_id,
} }
} }
G()->td_db()->get_binlog_pmc()->set( if (!from_database) {
PSTRING() << "unread_dialog_count" << dialog_list_id.get(), G()->td_db()->get_binlog_pmc()->set(
PSTRING() << list.unread_dialog_total_count_ << ' ' << list.unread_dialog_muted_count_ << ' ' PSTRING() << "unread_dialog_count" << dialog_list_id.get(),
<< list.unread_dialog_marked_count_ << ' ' << list.unread_dialog_muted_marked_count_ << ' ' PSTRING() << list.unread_dialog_total_count_ << ' ' << list.unread_dialog_muted_count_ << ' '
<< list.server_dialog_total_count_ << ' ' << list.secret_chat_total_count_); << list.unread_dialog_marked_count_ << ' ' << list.unread_dialog_muted_marked_count_ << ' '
<< list.server_dialog_total_count_ << ' ' << list.secret_chat_total_count_);
}
bool need_postpone = !force && running_get_difference_; bool need_postpone = !force && running_get_difference_;
int32 unread_unmuted_count = list.unread_dialog_total_count_ - list.unread_dialog_muted_count_; int32 unread_unmuted_count = list.unread_dialog_total_count_ - list.unread_dialog_muted_count_;

7
td/telegram/MessagesManager.h
View File

@ -2029,10 +2029,11 @@ class MessagesManager : public Actor {
void send_update_chat_filters(bool from_database = false); void send_update_chat_filters(bool from_database = false);
void send_update_unread_message_count(DialogListId dialog_list_id, DialogId dialog_id, bool force, void send_update_unread_message_count(DialogListId dialog_list_id, DialogId dialog_id, bool force, const char *source,
const char *source); bool from_database = false);
void send_update_unread_chat_count(DialogListId dialog_list_id, DialogId dialog_id, bool force, const char *source); void send_update_unread_chat_count(DialogListId dialog_list_id, DialogId dialog_id, bool force, const char *source,
bool from_database = false);
void send_update_chat_read_inbox(const Dialog *d, bool force, const char *source); void send_update_chat_read_inbox(const Dialog *d, bool force, const char *source);