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

Simplify result handling.

Browse Source
This commit is contained in:
levlam 2021-11-08 14:35:40 +03:00
parent 5578ecc6b8
commit 776635e8c5
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
td/telegram/Td.cpp
View File

@ -158,16 +158,6 @@ void Td::ResultHandler::set_td(Td *new_td) {
td = new_td; td = new_td;
} }
void Td::ResultHandler::on_result(NetQueryPtr query) {
CHECK(query->is_ready());
if (query->is_ok()) {
on_result(std::move(query->ok()));
} else {
on_error(std::move(query->error()));
}
query->clear();
}
void Td::ResultHandler::send_query(NetQueryPtr query) { void Td::ResultHandler::send_query(NetQueryPtr query) {
td->add_handler(query->id(), shared_from_this()); td->add_handler(query->id(), shared_from_this());
send(std::move(query)); send(std::move(query));
@ -3283,13 +3273,17 @@ void Td::on_result(NetQueryPtr query) {
} }
auto handler = extract_handler(query->id()); auto handler = extract_handler(query->id());
if (handler == nullptr) { if (handler != nullptr) {
query->clear(); CHECK(query->is_ready());
LOG_IF(WARNING, !query->is_ok() || query->ok_tl_constructor() != telegram_api::upload_file::ID) if (query->is_ok()) {
<< tag("NetQuery", query) << " is ignored: no handlers found"; handler->on_result(std::move(query->ok()));
return; } else {
handler->on_error(std::move(query->error()));
}
} else if (!query->is_ok() || query->ok_tl_constructor() != telegram_api::upload_file::ID) {
LOG(WARNING) << query << " is ignored: no handlers found";
} }
handler->on_result(std::move(query)); query->clear();
} }
bool Td::is_internal_config_option(Slice name) { bool Td::is_internal_config_option(Slice name) {

2
td/telegram/Td.h
View File

@ -208,8 +208,6 @@ class Td final : public Actor {
ResultHandler &operator=(const ResultHandler &) = delete; ResultHandler &operator=(const ResultHandler &) = delete;
virtual ~ResultHandler() = default; virtual ~ResultHandler() = default;
virtual void on_result(NetQueryPtr query);
virtual void on_result(BufferSlice packet) { virtual void on_result(BufferSlice packet) {
UNREACHABLE(); UNREACHABLE();
} }