From a133545d4b419a49e3d931adf73bc186d56ec239 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 14 Mar 2021 05:00:36 +0300 Subject: [PATCH 1/6] Treat self as a member in deactivated basic groups. --- telegram-bot-api/Client.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 992ff67..3e93c8d 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -8003,6 +8003,9 @@ void Client::add_group(std::unordered_map &groups, object_ptr< group_info->kicked = group->status_->get_id() == td_api::chatMemberStatusBanned::ID; group_info->is_active = group->is_active_; group_info->upgraded_to_supergroup_id = group->upgraded_to_supergroup_id_; + if (!group_info->left && !group_info->kicked && group_info->member_count == 0) { + group_info->member_count = 1; + } } const Client::GroupInfo *Client::get_group_info(int32 group_id) const { From 72171e57517e17ef8c82e581d327ef52191e82d6 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 14 Mar 2021 05:24:32 +0300 Subject: [PATCH 2/6] Improve log messages in fail_query_with_error. --- telegram-bot-api/Client.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 3e93c8d..711c93a 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -53,7 +53,7 @@ void Client::fail_query_with_error(PromisedQueryPtr query, int32 error_code, Sli return query->set_retry_after_error(r_retry_after.ok()); } } - LOG(ERROR) << "Wrong error message: " << error_message; + LOG(ERROR) << "Wrong error message: " << error_message << " from " << *query; return fail_query(500, error_message, std::move(query)); } int32 real_error_code = error_code; @@ -109,8 +109,6 @@ void Client::fail_query_with_error(PromisedQueryPtr query, int32 error_code, Sli } else if (error_message == "MESSAGE_DELETE_FORBIDDEN") { error_code = 400; error_message = Slice("message can't be deleted"); - } else if (error_message == "Requested data is inaccessible") { - LOG(ERROR) << "Receive 'Requested data is inaccessible' from " << *query; } } Slice prefix; @@ -127,11 +125,11 @@ void Client::fail_query_with_error(PromisedQueryPtr query, int32 error_code, Sli case 500: prefix = Slice("Internal Server Error"); if (real_error_message != Slice("Request aborted")) { - LOG(ERROR) << "Receive Internal Server Error: " << real_error_message; + LOG(ERROR) << "Receive Internal Server Error \"" << real_error_message << "\" from " << *query; } break; default: - LOG(ERROR) << "Unsupported error " << real_error_code << ": " << real_error_message; + LOG(ERROR) << "Unsupported error " << real_error_code << ": " << real_error_message << " from " << *query; return fail_query(400, PSLICE() << "Bad Request: " << error_message, std::move(query)); } @@ -140,7 +138,7 @@ void Client::fail_query_with_error(PromisedQueryPtr query, int32 error_code, Sli } else { td::string error_str = prefix.str(); if (error_message.empty()) { - LOG(ERROR) << "Empty error message with code " << real_error_code; + LOG(ERROR) << "Empty error message with code " << real_error_code << " from " << *query; } else { error_str += ": "; if (error_message.size() >= 2u && From d97045bc061033968031382f79e43a58cf2eb175 Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 14 Mar 2021 05:28:30 +0300 Subject: [PATCH 3/6] Add version to ClientParameters and log it on launch. --- telegram-bot-api/Client.cpp | 2 +- telegram-bot-api/ClientParameters.h | 2 ++ telegram-bot-api/telegram-bot-api.cpp | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 711c93a..22ae961 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -3996,7 +3996,7 @@ void Client::on_update_authorization_state() { parameters->api_hash_ = parameters_->api_hash_; parameters->system_language_code_ = "en"; parameters->device_model_ = "server"; - parameters->application_version_ = "5.1"; + parameters->application_version_ = parameters_->version_; parameters->enable_storage_optimizer_ = true; parameters->ignore_file_names_ = true; diff --git a/telegram-bot-api/ClientParameters.h b/telegram-bot-api/ClientParameters.h index c04938b..6ca1432 100644 --- a/telegram-bot-api/ClientParameters.h +++ b/telegram-bot-api/ClientParameters.h @@ -59,6 +59,8 @@ struct ClientParameters { td::int32 api_id_ = 0; td::string api_hash_; + td::string version_; + td::int32 default_max_webhook_connections_ = 0; td::IPAddress webhook_proxy_ip_address_; diff --git a/telegram-bot-api/telegram-bot-api.cpp b/telegram-bot-api/telegram-bot-api.cpp index 8bffe3e..973f0bf 100644 --- a/telegram-bot-api/telegram-bot-api.cpp +++ b/telegram-bot-api/telegram-bot-api.cpp @@ -134,6 +134,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.1"; parameters->shared_data_ = shared_data; parameters->start_time_ = start_time; auto net_query_stats = td::create_net_query_stats(); @@ -399,7 +400,7 @@ int main(int argc, char *argv[]) { // LOG(WARNING) << "Bot API server with commit " << td::GitInfo::commit() << ' ' // << (td::GitInfo::is_dirty() ? "(dirty)" : "") << " started"; - LOG(WARNING) << "Bot API server started"; + LOG(WARNING) << "Bot API " << parameters->version_ << " server started"; const int threads_n = 5; // +3 for Td, one for slow HTTP connections and one for DNS resolving td::ConcurrentScheduler sched; From bf371b21b97c4c8d0b2e2646db05c654cb05480e Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 28 Mar 2021 22:03:32 +0300 Subject: [PATCH 4/6] Update TDLib to 1.7.3. --- td | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/td b/td index 29ded98..fbc7e5a 160000 --- a/td +++ b/td @@ -1 +1 @@ -Subproject commit 29ded98a46cf98e77de1d725ed33e28f76c0a23d +Subproject commit fbc7e5a7f845d6c8df12b11f5b9a5c9ffc6eea0e From 75244a060f2d1cb38a8f6840824ad7965215087d Mon Sep 17 00:00:00 2001 From: Giuseppe Marino Date: Sat, 3 Apr 2021 21:04:02 +0200 Subject: [PATCH 5/6] update submodule --- td | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/td b/td index 1ce823b..4a8d8a3 160000 --- a/td +++ b/td @@ -1 +1 @@ -Subproject commit 1ce823b0e693289b19c2e38a147e8e5a2f46999f +Subproject commit 4a8d8a3ffb21d1449c659f8ad3467edfb8191d12 From 54583dbb54f6b7f8fc14d8423169e631155c4f89 Mon Sep 17 00:00:00 2001 From: Giuseppe Marino Date: Tue, 6 Apr 2021 14:21:08 +0200 Subject: [PATCH 6/6] update submodule --- td | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/td b/td index 4a8d8a3..70e15f4 160000 --- a/td +++ b/td @@ -1 +1 @@ -Subproject commit 4a8d8a3ffb21d1449c659f8ad3467edfb8191d12 +Subproject commit 70e15f4707d19a96bb79242c8f6be1b16ac5875f