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

Do not increment message view counter in closed chats.

Browse Source 
GitOrigin-RevId: e08b6cbea02602538fa5189eeee574a9d65ce604
This commit is contained in:
levlam 2018-03-04 17:59:18 +03:00
parent 83b8a3a942
commit aeff9a99d1
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
td/telegram/MessagesManager.cpp
View File

@ -965,17 +965,19 @@ class GetMessagesViewsQuery : public Td::ResultHandler {
vector<MessageId> message_ids_; vector<MessageId> message_ids_;
public: public:
void send(DialogId dialog_id, vector<MessageId> &&message_ids) { void send(DialogId dialog_id, vector<MessageId> &&message_ids, bool increment_view_counter) {
auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read); auto input_peer = td->messages_manager_->get_input_peer(dialog_id, AccessRights::Read);
if (input_peer == nullptr) { if (input_peer == nullptr) {
LOG(ERROR) << "Can't update message views because doesn't have info about the " << dialog_id; LOG(ERROR) << "Can't update message views because doesn't have info about the " << dialog_id;
return; return;
} }
LOG(INFO) << "View " << message_ids.size() << " messages in " << dialog_id
<< ", increment = " << increment_view_counter;
dialog_id_ = dialog_id; dialog_id_ = dialog_id;
message_ids_ = std::move(message_ids); message_ids_ = std::move(message_ids);
send_query(G()->net_query_creator().create(create_storer(telegram_api::messages_getMessagesViews( send_query(G()->net_query_creator().create(create_storer(telegram_api::messages_getMessagesViews(
std::move(input_peer), MessagesManager::get_server_message_ids(message_ids_), true)))); std::move(input_peer), MessagesManager::get_server_message_ids(message_ids_), increment_view_counter))));
} }
void on_result(uint64 id, BufferSlice packet) override { void on_result(uint64 id, BufferSlice packet) override {
@ -4564,14 +4566,17 @@ void MessagesManager::on_pending_message_views_timeout_callback(void *messages_m
for (auto message_id : d->pending_viewed_message_ids) { for (auto message_id : d->pending_viewed_message_ids) {
message_ids.push_back(message_id); message_ids.push_back(message_id);
if (message_ids.size() >= MAX_MESSAGE_VIEWS) { if (message_ids.size() >= MAX_MESSAGE_VIEWS) {
messages_manager->td_->create_handler<GetMessagesViewsQuery>()->send(dialog_id, std::move(message_ids)); messages_manager->td_->create_handler<GetMessagesViewsQuery>()->send(dialog_id, std::move(message_ids),
d->increment_view_counter);
message_ids.clear(); message_ids.clear();
} }
} }
if (!message_ids.empty()) { if (!message_ids.empty()) {
messages_manager->td_->create_handler<GetMessagesViewsQuery>()->send(dialog_id, std::move(message_ids)); messages_manager->td_->create_handler<GetMessagesViewsQuery>()->send(dialog_id, std::move(message_ids),
d->increment_view_counter);
} }
d->pending_viewed_message_ids.clear(); d->pending_viewed_message_ids.clear();
d->increment_view_counter = false;
} }
void MessagesManager::on_pending_draft_message_timeout_callback(void *messages_manager_ptr, int64 dialog_id_int) { void MessagesManager::on_pending_draft_message_timeout_callback(void *messages_manager_ptr, int64 dialog_id_int) {
@ -12067,6 +12072,7 @@ Status MessagesManager::view_messages(DialogId dialog_id, const vector<MessageId
} }
if (!d->pending_viewed_message_ids.empty()) { if (!d->pending_viewed_message_ids.empty()) {
pending_message_views_timeout_.add_timeout_in(dialog_id.get(), MAX_MESSAGE_VIEW_DELAY); pending_message_views_timeout_.add_timeout_in(dialog_id.get(), MAX_MESSAGE_VIEW_DELAY);
d->increment_view_counter |= d->is_opened;
} }
if (!read_content_message_ids.empty()) { if (!read_content_message_ids.empty()) {
read_message_contents_on_server(dialog_id, std::move(read_content_message_ids), 0); read_message_contents_on_server(dialog_id, std::move(read_content_message_ids), 0);
@ -12268,6 +12274,7 @@ void MessagesManager::close_dialog(Dialog *d) {
} else { } else {
pending_message_views_timeout_.cancel_timeout(d->dialog_id.get()); pending_message_views_timeout_.cancel_timeout(d->dialog_id.get());
d->pending_viewed_message_ids.clear(); d->pending_viewed_message_ids.clear();
d->increment_view_counter = false;
} }
if (is_message_unload_enabled()) { if (is_message_unload_enabled()) {

2
td/telegram/MessagesManager.h
View File

@ -1520,6 +1520,8 @@ class MessagesManager : public Actor {
bool is_last_read_inbox_message_id_inited = false; bool is_last_read_inbox_message_id_inited = false;
bool is_last_read_outbox_message_id_inited = false; bool is_last_read_outbox_message_id_inited = false;
bool increment_view_counter = false;
int32 pts = 0; // for channels only int32 pts = 0; // for channels only
std::multimap<int32, PendingPtsUpdate> postponed_channel_updates; // for channels only std::multimap<int32, PendingPtsUpdate> postponed_channel_updates; // for channels only
int32 retry_get_difference_timeout = 1; // for channels only int32 retry_get_difference_timeout = 1; // for channels only