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

Use messageEmpty.peer_id.

Browse Source
This commit is contained in:
levlam 2021-01-02 23:32:02 +03:00
parent 6bba5a568a
commit 567707099e
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
td/telegram/MessagesManager.cpp
View File

@ -6876,10 +6876,8 @@ void MessagesManager::add_pending_channel_update(DialogId dialog_id, tl_object_p
LOG(INFO) << "Receive from " << source << " pending " << to_string(update); LOG(INFO) << "Receive from " << source << " pending " << to_string(update);
CHECK(update != nullptr); CHECK(update != nullptr);
if (dialog_id.get_type() != DialogType::Channel) { if (dialog_id.get_type() != DialogType::Channel) {
if (dialog_id != DialogId() || !td_->auth_manager_->is_bot()) {
LOG(ERROR) << "Receive channel update in invalid " << dialog_id << " from " << source << ": " LOG(ERROR) << "Receive channel update in invalid " << dialog_id << " from " << source << ": "
<< oneline(to_string(update)); << oneline(to_string(update));
}
promise.set_value(Unit()); promise.set_value(Unit());
return; return;
} }
@ -9301,10 +9299,8 @@ void MessagesManager::on_get_scheduled_server_messages(DialogId dialog_id, uint3
for (auto &message : messages) { for (auto &message : messages) {
auto message_dialog_id = get_message_dialog_id(message); auto message_dialog_id = get_message_dialog_id(message);
if (message_dialog_id != dialog_id) { if (message_dialog_id != dialog_id) {
if (dialog_id.is_valid()) {
LOG(ERROR) << "Receive " << get_message_id(message, true) << " in wrong " << message_dialog_id << " instead of " LOG(ERROR) << "Receive " << get_message_id(message, true) << " in wrong " << message_dialog_id << " instead of "
<< dialog_id << ": " << oneline(to_string(message)); << dialog_id << ": " << oneline(to_string(message));
}
continue; continue;
} }
@ -11312,8 +11308,10 @@ MessageId MessagesManager::get_message_id(const tl_object_ptr<telegram_api::Mess
DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) { DialogId MessagesManager::get_message_dialog_id(const tl_object_ptr<telegram_api::Message> &message_ptr) {
switch (message_ptr->get_id()) { switch (message_ptr->get_id()) {
case telegram_api::messageEmpty::ID: case telegram_api::messageEmpty::ID: {
return DialogId(); auto message = static_cast<const telegram_api::messageEmpty *>(message_ptr.get());
return message->peer_id_ == nullptr ? DialogId() : DialogId(message->peer_id_);
}
case telegram_api::message::ID: { case telegram_api::message::ID: {
auto message = static_cast<const telegram_api::message *>(message_ptr.get()); auto message = static_cast<const telegram_api::message *>(message_ptr.get());
return DialogId(message->peer_id_); return DialogId(message->peer_id_);