From c68f6a7a8991f54ea25f3fbe5ef21d75abb5f292 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 11 Jan 2023 20:30:27 +0300 Subject: [PATCH] Update TDLib to 1.8.11. --- td | 2 +- telegram-bot-api/Client.cpp | 31 ++++++++++++++++++++++-------- telegram-bot-api/ClientManager.cpp | 2 +- telegram-bot-api/WebhookActor.cpp | 2 +- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/td b/td index eeb73d4..3179d35 160000 --- a/td +++ b/td @@ -1 +1 @@ -Subproject commit eeb73d4eb22d201655ed30e0e5b76ced3ef2323f +Subproject commit 3179d35694a28267a0b6273fc9b5bdce3b6b1235 diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 0e72482..cec3a52 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -734,10 +734,12 @@ class Client::JsonChat final : public Jsonable { } object("permissions", JsonChatPermissions(permissions)); } - auto everyone_is_administrator = permissions->can_send_messages_ && permissions->can_send_media_messages_ && - permissions->can_send_polls_ && permissions->can_send_other_messages_ && - permissions->can_add_web_page_previews_ && permissions->can_change_info_ && - permissions->can_invite_users_ && permissions->can_pin_messages_; + auto everyone_is_administrator = + permissions->can_send_messages_ && permissions->can_send_audios_ && permissions->can_send_documents_ && + permissions->can_send_photos_ && permissions->can_send_videos_ && permissions->can_send_video_notes_ && + permissions->can_send_voice_notes_ && permissions->can_send_polls_ && + permissions->can_send_other_messages_ && permissions->can_add_web_page_previews_ && + permissions->can_change_info_ && permissions->can_invite_users_ && permissions->can_pin_messages_; object("all_members_are_administrators", td::JsonBool(everyone_is_administrator)); photo = group_info->photo.get(); break; @@ -2196,6 +2198,10 @@ void Client::JsonMessage::store(JsonValueScope *scope) const { case td_api::messageBotWriteAccessAllowed::ID: object("write_access_allowed", JsonEmptyObject()); break; + case td_api::messageUserShared::ID: + break; + case td_api::messageChatShared::ID: + break; default: UNREACHABLE(); } @@ -6914,9 +6920,11 @@ td::Result> Client::get_chat_permiss if (can_send_other_messages || can_add_web_page_previews) { can_send_media_messages = true; } - return make_object(can_send_messages, can_send_media_messages, can_send_polls, - can_send_other_messages, can_add_web_page_previews, can_change_info, - can_invite_users, can_pin_messages, can_manage_topics); + return make_object(can_send_messages, can_send_media_messages, can_send_media_messages, + can_send_media_messages, can_send_media_messages, can_send_media_messages, + can_send_media_messages, can_send_polls, can_send_other_messages, + can_add_web_page_previews, can_change_info, can_invite_users, + can_pin_messages, can_manage_topics); } td::Result> Client::get_input_media(const Query *query, @@ -9975,8 +9983,11 @@ void Client::json_store_administrator_rights(td::JsonObjectScope &object, const } void Client::json_store_permissions(td::JsonObjectScope &object, const td_api::chatPermissions *permissions) { + bool can_send_media_messages = permissions->can_send_audios_ || permissions->can_send_documents_ || + permissions->can_send_photos_ || permissions->can_send_videos_ || + permissions->can_send_video_notes_ || permissions->can_send_voice_notes_; object("can_send_messages", td::JsonBool(permissions->can_send_messages_)); - object("can_send_media_messages", td::JsonBool(permissions->can_send_media_messages_)); + object("can_send_media_messages", td::JsonBool(can_send_media_messages)); object("can_send_polls", td::JsonBool(permissions->can_send_polls_)); object("can_send_other_messages", td::JsonBool(permissions->can_send_other_messages_)); object("can_add_web_page_previews", td::JsonBool(permissions->can_add_web_page_previews_)); @@ -10454,6 +10465,10 @@ bool Client::need_skip_update_message(int64 chat_id, const object_ptr containers; auto add_string = [&containers](td::Slice str) { containers.emplace_back(str); - return containers.back().as_slice(); + return containers.back().as_mutable_slice(); }; token = add_string(token); diff --git a/telegram-bot-api/WebhookActor.cpp b/telegram-bot-api/WebhookActor.cpp index 3bab4ea..318390c 100644 --- a/telegram-bot-api/WebhookActor.cpp +++ b/telegram-bot-api/WebhookActor.cpp @@ -687,7 +687,7 @@ void WebhookActor::start_up() { next_ip_address_resolve_time_ = last_success_time_ = td::Time::now() - 3600; - active_new_connection_flood_.add_limit(1, 20); + active_new_connection_flood_.add_limit(0.5, 10); pending_new_connection_flood_.add_limit(2, 1);