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

Retry loading of channel difference later if receive invalid poll in a message.

Browse Source
This commit is contained in:
levlam 2023-07-23 20:42:30 +03:00
parent a0feba5761
commit 1f6342c88e
2 changed files with 45 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
td/telegram/MessagesManager.cpp
View File

@ -30915,19 +30915,9 @@ void MessagesManager::on_send_message_get_quick_ack(int64 random_id) {
get_chat_id_object(dialog_id, "updateMessageSendAcknowledged"), message_id.get()));
}
void MessagesManager::check_send_message_result(int64 random_id, DialogId dialog_id,
const telegram_api::Updates *updates_ptr, const char *source) {
CHECK(updates_ptr != nullptr);
CHECK(source != nullptr);
auto sent_messages = UpdatesManager::get_new_messages(updates_ptr);
auto sent_messages_random_ids = UpdatesManager::get_sent_messages_random_ids(updates_ptr);
auto is_invalid_poll_message = [](const telegram_api::Message *message) {
bool MessagesManager::is_invalid_poll_message(const telegram_api::Message *message) {
CHECK(message != nullptr);
auto constructor_id = message->get_id();
if (constructor_id == telegram_api::messageEmpty::ID) {
return true;
}
if (constructor_id != telegram_api::message::ID) {
return false;
}
@ -30939,7 +30929,14 @@ void MessagesManager::check_send_message_result(int64 random_id, DialogId dialog
auto poll = static_cast<const telegram_api::messageMediaPoll *>(media)->poll_.get();
return !PollId(poll->id_).is_valid();
};
}
void MessagesManager::check_send_message_result(int64 random_id, DialogId dialog_id,
const telegram_api::Updates *updates_ptr, const char *source) {
CHECK(updates_ptr != nullptr);
CHECK(source != nullptr);
auto sent_messages = UpdatesManager::get_new_messages(updates_ptr);
auto sent_messages_random_ids = UpdatesManager::get_sent_messages_random_ids(updates_ptr);
if (sent_messages.size() != 1u || sent_messages_random_ids.size() != 1u ||
*sent_messages_random_ids.begin() != random_id ||
@ -38639,6 +38636,19 @@ void MessagesManager::on_get_channel_dialog(DialogId dialog_id, MessageId last_m
}
}
void MessagesManager::retry_get_channel_difference_later(DialogId dialog_id) {
auto &delay = channel_get_difference_retry_timeouts_[dialog_id];
if (delay == 0) {
delay = 1;
}
schedule_get_channel_difference(dialog_id, 0, MessageId(), Random::fast(delay * 800, delay * 1200) * 1e-3,
"retry_get_channel_difference_later");
delay *= 2;
if (delay > 60) {
delay = Random::fast(60, 80);
}
}
void MessagesManager::on_get_channel_difference(
DialogId dialog_id, int32 request_pts, int32 request_limit,
tl_object_ptr<telegram_api::updates_ChannelDifference> &&difference_ptr) {
@ -38662,24 +38672,13 @@ void MessagesManager::on_get_channel_difference(
return after_get_channel_difference(dialog_id, false);
}
}
auto &delay = channel_get_difference_retry_timeouts_[dialog_id];
if (delay == 0) {
delay = 1;
}
schedule_get_channel_difference(dialog_id, 0, MessageId(), Random::fast(delay * 1000, delay * 1500) * 1e-3,
"on_get_channel_difference");
delay *= 2;
if (delay > 60) {
delay = Random::fast(60, 80);
}
retry_get_channel_difference_later(dialog_id);
} else {
after_get_channel_difference(dialog_id, false);
}
return;
}
channel_get_difference_retry_timeouts_.erase(dialog_id);
LOG(INFO) << "Receive result of getChannelDifference for " << dialog_id << " with PTS = " << request_pts
<< " and limit = " << request_limit << " from " << source << ": " << to_string(difference_ptr);
@ -38688,6 +38687,7 @@ void MessagesManager::on_get_channel_difference(
case telegram_api::updates_channelDifferenceEmpty::ID:
if (d == nullptr) {
// no need to create the dialog
channel_get_difference_retry_timeouts_.erase(dialog_id);
after_get_channel_difference(dialog_id, true);
return;
}
@ -38697,6 +38697,14 @@ void MessagesManager::on_get_channel_difference(
have_new_messages = !difference->new_messages_.empty();
td_->contacts_manager_->on_get_users(std::move(difference->users_), "updates.channelDifference");
td_->contacts_manager_->on_get_chats(std::move(difference->chats_), "updates.channelDifference");
for (const auto &message : difference->new_messages_) {
if (is_invalid_poll_message(message.get())) {
LOG(ERROR) << "Receive invalid poll message in updates.channelDifference: " << oneline(to_string(message));
if (channel_get_difference_retry_timeouts_[dialog_id] <= 2) {
return retry_get_channel_difference_later(dialog_id);
}
}
}
break;
}
case telegram_api::updates_channelDifferenceTooLong::ID: {
@ -38710,6 +38718,8 @@ void MessagesManager::on_get_channel_difference(
UNREACHABLE();
}
channel_get_difference_retry_timeouts_.erase(dialog_id);
bool need_update_dialog_pos = false;
if (d == nullptr) {
d = add_dialog_for_new_message(dialog_id, have_new_messages, &need_update_dialog_pos, "on_get_channel_difference");

4
td/telegram/MessagesManager.h
View File

@ -3011,6 +3011,8 @@ class MessagesManager final : public Actor {
void update_list_last_dialog_date(DialogList &list);
static bool is_invalid_poll_message(const telegram_api::Message *message);
static string get_channel_pts_key(DialogId dialog_id);
int32 load_channel_pts(DialogId dialog_id) const;
@ -3024,6 +3026,8 @@ class MessagesManager final : public Actor {
bool running_get_channel_difference(DialogId dialog_id) const;
void retry_get_channel_difference_later(DialogId dialog_id);
void on_channel_get_difference_timeout(DialogId dialog_id);
void update_expected_channel_pts(DialogId dialog_id, int32 expected_pts);