Add ReadHistoryInSecretChatLogEvent.

GitOrigin-RevId: 92da5d4224dee274267123c2467704197d3cc3d4
This commit is contained in:
levlam 2018-06-20 04:02:02 +03:00
parent 9d5dd09fd7
commit 4121f8d6ab
5 changed files with 87 additions and 5 deletions

View File

@ -13778,6 +13778,24 @@ class MessagesManager::ReadHistoryOnServerLogEvent {
} }
}; };
class MessagesManager::ReadHistoryInSecretChatLogEvent {
public:
DialogId dialog_id_;
int32 max_date_ = 0;
template <class StorerT>
void store(StorerT &storer) const {
td::store(dialog_id_, storer);
td::store(max_date_, storer);
}
template <class ParserT>
void parse(ParserT &parser) {
td::parse(dialog_id_, parser);
td::parse(max_date_, parser);
}
};
void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id) { void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id) {
if (td_->auth_manager_->is_bot()) { if (td_->auth_manager_->is_bot()) {
return; return;
@ -13786,7 +13804,32 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
auto dialog_id = d->dialog_id; auto dialog_id = d->dialog_id;
LOG(INFO) << "Read history in " << dialog_id << " on server up to " << max_message_id; LOG(INFO) << "Read history in " << dialog_id << " on server up to " << max_message_id;
if (G()->parameters().use_message_db) { bool is_secret = dialog_id.get_type() == DialogType::SecretChat;
if (is_secret) {
auto *m = get_message_force(d, max_message_id);
if (m == nullptr) {
LOG(ERROR) << "Failed to read history in " << dialog_id << " up to " << max_message_id;
return;
}
ReadHistoryInSecretChatLogEvent logevent;
logevent.dialog_id_ = dialog_id;
logevent.max_date_ = m->date;
d->last_read_inbox_message_date = m->date;
auto storer = LogEventStorerImpl<ReadHistoryInSecretChatLogEvent>(logevent);
if (d->read_history_logevent_id == 0) {
d->read_history_logevent_id =
BinlogHelper::add(G()->td_db()->get_binlog(), LogEvent::HandlerType::ReadHistoryInSecretChat, storer);
LOG(INFO) << "Add read history logevent " << d->read_history_logevent_id;
} else {
auto new_logevent_id = BinlogHelper::rewrite(G()->td_db()->get_binlog(), d->read_history_logevent_id,
LogEvent::HandlerType::ReadHistoryInSecretChat, storer);
LOG(INFO) << "Rewrite read history logevent " << d->read_history_logevent_id << " with " << new_logevent_id;
}
d->read_history_logevent_id_generation++;
} else if (G()->parameters().use_message_db) {
ReadHistoryOnServerLogEvent logevent; ReadHistoryOnServerLogEvent logevent;
logevent.dialog_id_ = dialog_id; logevent.dialog_id_ = dialog_id;
logevent.max_message_id_ = max_message_id; logevent.max_message_id_ = max_message_id;
@ -13804,7 +13847,7 @@ void MessagesManager::read_history_on_server(Dialog *d, MessageId max_message_id
d->read_history_logevent_id_generation++; d->read_history_logevent_id_generation++;
} }
bool need_delay = d->is_opened && dialog_id.get_type() != DialogType::SecretChat && d->server_unread_count > 0; bool need_delay = d->is_opened && !is_secret && d->server_unread_count > 0;
pending_read_history_timeout_.set_timeout_in(dialog_id.get(), need_delay ? MIN_READ_HISTORY_DELAY : 0); pending_read_history_timeout_.set_timeout_in(dialog_id.get(), need_delay ? MIN_READ_HISTORY_DELAY : 0);
} }
@ -13844,11 +13887,17 @@ void MessagesManager::read_history_on_server_impl(DialogId dialog_id, MessageId
} }
case DialogType::SecretChat: { case DialogType::SecretChat: {
auto secret_chat_id = dialog_id.get_secret_chat_id(); auto secret_chat_id = dialog_id.get_secret_chat_id();
auto date = d->last_read_inbox_message_date;
auto *message = get_message_force(d, max_message_id); auto *message = get_message_force(d, max_message_id);
if (message != nullptr) { if (message != nullptr && message->date > date) {
send_closure(G()->secret_chats_manager(), &SecretChatsManager::send_read_history, secret_chat_id, message->date, date = message->date;
std::move(promise));
} }
if (date == 0) {
LOG(ERROR) << "Don't know last read inbox message date in " << dialog_id;
break;
}
send_closure(G()->secret_chats_manager(), &SecretChatsManager::send_read_history, secret_chat_id, date,
std::move(promise));
break; break;
} }
case DialogType::None: case DialogType::None:
@ -25762,6 +25811,34 @@ void MessagesManager::on_binlog_events(vector<BinlogEvent> &&events) {
read_history_on_server_impl(dialog_id, log_event.max_message_id_); read_history_on_server_impl(dialog_id, log_event.max_message_id_);
break; break;
} }
case LogEvent::HandlerType::ReadHistoryInSecretChat: {
ReadHistoryInSecretChatLogEvent log_event;
log_event_parse(log_event, event.data_).ensure();
auto dialog_id = log_event.dialog_id_;
CHECK(dialog_id.get_type() == DialogType::SecretChat);
if (!td_->contacts_manager_->have_secret_chat_force(dialog_id.get_secret_chat_id())) {
LOG(ERROR) << "Have no info about " << dialog_id;
BinlogHelper::erase(G()->td_db()->get_binlog(), event.id_);
break;
}
force_create_dialog(dialog_id, "ReadHistoryInSecretChatLogEvent");
Dialog *d = get_dialog(dialog_id);
if (d == nullptr || !have_input_peer(dialog_id, AccessRights::Read)) {
BinlogHelper::erase(G()->td_db()->get_binlog(), event.id_);
break;
}
if (d->read_history_logevent_id != 0) {
// we need only latest read history event
BinlogHelper::erase(G()->td_db()->get_binlog(), d->read_history_logevent_id);
}
d->read_history_logevent_id = event.id_;
d->read_history_logevent_id_generation++;
d->last_read_inbox_message_date = log_event.max_date_;
read_history_on_server_impl(dialog_id, MessageId());
break;
}
case LogEvent::HandlerType::ReadMessageContentsOnServer: { case LogEvent::HandlerType::ReadMessageContentsOnServer: {
if (!G()->parameters().use_message_db) { if (!G()->parameters().use_message_db) {
BinlogHelper::erase(G()->td_db()->get_binlog(), event.id_); BinlogHelper::erase(G()->td_db()->get_binlog(), event.id_);

View File

@ -1591,6 +1591,7 @@ class MessagesManager : public Actor {
int32 local_unread_count = 0; int32 local_unread_count = 0;
int32 unread_mention_count = 0; int32 unread_mention_count = 0;
MessageId last_read_inbox_message_id; MessageId last_read_inbox_message_id;
int32 last_read_inbox_message_date = 0; // secret chats only
MessageId last_read_outbox_message_id; MessageId last_read_outbox_message_id;
MessageId reply_markup_message_id; MessageId reply_markup_message_id;
DialogNotificationSettings notification_settings; DialogNotificationSettings notification_settings;
@ -1859,6 +1860,7 @@ class MessagesManager : public Actor {
class GetChannelDifferenceLogEvent; class GetChannelDifferenceLogEvent;
class ReadAllDialogMentionsOnServerLogEvent; class ReadAllDialogMentionsOnServerLogEvent;
class ReadHistoryOnServerLogEvent; class ReadHistoryOnServerLogEvent;
class ReadHistoryInSecretChatLogEvent;
class ReadMessageContentsOnServerLogEvent; class ReadMessageContentsOnServerLogEvent;
class ReorderPinnedDialogsOnServerLogEvent; class ReorderPinnedDialogsOnServerLogEvent;
class SaveDialogDraftMessageOnServerLogEvent; class SaveDialogDraftMessageOnServerLogEvent;

View File

@ -352,6 +352,7 @@ void SecretChatActor::send_message_action(tl_object_ptr<secret_api::SendMessageA
set_typing_query_ = net_query.get_weak(); set_typing_query_ = net_query.get_weak();
context_->send_net_query(std::move(net_query), actor_shared(this), false); context_->send_net_query(std::move(net_query), actor_shared(this), false);
} }
void SecretChatActor::send_read_history(int32 date, Promise<> promise) { void SecretChatActor::send_read_history(int32 date, Promise<> promise) {
if (close_flag_) { if (close_flag_) {
promise.set_error(Status::Error(400, "Chat is closed")); promise.set_error(Status::Error(400, "Chat is closed"));

View File

@ -88,6 +88,7 @@ Status init_binlog(Binlog &binlog, string path, BinlogKeyValue<Binlog> &binlog_p
case LogEvent::HandlerType::ChangeDialogReportSpamStateOnServer: case LogEvent::HandlerType::ChangeDialogReportSpamStateOnServer:
case LogEvent::HandlerType::GetDialogFromServer: case LogEvent::HandlerType::GetDialogFromServer:
case LogEvent::HandlerType::GetChannelDifference: case LogEvent::HandlerType::GetChannelDifference:
case LogEvent::HandlerType::ReadHistoryInSecretChat:
events.to_messages_manager.push_back(event.clone()); events.to_messages_manager.push_back(event.clone());
break; break;
case LogEvent::HandlerType::BinlogPmcMagic: case LogEvent::HandlerType::BinlogPmcMagic:

View File

@ -88,6 +88,7 @@ class LogEvent {
ResetAllNotificationSettingsOnServer = 0x111, ResetAllNotificationSettingsOnServer = 0x111,
ChangeDialogReportSpamStateOnServer = 0x112, ChangeDialogReportSpamStateOnServer = 0x112,
GetDialogFromServer = 0x113, GetDialogFromServer = 0x113,
ReadHistoryInSecretChat = 0x114,
GetChannelDifference = 0x140, GetChannelDifference = 0x140,
ConfigPmcMagic = 0x1f18, ConfigPmcMagic = 0x1f18,
BinlogPmcMagic = 0x4327 BinlogPmcMagic = 0x4327