From aa0f3691324a5fdb64311f47f27bb56f3fd8b4f0 Mon Sep 17 00:00:00 2001 From: levlam Date: Mon, 4 Dec 2023 13:42:00 +0300 Subject: [PATCH] Update TDLib to 1.8.22. --- td | 2 +- telegram-bot-api/Client.cpp | 19 +++++++++++++------ telegram-bot-api/Client.h | 4 ++-- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/td b/td index 9184b3e..4dbcfce 160000 --- a/td +++ b/td @@ -1 +1 @@ -Subproject commit 9184b3e62de59663a59d3500528aee7e5f0d83fa +Subproject commit 4dbcfce77d6f2ef95b3f1d2ef8ef6b0c66a4fd4d diff --git a/telegram-bot-api/Client.cpp b/telegram-bot-api/Client.cpp index 5c989de..28de281 100644 --- a/telegram-bot-api/Client.cpp +++ b/telegram-bot-api/Client.cpp @@ -2390,9 +2390,9 @@ void Client::JsonMessage::store(td::JsonValueScope *scope) const { object("external_reply", JsonExternalReplyInfo(message_->reply_to_message.get(), client_)); } if (message_->reply_to_message != nullptr && message_->reply_to_message->quote_ != nullptr) { - object("quote", message_->reply_to_message->quote_->text_); - if (!message_->reply_to_message->quote_->entities_.empty()) { - object("quote_entities", JsonVectorEntities(message_->reply_to_message->quote_->entities_, client_)); + object("quote", message_->reply_to_message->quote_->text_->text_); + if (!message_->reply_to_message->quote_->text_->entities_.empty()) { + object("quote_entities", JsonVectorEntities(message_->reply_to_message->quote_->text_->entities_, client_)); } } if (message_->media_album_id != 0) { @@ -2723,6 +2723,9 @@ void Client::JsonMessage::store(td::JsonValueScope *scope) const { object("chat_shared", JsonChatShared(content)); break; } + case td_api::messageStory::ID: + object("story", JsonEmptyObject()); + break; case td_api::messageChatSetBackground::ID: break; case td_api::messagePremiumGiftCode::ID: @@ -2735,8 +2738,7 @@ void Client::JsonMessage::store(td::JsonValueScope *scope) const { object("giveaway", JsonGiveaway(content, client_)); break; } - case td_api::messageStory::ID: - object("story", JsonEmptyObject()); + case td_api::messagePremiumGiveawayCompleted::ID: break; default: UNREACHABLE(); @@ -6769,7 +6771,7 @@ td::Result Client::get_reply_parameters(td::JsonVa result.reply_in_chat_id = std::move(chat_id); result.reply_to_message_id = as_tdlib_message_id(td::max(message_id, 0)); result.allow_sending_without_reply = allow_sending_without_reply; - result.quote = std::move(quote); + result.quote = td_api::make_object(std::move(quote), 0); return std::move(result); } @@ -13136,6 +13138,8 @@ bool Client::need_skip_update_message(int64 chat_id, const object_ptr(message->content_.get()) ->old_background_message_id_; + case td_api::messagePremiumGiveawayCompleted::ID: + return static_cast(message->content_.get()) + ->giveaway_message_id_; case td_api::messagePaymentSuccessful::ID: UNREACHABLE(); return static_cast(0); diff --git a/telegram-bot-api/Client.h b/telegram-bot-api/Client.h index b77ad42..3294c79 100644 --- a/telegram-bot-api/Client.h +++ b/telegram-bot-api/Client.h @@ -288,13 +288,13 @@ class Client final : public WebhookActor::Callback { td::string reply_in_chat_id; int64 reply_to_message_id = 0; bool allow_sending_without_reply = false; - object_ptr quote; + object_ptr quote; }; struct CheckedReplyParameters { int64 reply_in_chat_id = 0; int64 reply_to_message_id = 0; - object_ptr quote; + object_ptr quote; }; struct UserInfo;