From b867a597e822cbb649fdb990e24c405bc356855d Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Fri, 25 Dec 2020 02:37:14 +0300
Subject: [PATCH] Simplify add_pending_channel_update calls.

---
 td/telegram/MessagesManager.cpp |  6 ++++-
 td/telegram/UpdatesManager.cpp  | 43 ++++++++++-----------------------
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp
index 2df041fa4..50a56051a 100644
--- a/td/telegram/MessagesManager.cpp
+++ b/td/telegram/MessagesManager.cpp
@@ -7122,7 +7122,11 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
                                                  const char *source, bool is_postponed_update) {
   LOG(INFO) << "Receive from " << source << " pending " << to_string(update);
   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) {
     LOG(ERROR) << "Receive channel update from " << source << " with wrong pts = " << new_pts
                << " or pts_count = " << pts_count << ": " << oneline(to_string(update));
diff --git a/td/telegram/UpdatesManager.cpp b/td/telegram/UpdatesManager.cpp
index 854809e0f..975a6c650 100644
--- a/td/telegram/UpdatesManager.cpp
+++ b/td/telegram/UpdatesManager.cpp
@@ -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*/,
                                Promise<Unit> &&promise) {
-  ChannelId channel_id(update->channel_id_);
-  if (!channel_id.is_valid()) {
-    LOG(ERROR) << "Receive invalid " << channel_id;
-    promise.set_value(Unit());
-  } else {
-    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");
-  }
+  DialogId dialog_id(ChannelId(update->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*/,
@@ -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*/,
                                Promise<Unit> &&promise) {
-  ChannelId channel_id(update->channel_id_);
-  if (!channel_id.is_valid()) {
-    LOG(ERROR) << "Receive invalid " << channel_id;
-    promise.set_value(Unit());
-  } else {
-    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");
-  }
+  DialogId dialog_id(ChannelId(update->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*/,
@@ -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*/,
                                Promise<Unit> &&promise) {
   td_->web_pages_manager_->on_get_web_page(std::move(update->webpage_), DialogId());
-  ChannelId channel_id(update->channel_id_);
-  if (!channel_id.is_valid()) {
-    LOG(ERROR) << "Receive invalid " << channel_id;
-  } 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");
-  }
+  DialogId dialog_id(ChannelId(update->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());
 }