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

Refactor ttl_read_history.

Browse Source 
GitOrigin-RevId: 6d5c57716a332a88f30ff11c831371568768a125
This commit is contained in:
levlam 2018-06-20 22:18:53 +03:00
parent 4121f8d6ab
commit 7ff339e804
2 changed files with 20 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
td/telegram/MessagesManager.cpp
View File

@ -8960,15 +8960,7 @@ void MessagesManager::read_history_inbox(DialogId dialog_id, MessageId max_messa
<< ". Possible only for deleted incoming message. " << td_->updates_manager_->get_state();
if (dialog_id.get_type() == DialogType::SecretChat) {
// TODO: protect with logevent
suffix_load_till_message_id(
d, d->last_read_inbox_message_id,
PromiseCreator::lambda([actor_id = actor_id(this), dialog_id, from_message_id = max_message_id,
till_message_id = d->last_read_inbox_message_id,
timestamp = Time::now()](Result<Unit>) {
send_closure(actor_id, &MessagesManager::ttl_read_history_inbox, dialog_id, from_message_id,
till_message_id, timestamp);
}));
ttl_read_history(d, false, max_message_id, d->last_read_inbox_message_id, Time::now());
}
bool is_saved_messages = dialog_id == DialogId(td_->contacts_manager_->get_my_id("read_history_inbox"));
@ -9033,14 +9025,7 @@ void MessagesManager::read_history_outbox(DialogId dialog_id, MessageId max_mess
} else if (read_date < server_time) {
read_time = read_date;
}
// TODO: protect with logevent
suffix_load_till_message_id(
d, d->last_read_outbox_message_id,
PromiseCreator::lambda([actor_id = actor_id(this), dialog_id, from_message_id = max_message_id,
till_message_id = d->last_read_outbox_message_id, read_time](Result<Unit>) {
send_closure(actor_id, &MessagesManager::ttl_read_history_outbox, dialog_id, from_message_id,
till_message_id, read_time);
}));
ttl_read_history(d, true, max_message_id, d->last_read_outbox_message_id, read_time);
}
set_dialog_last_read_outbox_message_id(d, max_message_id);
@ -9468,27 +9453,26 @@ int32 MessagesManager::get_message_date(const tl_object_ptr<telegram_api::Messag
}
}
void MessagesManager::ttl_read_history_inbox(DialogId dialog_id, MessageId from_message_id, MessageId till_message_id,
double timestamp) {
void MessagesManager::ttl_read_history(Dialog *d, bool is_outgoing, MessageId from_message_id,
MessageId till_message_id, double view_date) {
// TODO: protect with logevent
suffix_load_till_message_id(d, till_message_id,
PromiseCreator::lambda([actor_id = actor_id(this), dialog_id = d->dialog_id, is_outgoing,
from_message_id, till_message_id, view_date](Result<Unit>) {
send_closure(actor_id, &MessagesManager::ttl_read_history_impl, dialog_id, is_outgoing,
from_message_id, till_message_id, view_date);
}));
}
void MessagesManager::ttl_read_history_impl(DialogId dialog_id, bool is_outgoing, MessageId from_message_id,
MessageId till_message_id, double view_date) {
auto *d = get_dialog(dialog_id);
CHECK(d != nullptr);
auto now = Time::now();
for (auto it = MessagesIterator(d, from_message_id); *it && (*it)->message_id.get() >= till_message_id.get(); --it) {
auto *message = *it;
if (!message->is_outgoing && !message->message_id.is_yet_unsent()) {
ttl_on_view(d, message, timestamp, now);
}
}
}
void MessagesManager::ttl_read_history_outbox(DialogId dialog_id, MessageId from_message_id, MessageId till_message_id,
double timestamp) {
auto *d = get_dialog(dialog_id);
CHECK(d != nullptr);
auto now = Time::now();
for (auto it = MessagesIterator(d, from_message_id); *it && (*it)->message_id.get() >= till_message_id.get(); --it) {
auto *message = *it;
if (message->is_outgoing && !message->message_id.is_yet_unsent()) {
ttl_on_view(d, message, timestamp, now);
if (message->is_outgoing == is_outgoing && !message->message_id.is_yet_unsent()) {
ttl_on_view(d, message, view_date, now);
}
}
}

8
td/telegram/MessagesManager.h
View File

@ -2479,10 +2479,10 @@ class MessagesManager : public Actor {
tl_object_ptr<td_api::MessageForwardInfo> get_message_forward_info_object(
const unique_ptr<MessageForwardInfo> &forward_info) const;
void ttl_read_history_inbox(DialogId dialog_id, MessageId from_message_id, MessageId till_message_id,
double timestamp);
void ttl_read_history_outbox(DialogId dialog_id, MessageId from_message_id, MessageId till_message_id,
double timestamp);
void ttl_read_history(Dialog *d, bool is_outgoing, MessageId from_message_id, MessageId till_message_id,
double view_date);
void ttl_read_history_impl(DialogId dialog_id, bool is_outgoing, MessageId from_message_id, MessageId till_message_id,
double view_date);
void ttl_on_view(const Dialog *d, Message *message, double view_date, double now);
bool ttl_on_open(Dialog *d, Message *message, double now, bool is_local_read);
void ttl_register_message(DialogId dialog_id, const Message *message, double now);