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

Send at most one getMessageViews query for a given message.

This commit is contained in:
levlam 2022-03-07 20:17:00 +03:00
parent ceb966123b
commit 7102117ed4
2 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
td/telegram/MessagesManager.cpp
View File

@ -1922,12 +1922,14 @@ class GetMessagesViewsQuery final : public Td::ResultHandler {
td_->messages_manager_->on_update_message_interaction_info(full_message_id, view_count, forward_count, true,
std::move(info->replies_));
}
td_->messages_manager_->finish_get_message_views(dialog_id_, message_ids_);
}
void on_error(Status status) final {
if (!td_->messages_manager_->on_get_dialog_error(dialog_id_, status, "GetMessagesViewsQuery")) {
LOG(ERROR) << "Receive error for GetMessagesViewsQuery: " << status;
}
td_->messages_manager_->finish_get_message_views(dialog_id_, message_ids_);
}
};
@ -6952,6 +6954,19 @@ void MessagesManager::on_pending_message_views_timeout(DialogId dialog_id) {
vector<MessageId> message_ids;
message_ids.reserve(min(d->pending_viewed_message_ids.size(), MAX_MESSAGE_VIEWS));
for (auto message_id : d->pending_viewed_message_ids) {
auto *m = get_message(d, message_id);
if (m == nullptr) {
continue;
}
if (m->has_get_message_views_query) {
if (!d->increment_view_counter || m->need_view_counter_increment) {
continue;
}
m->need_view_counter_increment = true;
} else {
m->has_get_message_views_query = true;
m->need_view_counter_increment = d->increment_view_counter;
}
message_ids.push_back(message_id);
if (message_ids.size() >= MAX_MESSAGE_VIEWS) {
td_->create_handler<GetMessagesViewsQuery>()->send(dialog_id, std::move(message_ids), d->increment_view_counter);
@ -12948,13 +12963,14 @@ void MessagesManager::on_update_viewed_messages_timeout(DialogId dialog_id) {
vector<MessageId> reaction_message_ids;
vector<MessageId> views_message_ids;
for (auto &message_it : info->message_id_to_view_id) {
const Message *m = get_message_force(d, message_it.first, "on_update_viewed_messages_timeout");
Message *m = get_message_force(d, message_it.first, "on_update_viewed_messages_timeout");
CHECK(m != nullptr);
CHECK(m->message_id.is_valid());
if (need_poll_message_reactions(d, m)) {
reaction_message_ids.push_back(m->message_id);
}
if (m->view_count > 0) {
if (m->view_count > 0 && !m->has_get_message_views_query) {
m->has_get_message_views_query = true;
views_message_ids.push_back(m->message_id);
}
}
@ -20796,9 +20812,9 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
if (!viewed_reaction_message_ids.empty()) {
queue_message_reactions_reload(dialog_id, new_viewed_message_ids);
}
if (td_->is_online()) {
update_viewed_messages_timeout_.add_timeout_in(dialog_id.get(), UPDATE_VIEWED_MESSAGES_PERIOD);
}
}
if (td_->is_online() && dialog_viewed_messages_.count(dialog_id) != 0) {
update_viewed_messages_timeout_.add_timeout_in(dialog_id.get(), UPDATE_VIEWED_MESSAGES_PERIOD);
}
if (!need_read) {
@ -20880,6 +20896,18 @@ Status MessagesManager::view_messages(DialogId dialog_id, MessageId top_thread_m
return Status::OK();
}
void MessagesManager::finish_get_message_views(DialogId dialog_id, const vector<MessageId> &message_ids) {
Dialog *d = get_dialog(dialog_id);
CHECK(d != nullptr);
for (auto message_id : message_ids) {
auto *m = get_message(d, message_id);
if (m != nullptr) {
m->has_get_message_views_query = false;
m->need_view_counter_increment = false;
}
}
}
Status MessagesManager::open_message_content(FullMessageId full_message_id) {
auto dialog_id = full_message_id.get_dialog_id();
Dialog *d = get_dialog_force(dialog_id, "open_message_content");

5
td/telegram/MessagesManager.h
View File

@ -689,6 +689,8 @@ class MessagesManager final : public Actor {
Status view_messages(DialogId dialog_id, MessageId top_thread_message_id, const vector<MessageId> &message_ids,
bool force_read) TD_WARN_UNUSED_RESULT;
void finish_get_message_views(DialogId dialog_id, const vector<MessageId> &message_ids);
Status open_message_content(FullMessageId full_message_id) TD_WARN_UNUSED_RESULT;
void click_animated_emoji_message(FullMessageId full_message_id,
@ -1136,6 +1138,9 @@ class MessagesManager final : public Actor {
bool have_next = false;
bool from_database = false;
bool has_get_message_views_query = false;
bool need_view_counter_increment = false;
DialogId real_forward_from_dialog_id; // for resend_message
MessageId real_forward_from_message_id; // for resend_message