tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move caption out of ExtendedMedia.

Browse Source
This commit is contained in:
levlam 2024-06-20 19:01:21 +03:00
parent babcde8c76
commit 5cb008b58d
4 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/generate/scheme/td_api.tl
View File

@ -2790,17 +2790,16 @@ inputInvoiceTelegram purpose:TelegramPaymentPurpose = InputInvoice;
//@height Media height; 0 if unknown //@height Media height; 0 if unknown
//@duration Media duration, in seconds; 0 if unknown //@duration Media duration, in seconds; 0 if unknown
//@minithumbnail Media minithumbnail; may be null //@minithumbnail Media minithumbnail; may be null
//@caption Media caption messageExtendedMediaPreview width:int32 height:int32 duration:int32 minithumbnail:minithumbnail = MessageExtendedMedia;
messageExtendedMediaPreview width:int32 height:int32 duration:int32 minithumbnail:minithumbnail caption:formattedText = MessageExtendedMedia;
//@description The media is a photo @photo The photo @caption Photo caption //@description The media is a photo @photo The photo
messageExtendedMediaPhoto photo:photo caption:formattedText = MessageExtendedMedia; messageExtendedMediaPhoto photo:photo = MessageExtendedMedia;
//@description The media is a video @video The video @caption Photo caption //@description The media is a video @video The video
messageExtendedMediaVideo video:video caption:formattedText = MessageExtendedMedia; messageExtendedMediaVideo video:video = MessageExtendedMedia;
//@description The media is unsupported @caption Media caption //@description The media is unsupported
messageExtendedMediaUnsupported caption:formattedText = MessageExtendedMedia; messageExtendedMediaUnsupported = MessageExtendedMedia;
//@description Describes parameters of a Telegram Premium giveaway //@description Describes parameters of a Telegram Premium giveaway
@ -3200,8 +3199,9 @@ messageStory story_sender_chat_id:int53 story_id:int32 via_mention:Bool = Messag
//@is_test True, if the invoice is a test invoice //@is_test True, if the invoice is a test invoice
//@need_shipping_address True, if the shipping address must be specified //@need_shipping_address True, if the shipping address must be specified
//@receipt_message_id The identifier of the message with the receipt, after the product has been purchased //@receipt_message_id The identifier of the message with the receipt, after the product has been purchased
//@extended_media Extended media attached to the invoice; may be null //@extended_media Extended media attached to the invoice; may be null if none
messageInvoice product_info:productInfo currency:string total_amount:int53 start_parameter:string is_test:Bool need_shipping_address:Bool receipt_message_id:int53 extended_media:MessageExtendedMedia = MessageContent; //@extended_media_caption Extended media caption; may be null if none
messageInvoice product_info:productInfo currency:string total_amount:int53 start_parameter:string is_test:Bool need_shipping_address:Bool receipt_message_id:int53 extended_media:MessageExtendedMedia extended_media_caption:formattedText = MessageContent;
//@description A message with information about an ended call @is_video True, if the call was a video call @discard_reason Reason why the call was discarded @duration Call duration, in seconds //@description A message with information about an ended call @is_video True, if the call was a video call @discard_reason Reason why the call was discarded @duration Call duration, in seconds
messageCall is_video:Bool discard_reason:CallDiscardReason duration:int32 = MessageContent; messageCall is_video:Bool discard_reason:CallDiscardReason duration:int32 = MessageContent;

3
td/telegram/InputInvoice.cpp
View File

