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

Add MessagesManager::set_dialog_unread_mention_count.

Browse Source 
GitOrigin-RevId: 3f4874fd25886c502f69a187426730c1b9a0c90b
This commit is contained in:
levlam 2020-08-10 09:19:08 +03:00
parent 12a79efbdc
commit de8d92bead
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
td/telegram/MessagesManager.cpp
View File

@ -5222,15 +5222,15 @@ int32 MessagesManager::get_message_index_mask(DialogId dialog_id, const Message
if (m->is_content_secret || (m->ttl > 0 && !is_secret)) { if (m->is_content_secret || (m->ttl > 0 && !is_secret)) {
return 0; return 0;
} }
int32 mentions_mask = get_message_content_index_mask(m->content.get(), td_, is_secret, m->is_outgoing); int32 index_mask = get_message_content_index_mask(m->content.get(), td_, is_secret, m->is_outgoing);
if (m->contains_mention) { if (m->contains_mention) {
mentions_mask |= search_messages_filter_index_mask(SearchMessagesFilter::Mention); index_mask |= search_messages_filter_index_mask(SearchMessagesFilter::Mention);
if (m->contains_unread_mention) { if (m->contains_unread_mention) {
mentions_mask |= search_messages_filter_index_mask(SearchMessagesFilter::UnreadMention); index_mask |= search_messages_filter_index_mask(SearchMessagesFilter::UnreadMention);
} }
} }
LOG(INFO) << "Have index mask " << mentions_mask << " for " << m->message_id << " in " << dialog_id; LOG(INFO) << "Have index mask " << index_mask << " for " << m->message_id << " in " << dialog_id;
return mentions_mask; return index_mask;
} }
vector<MessageId> MessagesManager::get_message_ids(const vector<int64> &input_message_ids) { vector<MessageId> MessagesManager::get_message_ids(const vector<int64> &input_message_ids) {
@ -6053,9 +6053,7 @@ bool MessagesManager::update_message_contains_unread_mention(Dialog *d, Message
LOG(ERROR) << "Unread mention count of " << d->dialog_id << " became negative from " << source; LOG(ERROR) << "Unread mention count of " << d->dialog_id << " became negative from " << source;
} }
} else { } else {
d->unread_mention_count--; set_dialog_unread_mention_count(d, d->unread_mention_count - 1);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] =
d->unread_mention_count;
on_dialog_updated(d->dialog_id, "update_message_contains_unread_mention"); on_dialog_updated(d->dialog_id, "update_message_contains_unread_mention");
} }
LOG(INFO) << "Update unread mention message count in " << d->dialog_id << " to " << d->unread_mention_count LOG(INFO) << "Update unread mention message count in " << d->dialog_id << " to " << d->unread_mention_count
@ -9602,8 +9600,7 @@ void MessagesManager::delete_all_dialog_messages(Dialog *d, bool remove_from_dia
} }
if (d->unread_mention_count > 0) { if (d->unread_mention_count > 0) {
d->unread_mention_count = 0; set_dialog_unread_mention_count(d, 0);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] = 0;
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
@ -9727,8 +9724,7 @@ void MessagesManager::read_all_dialog_mentions(DialogId dialog_id, Promise<Unit>
} }
if (d->unread_mention_count != 0) { if (d->unread_mention_count != 0) {
d->unread_mention_count = 0; set_dialog_unread_mention_count(d, 0);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] = 0;
if (!is_update_sent) { if (!is_update_sent) {
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} else { } else {
@ -12371,6 +12367,15 @@ void MessagesManager::set_dialog_last_clear_history_date(Dialog *d, int32 date,
} }
} }
void MessagesManager::set_dialog_unread_mention_count(Dialog *d, int32 unread_mention_count) {
CHECK(d->unread_mention_count != unread_mention_count);
CHECK(unread_mention_count >= 0);
d->unread_mention_count = unread_mention_count;
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] =
d->unread_mention_count;
}
void MessagesManager::set_dialog_is_empty(Dialog *d, const char *source) { void MessagesManager::set_dialog_is_empty(Dialog *d, const char *source) {
LOG(INFO) << "Set " << d->dialog_id << " is_empty to true from " << source; LOG(INFO) << "Set " << d->dialog_id << " is_empty to true from " << source;
d->is_empty = true; d->is_empty = true;
@ -12386,8 +12391,7 @@ void MessagesManager::set_dialog_is_empty(Dialog *d, const char *source) {
} }
} }
if (d->unread_mention_count > 0) { if (d->unread_mention_count > 0) {
d->unread_mention_count = 0; set_dialog_unread_mention_count(d, 0);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] = 0;
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
if (d->reply_markup_message_id != MessageId()) { if (d->reply_markup_message_id != MessageId()) {
@ -13010,10 +13014,8 @@ void MessagesManager::on_get_dialogs(FolderId folder_id, vector<tl_object_ptr<te
if (!G()->parameters().use_message_db || is_new) { if (!G()->parameters().use_message_db || is_new) {
if (d->unread_mention_count != dialog->unread_mentions_count_) { if (d->unread_mention_count != dialog->unread_mentions_count_) {
d->unread_mention_count = dialog->unread_mentions_count_; set_dialog_unread_mention_count(d, dialog->unread_mentions_count_);
update_dialog_mention_notification_count(d); update_dialog_mention_notification_count(d);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] =
d->unread_mention_count;
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
} }
@ -13626,9 +13628,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] != -1) d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] != -1)
<< "Unread mention count became negative in " << d->dialog_id << " after deletion of " << message_id; << "Unread mention count became negative in " << d->dialog_id << " after deletion of " << message_id;
} else { } else {
d->unread_mention_count--; set_dialog_unread_mention_count(d, d->unread_mention_count - 1);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] =
d->unread_mention_count;
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
} }
@ -28719,6 +28719,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
} }
if (message->contains_unread_mention && message_id <= d->last_read_all_mentions_message_id) { if (message->contains_unread_mention && message_id <= d->last_read_all_mentions_message_id) {
LOG(INFO) << "Ignore unread mention in " << message_id;
message->contains_unread_mention = false; message->contains_unread_mention = false;
if (message->from_database) { if (message->from_database) {
on_message_changed(d, message.get(), false, "add already read mention message to dialog"); on_message_changed(d, message.get(), false, "add already read mention message to dialog");
@ -28964,9 +28965,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
} }
} }
if (*need_update && message->contains_unread_mention) { if (*need_update && message->contains_unread_mention) {
d->unread_mention_count++; set_dialog_unread_mention_count(d, d->unread_mention_count + 1);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] =
d->unread_mention_count;
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
if (*need_update) { if (*need_update) {
@ -31940,9 +31939,7 @@ void MessagesManager::on_get_channel_dialog(DialogId dialog_id, MessageId last_m
false, "on_get_channel_dialog 50"); false, "on_get_channel_dialog 50");
} }
if (d->unread_mention_count != unread_mention_count) { if (d->unread_mention_count != unread_mention_count) {
d->unread_mention_count = unread_mention_count; set_dialog_unread_mention_count(d, unread_mention_count);
d->message_count_by_index[search_messages_filter_index(SearchMessagesFilter::UnreadMention)] =
d->unread_mention_count;
update_dialog_mention_notification_count(d); update_dialog_mention_notification_count(d);
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }

2
td/telegram/MessagesManager.h
View File

@ -2137,6 +2137,8 @@ class MessagesManager : public Actor {
void set_dialog_last_clear_history_date(Dialog *d, int32 date, MessageId last_clear_history_message_id, void set_dialog_last_clear_history_date(Dialog *d, int32 date, MessageId last_clear_history_message_id,
const char *source, bool is_loaded_from_database = false); const char *source, bool is_loaded_from_database = false);
static void set_dialog_unread_mention_count(Dialog *d, int32 unread_mention_count);
void set_dialog_is_empty(Dialog *d, const char *source); void set_dialog_is_empty(Dialog *d, const char *source);
static int32 get_pinned_dialogs_limit(DialogListId dialog_list_id); static int32 get_pinned_dialogs_limit(DialogListId dialog_list_id);