Skip to content

Commit 07ad767

Browse files
levlamlevlam
committed
Update TDLib to 1.8.44.
1 parent 57a2017 commit 07ad767

File tree

2 files changed

+47
-21
lines changed

2 files changed

+47
-21
lines changed

‎td

Submodule td updated 78 files

‎telegram-bot-api/Client.cpp

+46-20
Original file line numberDiff line numberDiff line change
@@ -4350,8 +4350,21 @@ class Client::JsonStarTransactionType final : public td::Jsonable {
43504350
}
43514351
case td_api::starTransactionTypeGiftPurchase::ID: {
43524352
auto type = static_cast<const td_api::starTransactionTypeGiftPurchase *>(type_);
4353-
object("type", "user");
4354-
object("user", JsonUser(type->user_id_, client_));
4353+
switch (type->owner_id_->get_id()) {
4354+
case td_api::messageSenderUser::ID: {
4355+
auto owner_id = static_cast<const td_api::messageSenderUser *>(type->owner_id_.get());
4356+
object("type", "user");
4357+
object("user", JsonUser(owner_id->user_id_, client_));
4358+
break;
4359+
}
4360+
case td_api::messageSenderChat::ID: {
4361+
// auto owner_id = static_cast<const td_api::messageSenderChat *>(type->owner_id_.get());
4362+
object("type", "other");
4363+
break;
4364+
}
4365+
default:
4366+
UNREACHABLE();
4367+
}
43554368
object("gift", JsonGift(type->gift_.get(), client_));
43564369
break;
43574370
}
@@ -7267,7 +7280,11 @@ void Client::on_update(object_ptr<td_api::Object> result) {
72677280
chat_info->permissions = std::move(chat->permissions_);
72687281
chat_info->message_auto_delete_time = chat->message_auto_delete_time_;
72697282
chat_info->emoji_status_custom_emoji_id =
7270-
chat->emoji_status_ != nullptr ? chat->emoji_status_->custom_emoji_id_ : 0;
7283+
chat->emoji_status_ != nullptr &&
7284+
chat->emoji_status_->type_->get_id() == td_api::emojiStatusTypeCustomEmoji::ID
7285+
? static_cast<const td_api::emojiStatusTypeCustomEmoji *>(chat->emoji_status_->type_.get())
7286+
->custom_emoji_id_
7287+
: 0;
72717288
chat_info->emoji_status_expiration_date =
72727289
chat->emoji_status_ != nullptr ? chat->emoji_status_->expiration_date_ : 0;
72737290
set_chat_available_reactions(chat_info, std::move(chat->available_reactions_));
@@ -7311,7 +7328,11 @@ void Client::on_update(object_ptr<td_api::Object> result) {
73117328
auto chat_info = add_chat(update->chat_id_);
73127329
CHECK(chat_info->type != ChatInfo::Type::Unknown);
73137330
chat_info->emoji_status_custom_emoji_id =
7314-
update->emoji_status_ != nullptr ? update->emoji_status_->custom_emoji_id_ : 0;
7331+
update->emoji_status_ != nullptr &&
7332+
update->emoji_status_->type_->get_id() == td_api::emojiStatusTypeCustomEmoji::ID
7333+
? static_cast<const td_api::emojiStatusTypeCustomEmoji *>(update->emoji_status_->type_.get())
7334+
->custom_emoji_id_
7335+
: 0;
73157336
chat_info->emoji_status_expiration_date =
73167337
update->emoji_status_ != nullptr ? update->emoji_status_->expiration_date_ : 0;
73177338
break;
@@ -8787,8 +8808,8 @@ td::Result<td_api::object_ptr<td_api::InputInlineQueryResult>> Client::get_inlin
87878808

87888809
if (input_message_content == nullptr) {
87898810
input_message_content = make_object<td_api::inputMessageVideo>(
8790-
nullptr, nullptr, td::vector<int32>(), video_duration, video_width, video_height, false, std::move(caption),
8791-
show_caption_above_media, nullptr, false);
8811+
nullptr, nullptr, nullptr, 0, td::vector<int32>(), video_duration, video_width, video_height, false,
8812+
std::move(caption), show_caption_above_media, nullptr, false);
87928813
}
87938814
return make_object<td_api::inputInlineQueryResultVideo>(id, title, description, thumbnail_url, video_url, mime_type,
87948815
video_width, video_height, video_duration,
@@ -9793,7 +9814,7 @@ td::Result<td_api::object_ptr<td_api::InputMessageContent>> Client::get_input_me
97939814
height = td::clamp(height, 0, MAX_LENGTH);
97949815
duration = td::clamp(duration, 0, MAX_DURATION);
97959816

9796-
return make_object<td_api::inputMessageVideo>(std::move(input_file), std::move(input_thumbnail),
9817+
return make_object<td_api::inputMessageVideo>(std::move(input_file), std::move(input_thumbnail), nullptr, 0,
97979818
td::vector<int32>(), duration, width, height, supports_streaming,
97989819
std::move(caption), show_caption_above_media, nullptr, has_spoiler);
97999820
}
@@ -9912,7 +9933,7 @@ td::Result<td_api::object_ptr<td_api::inputPaidMedia>> Client::get_input_paid_me
99129933
TRY_RESULT(duration, object.get_optional_int_field("duration"));
99139934
TRY_RESULT(supports_streaming, object.get_optional_bool_field("supports_streaming"));
99149935
duration = td::clamp(duration, 0, MAX_DURATION);
9915-
media_type = make_object<td_api::inputPaidMediaTypeVideo>(duration, supports_streaming);
9936+
media_type = make_object<td_api::inputPaidMediaTypeVideo>(nullptr, 0, duration, supports_streaming);
99169937
} else {
99179938
return td::Status::Error(PSLICE() << "type \"" << type << "\" is unsupported");
99189939
}
@@ -10643,7 +10664,7 @@ td::Status Client::process_send_video_query(PromisedQueryPtr &query) {
1064310664
auto show_caption_above_media = to_bool(query->arg("show_caption_above_media"));
1064410665
auto has_spoiler = to_bool(query->arg("has_spoiler"));
1064510666
do_send_message(make_object<td_api::inputMessageVideo>(
10646-
std::move(video), std::move(thumbnail), td::vector<int32>(), duration, width, height,
10667+
std::move(video), std::move(thumbnail), nullptr, 0, td::vector<int32>(), duration, width, height,
1064710668
supports_streaming, std::move(caption), show_caption_above_media, nullptr, has_spoiler),
1064810669
std::move(query));
1064910670
return td::Status::OK();
@@ -10833,8 +10854,9 @@ td::Status Client::process_copy_message_query(PromisedQueryPtr &query) {
1083310854
check_message(
1083410855
from_chat_id, message_id, false, AccessRights::Read, "message to copy", std::move(query),
1083510856
[this, options = std::move(options)](int64 from_chat_id, int64 message_id, PromisedQueryPtr query) mutable {
10836-
do_send_message(make_object<td_api::inputMessageForwarded>(from_chat_id, message_id, false, std::move(options)),
10837-
std::move(query));
10857+
do_send_message(
10858+
make_object<td_api::inputMessageForwarded>(from_chat_id, message_id, false, false, 0, std::move(options)),
10859+
std::move(query));
1083810860
});
1083910861
return td::Status::OK();
1084010862
}
@@ -10890,8 +10912,9 @@ td::Status Client::process_forward_message_query(PromisedQueryPtr &query) {
1089010912

1089110913
check_message(from_chat_id, message_id, false, AccessRights::Read, "message to forward", std::move(query),
1089210914
[this](int64 from_chat_id, int64 message_id, PromisedQueryPtr query) {
10893-
do_send_message(make_object<td_api::inputMessageForwarded>(from_chat_id, message_id, false, nullptr),
10894-
std::move(query));
10915+
do_send_message(
10916+
make_object<td_api::inputMessageForwarded>(from_chat_id, message_id, false, false, 0, nullptr),
10917+
std::move(query));
1089510918
});
1089610919
return td::Status::OK();
1089710920
}
@@ -11394,7 +11417,8 @@ td::Status Client::process_send_gift_query(PromisedQueryPtr &query) {
1139411417
get_input_entities(query.get(), "text_entities")));
1139511418
check_user(user_id, std::move(query),
1139611419
[this, gift_id, pay_for_upgrade, user_id, text = std::move(text)](PromisedQueryPtr query) mutable {
11397-
send_request(make_object<td_api::sendGift>(gift_id, user_id, std::move(text), false, pay_for_upgrade),
11420+
send_request(make_object<td_api::sendGift>(gift_id, make_object<td_api::messageSenderUser>(user_id),
11421+
std::move(text), false, pay_for_upgrade),
1139811422
td::make_unique<TdOnOkQueryCallback>(std::move(query)));
1139911423
});
1140011424
return td::Status::OK();
@@ -11718,12 +11742,14 @@ td::Status Client::process_set_user_emoji_status_query(PromisedQueryPtr &query)
1171811742
check_user(
1171911743
user_id, std::move(query),
1172011744
[this, user_id, emoji_status_custom_emoji_id, emoji_status_expiration_date](PromisedQueryPtr query) mutable {
11721-
send_request(make_object<td_api::setUserEmojiStatus>(
11722-
user_id, emoji_status_custom_emoji_id == 0
11723-
? nullptr
11724-
: make_object<td_api::emojiStatus>(emoji_status_custom_emoji_id,
11725-
emoji_status_expiration_date)),
11726-
td::make_unique<TdOnOkQueryCallback>(std::move(query)));
11745+
send_request(
11746+
make_object<td_api::setUserEmojiStatus>(
11747+
user_id, emoji_status_custom_emoji_id == 0
11748+
? nullptr
11749+
: make_object<td_api::emojiStatus>(
11750+
make_object<td_api::emojiStatusTypeCustomEmoji>(emoji_status_custom_emoji_id),
11751+
emoji_status_expiration_date)),
11752+
td::make_unique<TdOnOkQueryCallback>(std::move(query)));
1172711753
});
1172811754
return td::Status::OK();
1172911755
}

0 commit comments

Comments
 (0)