@ -242,7 +242,8 @@ tl_object_ptr<td_api::messageInvoice> InputInvoice::get_message_invoice_object(T
return make_tl_object<td_api::messageInvoice>( return make_tl_object<td_api::messageInvoice>(
get_product_info_object(td, title_, description_, photo_), invoice_.currency_, total_amount_, start_parameter_, get_product_info_object(td, title_, description_, photo_), invoice_.currency_, total_amount_, start_parameter_,
invoice_.is_test_, invoice_.need_shipping_address_, receipt_message_id_.get(), invoice_.is_test_, invoice_.need_shipping_address_, receipt_message_id_.get(),
extended_media_.get_message_extended_media_object(td, skip_bot_commands, max_media_timestamp)); extended_media_.get_message_extended_media_object(td),
extended_media_.get_caption_object(skip_bot_commands, max_media_timestamp));
} }
tl_object_ptr<telegram_api::invoice> InputInvoice::Invoice::get_input_invoice() const { tl_object_ptr<telegram_api::invoice> InputInvoice::Invoice::get_input_invoice() const {

21
td/telegram/MessageExtendedMedia.cpp
View File

@ -152,34 +152,39 @@ bool MessageExtendedMedia::update_to(Td *td,
return false; return false;
} }
td_api::object_ptr<td_api::MessageExtendedMedia> MessageExtendedMedia::get_message_extended_media_object( td_api::object_ptr<td_api::MessageExtendedMedia> MessageExtendedMedia::get_message_extended_media_object(Td *td) const {
Td *td, bool skip_bot_commands, int32 max_media_timestamp) const {
if (type_ == Type::Empty) { if (type_ == Type::Empty) {
return nullptr; return nullptr;
} }
auto caption = get_formatted_text_object(caption_, skip_bot_commands, max_media_timestamp);
switch (type_) { switch (type_) {
case Type::Unsupported: case Type::Unsupported:
return td_api::make_object<td_api::messageExtendedMediaUnsupported>(std::move(caption)); return td_api::make_object<td_api::messageExtendedMediaUnsupported>();
case Type::Preview: case Type::Preview:
return td_api::make_object<td_api::messageExtendedMediaPreview>(dimensions_.width, dimensions_.height, duration_, return td_api::make_object<td_api::messageExtendedMediaPreview>(dimensions_.width, dimensions_.height, duration_,
get_minithumbnail_object(minithumbnail_), get_minithumbnail_object(minithumbnail_));
std::move(caption));
case Type::Photo: { case Type::Photo: {
auto photo = get_photo_object(td->file_manager_.get(), photo_); auto photo = get_photo_object(td->file_manager_.get(), photo_);
CHECK(photo != nullptr); CHECK(photo != nullptr);
return td_api::make_object<td_api::messageExtendedMediaPhoto>(std::move(photo), std::move(caption)); return td_api::make_object<td_api::messageExtendedMediaPhoto>(std::move(photo));
} }
case Type::Video: case Type::Video:
return td_api::make_object<td_api::messageExtendedMediaVideo>( return td_api::make_object<td_api::messageExtendedMediaVideo>(
td->videos_manager_->get_video_object(video_file_id_), std::move(caption)); td->videos_manager_->get_video_object(video_file_id_));
default: default:
UNREACHABLE(); UNREACHABLE();
return nullptr; return nullptr;
} }
} }
td_api::object_ptr<td_api::formattedText> MessageExtendedMedia::get_caption_object(bool skip_bot_commands,
int32 max_media_timestamp) const {
if (type_ == Type::Empty) {
return nullptr;
}
return get_formatted_text_object(caption_, skip_bot_commands, max_media_timestamp);
}
void MessageExtendedMedia::append_file_ids(const Td *td, vector<FileId> &file_ids) const { void MessageExtendedMedia::append_file_ids(const Td *td, vector<FileId> &file_ids) const {
switch (type_) { switch (type_) {
case Type::Empty: case Type::Empty:

5
td/telegram/MessageExtendedMedia.h
View File

@ -67,8 +67,9 @@ class MessageExtendedMedia {
bool update_to(Td *td, telegram_api::object_ptr<telegram_api::MessageExtendedMedia> extended_media_ptr, bool update_to(Td *td, telegram_api::object_ptr<telegram_api::MessageExtendedMedia> extended_media_ptr,
DialogId owner_dialog_id); DialogId owner_dialog_id);
td_api::object_ptr<td_api::MessageExtendedMedia> get_message_extended_media_object(Td *td, bool skip_bot_commands, td_api::object_ptr<td_api::MessageExtendedMedia> get_message_extended_media_object(Td *td) const;
int32 max_media_timestamp) const;
td_api::object_ptr<td_api::formattedText> get_caption_object(bool skip_bot_commands, int32 max_media_timestamp) const;
void append_file_ids(const Td *td, vector<FileId> &file_ids) const; void append_file_ids(const Td *td, vector<FileId> &file_ids) const;