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

Support "CHANNEL_INVALID" errors in response to channels.getDifference.

Browse Source
This commit is contained in:
levlam 2023-07-25 14:12:58 +03:00
parent 8c6f5ece88
commit 0edd5b1651
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
td/telegram/MessagesManager.cpp
View File

@ -4519,7 +4519,7 @@ class GetChannelDifferenceQuery final : public Td::ResultHandler {
return on_error(result_ptr.move_as_error()); return on_error(result_ptr.move_as_error());
} }
td_->messages_manager_->on_get_channel_difference(dialog_id_, pts_, limit_, result_ptr.move_as_ok()); td_->messages_manager_->on_get_channel_difference(dialog_id_, pts_, limit_, result_ptr.move_as_ok(), Status::OK());
} }
void on_error(Status status) final { void on_error(Status status) final {
@ -4528,7 +4528,7 @@ class GetChannelDifferenceQuery final : public Td::ResultHandler {
LOG(ERROR) << "Receive error for GetChannelDifferenceQuery for " << dialog_id_ << " with PTS " << pts_ LOG(ERROR) << "Receive error for GetChannelDifferenceQuery for " << dialog_id_ << " with PTS " << pts_
<< " and limit " << limit_ << ": " << status; << " and limit " << limit_ << ": " << status;
} }
td_->messages_manager_->on_get_channel_difference(dialog_id_, pts_, limit_, nullptr); td_->messages_manager_->on_get_channel_difference(dialog_id_, pts_, limit_, nullptr, std::move(status));
} }
}; };
@ -38666,9 +38666,9 @@ void MessagesManager::retry_get_channel_difference_later(DialogId dialog_id) {
} }
} }
void MessagesManager::on_get_channel_difference( void MessagesManager::on_get_channel_difference(DialogId dialog_id, int32 request_pts, int32 request_limit,
DialogId dialog_id, int32 request_pts, int32 request_limit, tl_object_ptr<telegram_api::updates_ChannelDifference> &&difference_ptr,
tl_object_ptr<telegram_api::updates_ChannelDifference> &&difference_ptr) { Status &&status) {
get_channel_difference_count_--; get_channel_difference_count_--;
CHECK(get_channel_difference_count_ >= 0); CHECK(get_channel_difference_count_ >= 0);
process_pending_get_channel_differences(); process_pending_get_channel_differences();
@ -38680,7 +38680,8 @@ void MessagesManager::on_get_channel_difference(
auto d = get_dialog_force(dialog_id, "on_get_channel_difference"); auto d = get_dialog_force(dialog_id, "on_get_channel_difference");
if (difference_ptr == nullptr) { if (difference_ptr == nullptr) {
bool have_access = have_input_peer(dialog_id, AccessRights::Read); CHECK(status.is_error());
bool have_access = have_input_peer(dialog_id, AccessRights::Read) && status.error().message() != "CHANNEL_INVALID";
if (have_access) { if (have_access) {
if (d == nullptr) { if (d == nullptr) {
force_create_dialog(dialog_id, "on_get_channel_difference failed"); force_create_dialog(dialog_id, "on_get_channel_difference failed");
@ -38695,6 +38696,7 @@ void MessagesManager::on_get_channel_difference(
} }
return; return;
} }
CHECK(status.is_ok());
LOG(INFO) << "Receive result of getChannelDifference for " << dialog_id << " with PTS = " << request_pts LOG(INFO) << "Receive result of getChannelDifference for " << dialog_id << " with PTS = " << request_pts
<< " and limit = " << request_limit << " from " << source << ": " << to_string(difference_ptr); << " and limit = " << request_limit << " from " << source << ": " << to_string(difference_ptr);

3
td/telegram/MessagesManager.h
View File

@ -969,7 +969,8 @@ class MessagesManager final : public Actor {
void on_create_new_dialog_fail(int64 random_id, Status error, Promise<Unit> &&promise); void on_create_new_dialog_fail(int64 random_id, Status error, Promise<Unit> &&promise);
void on_get_channel_difference(DialogId dialog_id, int32 request_pts, int32 request_limit, void on_get_channel_difference(DialogId dialog_id, int32 request_pts, int32 request_limit,
tl_object_ptr<telegram_api::updates_ChannelDifference> &&difference_ptr); tl_object_ptr<telegram_api::updates_ChannelDifference> &&difference_ptr,
Status &&status);
void try_update_dialog_pos(DialogId dialog_id); void try_update_dialog_pos(DialogId dialog_id);