From 8a3d43daa99bf9827540450fcc57edb6a159d43f Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 26 Jun 2021 04:22:29 +0300 Subject: [PATCH 1/6] Output TQueue load time to log. --- telegram-bot-api/ClientManager.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/telegram-bot-api/ClientManager.cpp b/telegram-bot-api/ClientManager.cpp index 6f8cabb..f042de1 100644 --- a/telegram-bot-api/ClientManager.cpp +++ b/telegram-bot-api/ClientManager.cpp @@ -260,6 +260,7 @@ void ClientManager::start_up() { // init tqueue { + auto load_start_time = td::Time::now(); auto tqueue_binlog = td::make_unique>(); auto binlog = td::make_unique(); auto tqueue = td::TQueue::create(); @@ -276,7 +277,6 @@ void ClientManager::start_up() { }) .ensure(); tqueue_binlog.reset(); - LOG(WARNING) << "Loaded " << loaded_event_count << " TQueue events"; if (!failed_to_replay_log_event_ids.empty()) { LOG(ERROR) << "Failed to replay " << failed_to_replay_log_event_ids.size() << " TQueue events"; @@ -291,6 +291,9 @@ void ClientManager::start_up() { tqueue->set_callback(std::move(concurrent_tqueue_binlog)); parameters_->shared_data_->tqueue_ = std::move(tqueue); + + LOG(WARNING) << "Loaded " << loaded_event_count << " TQueue events in " << (td::Time::now() - load_start_time) + << " seconds"; } // init webhook_db From 7fd2c2a22de31ca77de1ebec79a3f9126a01d6da Mon Sep 17 00:00:00 2001 From: levlam Date: Sat, 17 Jul 2021 04:40:32 +0300 Subject: [PATCH 2/6] Replace error code 403 with 400 in server-side errors just in case. --- telegram-bot-api/Client.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index de13560..857a520 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -65,6 +65,19 @@ void Client::fail_query_with_error(PromisedQueryPtr query, int32 error_code, Sli } error_code = 400; + } else if (error_code == 403) { + bool is_server_error = true; + for (auto c : error_message) { + if (c == '_' || ('A' <= c && c <= 'Z') || td::is_digit(c)) { + continue; + } + + is_server_error = false; + break; + } + if (is_server_error) { + error_code = 400; + } } if (error_code == 400) { if (!default_message.empty()) { From def3e84f1205f97690f052acd5eb1a64425a543c Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 22 Jul 2021 18:15:31 +0300 Subject: [PATCH 3/6] Fix check for self-destructing messages. --- telegram-bot-api/Client.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 857a520..ef4ab11 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -8853,7 +8853,7 @@ bool Client::need_skip_update_message(int64 chat_id, const object_ptrttl_ > 0 && message->ttl_expires_in_ == 0) { + if (message->ttl_ > 0 && message->ttl_expires_in_ == message->ttl_) { return true; } From c95ccee93f57f4c44c932acbc515b4d160789288 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 27 Jul 2021 01:50:23 +0300 Subject: [PATCH 4/6] Update TDLib to 1.7.6. --- td | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/td b/td index 50d2d0f..91f8bb4 160000 --- a/td +++ b/td @@ -1 +1 @@ -Subproject commit 50d2d0ff000c0a6ab78bfb8a6f56ba496b548677 +Subproject commit 91f8bb48ac9507439993919461ed470b6268e051 From 0df68c623515ffec8b7e5058ecd588b528365933 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 27 Jul 2021 01:54:11 +0300 Subject: [PATCH 5/6] Remove debug logging for slow internal queries. --- telegram-bot-api/Query.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/telegram-bot-api/Query.cpp b/telegram-bot-api/Query.cpp index e1dd27a..c8925de 100644 --- a/telegram-bot-api/Query.cpp +++ b/telegram-bot-api/Query.cpp @@ -125,7 +125,7 @@ void Query::send_request_stat() const { void Query::send_response_stat() const { auto now = td::Time::now(); - if (now - start_timestamp_ >= 100.0) { + if (now - start_timestamp_ >= 100.0 && !is_internal_) { LOG(WARNING) << "Answer too old query with code " << http_status_code_ << " and answer size " << answer_.size() << ": " << *this; } From 05b3d5fcb103d18911b5726fa57aad65d42da822 Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 27 Jul 2021 01:55:06 +0300 Subject: [PATCH 6/6] Update version to 5.3.1. --- CMakeLists.txt | 2 +- telegram-bot-api/telegram-bot-api.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9af6665..245e6a8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,7 @@ if (POLICY CMP0065) cmake_policy(SET CMP0065 NEW) endif() -project(TelegramBotApi VERSION 5.3 LANGUAGES CXX) +project(TelegramBotApi VERSION 5.3.1 LANGUAGES CXX) add_subdirectory(td EXCLUDE_FROM_ALL) diff --git a/telegram-bot-api/telegram-bot-api.cpp b/telegram-bot-api/telegram-bot-api.cpp index 3f4769b..58fdef3 100644 --- a/telegram-bot-api/telegram-bot-api.cpp +++ b/telegram-bot-api/telegram-bot-api.cpp @@ -192,7 +192,7 @@ int main(int argc, char *argv[]) { auto start_time = td::Time::now(); auto shared_data = std::make_shared(); auto parameters = std::make_unique(); - parameters->version_ = "5.3"; + parameters->version_ = "5.3.1"; parameters->shared_data_ = shared_data; parameters->start_time_ = start_time; auto net_query_stats = td::create_net_query_stats();