tdlight-team/tdlight-telegram-bot-api
tdlight-team
/
tdlight-telegram-bot-api
mirror of https://github.com/tdlight-team/tdlight-telegram-bot-api.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

Fail pending setWebhook queries during closing.

This commit is contained in:
levlam 2022-10-04 17:05:35 +03:00
parent e4324ead54
commit 2cca516445
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
telegram-bot-api/Client.cpp
View File

@ -7014,11 +7014,8 @@ void Client::on_cmd(PromisedQueryPtr query) {
}
}
if (logging_out_) {
return fail_query(LOGGING_OUT_ERROR_CODE, get_logging_out_error_description(), std::move(query));
}
if (closing_) {
return fail_query(CLOSING_ERROR_CODE, CLOSING_ERROR_DESCRIPTION, std::move(query));
if (logging_out_ || closing_) {
return fail_query_closing(std::move(query));
}
CHECK(was_authorized_);
@ -8791,6 +8788,9 @@ bool Client::get_webhook_fix_ip_address(const Query *query) {
void Client::do_set_webhook(PromisedQueryPtr query, bool was_deleted) {
CHECK(webhook_url_.empty());
if (logging_out_ || closing_) {
return fail_query_closing(std::move(query));
}
if (to_bool(query->arg("drop_pending_updates"))) {
clear_tqueue();
}
@ -8859,6 +8859,9 @@ void Client::finish_set_webhook(PromisedQueryPtr query) {
CHECK(!active_webhook_set_query_);
CHECK(!webhook_set_query_);
CHECK(webhook_url_.empty());
if (logging_out_ || closing_) {
return fail_query_closing(std::move(query));
}
Slice new_url = query->arg("url");
CHECK(!new_url.empty());
webhook_url_ = new_url.str();
@ -8985,6 +8988,16 @@ void Client::fail_query_conflict(Slice message, PromisedQueryPtr &&query) {
}
}
void Client::fail_query_closing(PromisedQueryPtr &&query) const {
if (logging_out_) {
return fail_query(LOGGING_OUT_ERROR_CODE, get_logging_out_error_description(), std::move(query));
}
if (closing_) {
return fail_query(CLOSING_ERROR_CODE, CLOSING_ERROR_DESCRIPTION, std::move(query));
}
UNREACHABLE();
}
class Client::JsonUpdates final : public Jsonable {
public:
explicit JsonUpdates(td::Span<td::TQueue::Event> updates) : updates_(updates) {

2
telegram-bot-api/Client.h
View File

@ -600,6 +600,8 @@ class Client final : public WebhookActor::Callback {
void abort_long_poll(bool from_set_webhook);
void fail_query_closing(PromisedQueryPtr &&query) const;
void fail_query_conflict(Slice message, PromisedQueryPtr &&query);
static void fail_query_with_error(PromisedQueryPtr query, int32 error_code, Slice error_message,