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

Postpone pts updates, which can't be applied right now.

Browse Source
This commit is contained in:
levlam 2020-12-24 22:09:44 +03:00
parent 4ea10b3de6
commit 3dbc996acc
2 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
td/telegram/MessagesManager.cpp
View File

@ -6236,15 +6236,10 @@ void MessagesManager::add_pending_update(tl_object_ptr<telegram_api::Update> &&u
return promise.set_value(Unit());
}
if (td_->updates_manager_->running_get_difference()) {
if (td_->updates_manager_->running_get_difference() || !postponed_pts_updates_.empty()) {
LOG(INFO) << "Save pending update got while running getDifference from " << source;
CHECK(update->get_id() == dummyUpdate::ID || update->get_id() == updateSentMessage::ID);
if (pts_count > 0) {
postponed_pts_updates_.emplace(new_pts,
PendingPtsUpdate(std::move(update), new_pts, pts_count, std::move(promise)));
} else {
promise.set_value(Unit());
}
postpone_pts_update(std::move(update), new_pts, pts_count, std::move(promise));
return;
}
@ -6252,7 +6247,7 @@ void MessagesManager::add_pending_update(tl_object_ptr<telegram_api::Update> &&u
LOG(WARNING) << "Have old_pts (= " << old_pts << ") + pts_count (= " << pts_count << ") > new_pts (= " << new_pts
<< "). Logged in " << G()->shared_config().get_option_integer("authorization_date") << ". Update from "
<< source << " = " << oneline(to_string(update));
promise.set_value(Unit()); // TODO postpone
postpone_pts_update(std::move(update), new_pts, pts_count, std::move(promise));
set_get_difference_timeout(0.001);
return;
}
@ -6268,7 +6263,7 @@ void MessagesManager::add_pending_update(tl_object_ptr<telegram_api::Update> &&u
<< ", pts_count = " << pts_count << ". Logged in "
<< G()->shared_config().get_option_integer("authorization_date") << ". Update from " << source << " = "
<< oneline(to_string(update));
promise.set_value(Unit()); // TODO postpone
postpone_pts_update(std::move(update), new_pts, pts_count, std::move(promise));
set_get_difference_timeout(0.001);
return;
}
@ -6291,6 +6286,8 @@ void MessagesManager::add_pending_update(tl_object_ptr<telegram_api::Update> &&u
if (pts_count > 0) {
pending_pts_updates_.emplace(new_pts, PendingPtsUpdate(std::move(update), new_pts, pts_count, std::move(promise)));
} else {
promise.set_value(Unit());
}
if (old_pts + accumulated_pts_count_ < accumulated_pts_) {
@ -7442,6 +7439,15 @@ void MessagesManager::drop_pending_updates() {
pending_pts_updates_.clear();
}
void MessagesManager::postpone_pts_update(tl_object_ptr<telegram_api::Update> &&update, int32 pts, int32 pts_count,
Promise<Unit> &&promise) {
if (pts_count > 0) {
postponed_pts_updates_.emplace(pts, PendingPtsUpdate(std::move(update), pts, pts_count, std::move(promise)));
} else {
promise.set_value(Unit());
}
}
string MessagesManager::get_notification_settings_scope_database_key(NotificationSettingsScope scope) {
switch (scope) {
case NotificationSettingsScope::Private:

3
td/telegram/MessagesManager.h
View File

@ -2797,6 +2797,9 @@ class MessagesManager : public Actor {
void drop_pending_updates();
void postpone_pts_update(tl_object_ptr<telegram_api::Update> &&update, int32 pts, int32 pts_count,
Promise<Unit> &&promise);
static string get_channel_pts_key(DialogId dialog_id);
int32 load_channel_pts(DialogId dialog_id) const;