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

Improve repair of unread reaction count.

Browse Source
This commit is contained in:
levlam 2023-01-16 20:30:52 +03:00
parent 24786e05d0
commit 91ab399946
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
td/telegram/MessagesManager.cpp
View File

@ -5552,6 +5552,7 @@ void MessagesManager::Dialog::store(StorerT &storer) const {
STORE_FLAG(has_have_full_history_source);
STORE_FLAG(has_available_reactions);
STORE_FLAG(has_history_generation);
STORE_FLAG(need_repair_unread_reaction_count);
END_STORE_FLAGS();
}
@ -5814,6 +5815,7 @@ void MessagesManager::Dialog::parse(ParserT &parser) {
PARSE_FLAG(has_have_full_history_source);
PARSE_FLAG(has_available_reactions);
PARSE_FLAG(has_history_generation);
PARSE_FLAG(need_repair_unread_reaction_count);
END_PARSE_FLAGS();
} else {
need_repair_action_bar = false;
@ -6957,7 +6959,7 @@ void MessagesManager::on_update_message_reactions(FullMessageId full_message_id,
promise.set_value(Unit());
return;
}
const Dialog *d = get_dialog(dialog_id);
Dialog *d = get_dialog(dialog_id);
if (d == nullptr) {
LOG(INFO) << "Ignore updateMessageReaction in unknown " << dialog_id;
promise.set_value(Unit());
@ -6968,7 +6970,7 @@ void MessagesManager::on_update_message_reactions(FullMessageId full_message_id,
if ((new_reactions != nullptr && !new_reactions->unread_reactions_.empty()) || d->unread_reaction_count > 0) {
// but if there are unread reactions or the chat has unread reactions,
// then number of unread reactions could have been changed, so reload the number of unread reactions
send_get_dialog_query(dialog_id, std::move(promise), 0, "on_update_message_reactions");
repair_dialog_unread_reaction_count(d, std::move(promise), "on_update_message_reactions");
} else {
promise.set_value(Unit());
}
@ -8229,7 +8231,7 @@ void MessagesManager::on_message_edited(FullMessageId full_message_id, int32 pts
((m->reactions != nullptr && !m->reactions->unread_reactions_.empty()) || d->unread_reaction_count > 0)) {
// if new message with unread reactions was added or the chat has unread reactions,
// then number of unread reactions could have been changed, so reload the number of unread reactions
send_get_dialog_query(dialog_id, Promise<Unit>(), 0, "on_message_edited");
repair_dialog_unread_reaction_count(d, Promise<Unit>(), "on_message_edited");
}
}
@ -12568,6 +12570,20 @@ void MessagesManager::repair_channel_server_unread_count(Dialog *d) {
get_dialog_info_full(d->dialog_id, Auto(), "repair_channel_server_unread_count");
}
void MessagesManager::repair_dialog_unread_reaction_count(Dialog *d, Promise<Unit> &&promise, const char *source) {
CHECK(d != nullptr);
if (td_->auth_manager_->is_bot()) {
return;
}
if (!d->need_repair_unread_reaction_count) {
d->need_repair_unread_reaction_count = true;
on_dialog_updated(d->dialog_id, "repair_dialog_unread_reaction_count");
}
send_get_dialog_query(d->dialog_id, std::move(promise), 0, source);
}
void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_message_id, int32 unread_count,
const char *source) {
CHECK(!max_message_id.is_scheduled());
@ -12640,6 +12656,7 @@ void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_messa
if (dialog_id.get_type() != DialogType::SecretChat && have_input_peer(dialog_id, AccessRights::Read) &&
need_unread_counter(d->order)) {
d->need_repair_server_unread_count = true;
on_dialog_updated(dialog_id, "read_history_inbox");
repair_server_unread_count(dialog_id, server_unread_count, "read_history_inbox");
}
}
@ -16131,6 +16148,16 @@ void MessagesManager::on_get_dialogs(FolderId folder_id, vector<tl_object_ptr<te
update_dialog_mention_notification_count(d);
send_update_chat_unread_mention_count(d);
}
}
if (!G()->parameters().use_message_db || is_new || d->need_repair_unread_reaction_count) {
if (d->need_repair_unread_reaction_count) {
if (d->unread_reaction_count != dialog->unread_reactions_count_) {
LOG(INFO) << "Repaired unread reaction count in " << dialog_id << " from " << d->unread_reaction_count
<< " to " << dialog->unread_reactions_count_;
}
d->need_repair_unread_reaction_count = false;
on_dialog_updated(dialog_id, "repaired dialog unread reaction count");
}
if (d->unread_reaction_count != dialog->unread_reactions_count_) {
set_dialog_unread_reaction_count(d, dialog->unread_reactions_count_);
// update_dialog_mention_notification_count(d);
@ -37965,6 +37992,9 @@ void MessagesManager::fix_new_dialog(Dialog *d, unique_ptr<Message> &&last_datab
if (d->need_repair_channel_server_unread_count) {
repair_channel_server_unread_count(d);
}
if (d->need_repair_unread_reaction_count) {
repair_dialog_unread_reaction_count(d, Promise<Unit>(), "fix_new_dialog");
}
}
bool MessagesManager::add_dialog_last_database_message(Dialog *d, unique_ptr<Message> &&last_database_message) {

3
td/telegram/MessagesManager.h
View File

@ -1382,6 +1382,7 @@ class MessagesManager final : public Actor {
bool is_theme_name_inited = false;
bool is_available_reactions_inited = false;
bool had_yet_unsent_message_id_overflow = false;
bool need_repair_unread_reaction_count = false;
bool increment_view_counter = false;
@ -2259,6 +2260,8 @@ class MessagesManager final : public Actor {
void repair_channel_server_unread_count(Dialog *d);
void repair_dialog_unread_reaction_count(Dialog *d, Promise<Unit> &&promise, const char *source);
void read_history_outbox(DialogId dialog_id, MessageId max_message_id, int32 read_date = -1);
void read_history_on_server(Dialog *d, MessageId max_message_id);