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

Simplify add_pending_channel_update calls.

Browse Source
This commit is contained in:
levlam 2020-12-25 02:37:14 +03:00
parent ba9837f55e
commit b867a597e8
2 changed files with 18 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
td/telegram/MessagesManager.cpp
View File

@ -7122,7 +7122,11 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
const char *source, bool is_postponed_update) { const char *source, bool is_postponed_update) {
LOG(INFO) << "Receive from " << source << " pending " << to_string(update); LOG(INFO) << "Receive from " << source << " pending " << to_string(update);
CHECK(update != nullptr); CHECK(update != nullptr);
CHECK(dialog_id.get_type() == DialogType::Channel); if (dialog_id.get_type() != DialogType::Channel) {
LOG(ERROR) << "Receive update in invalid " << dialog_id << " from " << source << ": " << oneline(to_string(update));
promise.set_value(Unit());
return;
}
if (pts_count < 0 || new_pts <= pts_count) { if (pts_count < 0 || new_pts <= pts_count) {
LOG(ERROR) << "Receive channel update from " << source << " with wrong pts = " << new_pts LOG(ERROR) << "Receive channel update from " << source << " with wrong pts = " << new_pts
<< " or pts_count = " << pts_count << ": " << oneline(to_string(update)); << " or pts_count = " << pts_count << ": " << oneline(to_string(update));

43
td/telegram/UpdatesManager.cpp
View File

@ -1816,17 +1816,11 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateEditChannelMess
void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateDeleteChannelMessages> update, bool /*force_apply*/, void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateDeleteChannelMessages> update, bool /*force_apply*/,
Promise<Unit> &&promise) { Promise<Unit> &&promise) {
ChannelId channel_id(update->channel_id_); DialogId dialog_id(ChannelId(update->channel_id_));
if (!channel_id.is_valid()) { int new_pts = update->pts_;
LOG(ERROR) << "Receive invalid " << channel_id; int pts_count = update->pts_count_;
promise.set_value(Unit()); td_->messages_manager_->add_pending_channel_update(dialog_id, std::move(update), new_pts, pts_count,
} else { std::move(promise), "on_updateDeleteChannelMessages");
DialogId dialog_id(channel_id);
int new_pts = update->pts_;
int pts_count = update->pts_count_;
td_->messages_manager_->add_pending_channel_update(dialog_id, std::move(update), new_pts, pts_count,
std::move(promise), "on_updateDeleteChannelMessages");
}
} }
void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelMessageViews> update, bool /*force_apply*/, void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelMessageViews> update, bool /*force_apply*/,
@ -1893,17 +1887,11 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updatePinnedMessages>
void UpdatesManager::on_update(tl_object_ptr<telegram_api::updatePinnedChannelMessages> update, bool /*force_apply*/, void UpdatesManager::on_update(tl_object_ptr<telegram_api::updatePinnedChannelMessages> update, bool /*force_apply*/,
Promise<Unit> &&promise) { Promise<Unit> &&promise) {
ChannelId channel_id(update->channel_id_); DialogId dialog_id(ChannelId(update->channel_id_));
if (!channel_id.is_valid()) { int new_pts = update->pts_;
LOG(ERROR) << "Receive invalid " << channel_id; int pts_count = update->pts_count_;
promise.set_value(Unit()); td_->messages_manager_->add_pending_channel_update(dialog_id, std::move(update), new_pts, pts_count,
} else { std::move(promise), "on_updatePinnedChannelMessages");
DialogId dialog_id(channel_id);
int new_pts = update->pts_;
int pts_count = update->pts_count_;
td_->messages_manager_->add_pending_channel_update(dialog_id, std::move(update), new_pts, pts_count,
std::move(promise), "on_updatePinnedChannelMessages");
}
} }
void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateNotifySettings> update, bool /*force_apply*/, void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateNotifySettings> update, bool /*force_apply*/,
@ -1960,14 +1948,9 @@ void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateWebPage> update
void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelWebPage> update, bool /*force_apply*/, void UpdatesManager::on_update(tl_object_ptr<telegram_api::updateChannelWebPage> update, bool /*force_apply*/,
Promise<Unit> &&promise) { Promise<Unit> &&promise) {
td_->web_pages_manager_->on_get_web_page(std::move(update->webpage_), DialogId()); td_->web_pages_manager_->on_get_web_page(std::move(update->webpage_), DialogId());
ChannelId channel_id(update->channel_id_); DialogId dialog_id(ChannelId(update->channel_id_));
if (!channel_id.is_valid()) { td_->messages_manager_->add_pending_channel_update(dialog_id, make_tl_object<dummyUpdate>(), update->pts_,
LOG(ERROR) << "Receive invalid " << channel_id; update->pts_count_, Promise<Unit>(), "on_updateChannelWebPage");
} else {
DialogId dialog_id(channel_id);
td_->messages_manager_->add_pending_channel_update(dialog_id, make_tl_object<dummyUpdate>(), update->pts_,
update->pts_count_, Promise<Unit>(), "on_updateChannelWebPage");
}
promise.set_value(Unit()); promise.set_value(Unit());
} }