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

Add and use has_unread_message_reactions.

Browse Source
This commit is contained in:
levlam 2022-01-28 19:57:50 +03:00
parent fd8d15e2d2
commit 5098dac338
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
td/telegram/MessagesManager.cpp
View File

@ -6311,7 +6311,7 @@ int32 MessagesManager::get_message_index_mask(DialogId dialog_id, const Message
if (m->contains_unread_mention) { if (m->contains_unread_mention) {
index_mask |= message_search_filter_index_mask(MessageSearchFilter::UnreadMention); index_mask |= message_search_filter_index_mask(MessageSearchFilter::UnreadMention);
} }
if (m->reactions != nullptr && !m->reactions->unread_reactions_.empty()) { if (has_unread_message_reactions(dialog_id, m)) {
index_mask |= message_search_filter_index_mask(MessageSearchFilter::UnreadReaction); index_mask |= message_search_filter_index_mask(MessageSearchFilter::UnreadReaction);
} }
} }
@ -6972,6 +6972,12 @@ bool MessagesManager::is_visible_message_reactions(DialogId dialog_id, const Mes
return true; return true;
} }
bool MessagesManager::has_unread_message_reactions(DialogId dialog_id, const Message *m) const {
CHECK(m != nullptr);
return m->reactions != nullptr && !m->reactions->unread_reactions_.empty() &&
is_visible_message_reactions(dialog_id, m);
}
void MessagesManager::on_message_reply_info_changed(DialogId dialog_id, const Message *m) const { void MessagesManager::on_message_reply_info_changed(DialogId dialog_id, const Message *m) const {
if (td_->auth_manager_->is_bot()) { if (td_->auth_manager_->is_bot()) {
return; return;
@ -7016,13 +7022,15 @@ td_api::object_ptr<td_api::messageInteractionInfo> MessagesManager::get_message_
vector<td_api::object_ptr<td_api::unreadReaction>> MessagesManager::get_unread_reactions_object( vector<td_api::object_ptr<td_api::unreadReaction>> MessagesManager::get_unread_reactions_object(
DialogId dialog_id, const Message *m) const { DialogId dialog_id, const Message *m) const {
if (!has_unread_message_reactions(dialog_id, m)) {
return {};
}
vector<td_api::object_ptr<td_api::unreadReaction>> unread_reactions; vector<td_api::object_ptr<td_api::unreadReaction>> unread_reactions;
if (is_visible_message_reactions(dialog_id, m) && m->reactions != nullptr) { for (const auto &unread_reaction : m->reactions->unread_reactions_) {
for (const auto &unread_reaction : m->reactions->unread_reactions_) { auto unread_reaction_object = unread_reaction.get_unread_reaction_object(td_);
auto unread_reaction_object = unread_reaction.get_unread_reaction_object(td_); if (unread_reaction_object != nullptr) {
if (unread_reaction_object != nullptr) { unread_reactions.push_back(std::move(unread_reaction_object));
unread_reactions.push_back(std::move(unread_reaction_object));
}
} }
} }
return std::move(unread_reactions); return std::move(unread_reactions);
@ -7090,9 +7098,9 @@ bool MessagesManager::update_message_interaction_info(DialogId dialog_id, Messag
} }
if (need_update_reactions || need_update_unread_reactions) { if (need_update_reactions || need_update_unread_reactions) {
int32 unread_reaction_diff = 0; int32 unread_reaction_diff = 0;
unread_reaction_diff -= (m->reactions != nullptr && !m->reactions->unread_reactions_.empty() ? 1 : 0); unread_reaction_diff -= (has_unread_message_reactions(dialog_id, m) ? 1 : 0);
m->reactions = std::move(reactions); m->reactions = std::move(reactions);
unread_reaction_diff += (m->reactions != nullptr && !m->reactions->unread_reactions_.empty() ? 1 : 0); unread_reaction_diff += (has_unread_message_reactions(dialog_id, m) ? 1 : 0);
if (is_visible_message_reactions(dialog_id, m)) { if (is_visible_message_reactions(dialog_id, m)) {
need_update |= need_update_reactions; need_update |= need_update_reactions;
if (need_update_unread_reactions) { if (need_update_unread_reactions) {
@ -8346,7 +8354,7 @@ void MessagesManager::update_dialog_message_reactions_visibility(Dialog *d) {
CHECK(m->reactions != nullptr); CHECK(m->reactions != nullptr);
send_update_message_interaction_info(d->dialog_id, m); send_update_message_interaction_info(d->dialog_id, m);
if (!m->reactions->unread_reactions_.empty()) { if (!m->reactions->unread_reactions_.empty()) {
if (is_visible_message_reactions(d->dialog_id, m)) { if (has_unread_message_reactions(d->dialog_id, m)) {
unread_reaction_count++; unread_reaction_count++;
} }
send_update_message_unread_reactions(d->dialog_id, m, unread_reaction_count); send_update_message_unread_reactions(d->dialog_id, m, unread_reaction_count);
@ -15913,7 +15921,7 @@ unique_ptr<MessagesManager::Message> MessagesManager::do_delete_message(Dialog *
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
} }
if (result->reactions != nullptr && !result->reactions->unread_reactions_.empty()) { if (has_unread_message_reactions(d->dialog_id, result.get())) {
if (d->unread_reaction_count == 0) { if (d->unread_reaction_count == 0) {
if (is_dialog_inited(d)) { if (is_dialog_inited(d)) {
LOG(ERROR) << "Unread reaction count became negative in " << d->dialog_id << " after deletion of " LOG(ERROR) << "Unread reaction count became negative in " << d->dialog_id << " after deletion of "
@ -34126,7 +34134,7 @@ MessagesManager::Message *MessagesManager::add_message_to_dialog(Dialog *d, uniq
set_dialog_unread_mention_count(d, d->unread_mention_count + 1); set_dialog_unread_mention_count(d, d->unread_mention_count + 1);
send_update_chat_unread_mention_count(d); send_update_chat_unread_mention_count(d);
} }
if (*need_update && message->reactions != nullptr && !message->reactions->unread_reactions_.empty()) { if (*need_update && has_unread_message_reactions(dialog_id, message.get())) {
set_dialog_unread_reaction_count(d, d->unread_reaction_count + 1); set_dialog_unread_reaction_count(d, d->unread_reaction_count + 1);
send_update_chat_unread_reaction_count(d); send_update_chat_unread_reaction_count(d);
} }

4
td/telegram/MessagesManager.h
View File

@ -52,8 +52,8 @@
#include "td/telegram/secret_api.h" #include "td/telegram/secret_api.h"
#include "td/telegram/SecretChatId.h" #include "td/telegram/SecretChatId.h"
#include "td/telegram/SecretInputMedia.h" #include "td/telegram/SecretInputMedia.h"
#include "td/telegram/ServerMessageId.h"
#include "td/telegram/SequenceDispatcher.h" #include "td/telegram/SequenceDispatcher.h"
#include "td/telegram/ServerMessageId.h"
#include "td/telegram/td_api.h" #include "td/telegram/td_api.h"
#include "td/telegram/telegram_api.h" #include "td/telegram/telegram_api.h"
#include "td/telegram/UserId.h" #include "td/telegram/UserId.h"
@ -2105,6 +2105,8 @@ class MessagesManager final : public Actor {
bool is_visible_message_reactions(DialogId dialog_id, const Message *m) const; bool is_visible_message_reactions(DialogId dialog_id, const Message *m) const;
bool has_unread_message_reactions(DialogId dialog_id, const Message *m) const;
void on_message_reply_info_changed(DialogId dialog_id, const Message *m) const; void on_message_reply_info_changed(DialogId dialog_id, const Message *m) const;
Result<FullMessageId> get_top_thread_full_message_id(DialogId dialog_id, const Message *m) const; Result<FullMessageId> get_top_thread_full_message_id(DialogId dialog_id, const Message *m) const;