From 31b348e108dbc19b2e3377a1cc8319d287fb6e25 Mon Sep 17 00:00:00 2001 From: levlam Date: Wed, 15 May 2024 17:33:56 +0300 Subject: [PATCH] Move extract_input_caption to MessageContent.cpp. --- td/telegram/MessageContent.cpp | 32 ++++++++++++++++++++++++++++++++ td/telegram/MessageContent.h | 3 +++ td/telegram/MessageEntity.cpp | 32 -------------------------------- td/telegram/MessageEntity.h | 3 --- 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/td/telegram/MessageContent.cpp b/td/telegram/MessageContent.cpp index a08c31c58..969db54ae 100644 --- a/td/telegram/MessageContent.cpp +++ b/td/telegram/MessageContent.cpp @@ -2595,6 +2595,38 @@ unique_ptr create_chat_set_ttl_message_content(int32 ttl, UserId return make_unique(ttl, from_user_id); } +td_api::object_ptr extract_input_caption( + td_api::object_ptr &input_message_content) { + switch (input_message_content->get_id()) { + case td_api::inputMessageAnimation::ID: { + auto input_animation = static_cast(input_message_content.get()); + return std::move(input_animation->caption_); + } + case td_api::inputMessageAudio::ID: { + auto input_audio = static_cast(input_message_content.get()); + return std::move(input_audio->caption_); + } + case td_api::inputMessageDocument::ID: { + auto input_document = static_cast(input_message_content.get()); + return std::move(input_document->caption_); + } + case td_api::inputMessagePhoto::ID: { + auto input_photo = static_cast(input_message_content.get()); + return std::move(input_photo->caption_); + } + case td_api::inputMessageVideo::ID: { + auto input_video = static_cast(input_message_content.get()); + return std::move(input_video->caption_); + } + case td_api::inputMessageVoiceNote::ID: { + auto input_voice_note = static_cast(input_message_content.get()); + return std::move(input_voice_note->caption_); + } + default: + return nullptr; + } +} + static Result create_input_message_content( DialogId dialog_id, tl_object_ptr &&input_message_content, Td *td, FormattedText caption, FileId file_id, PhotoSize thumbnail, vector sticker_file_ids, bool is_premium) { diff --git a/td/telegram/MessageContent.h b/td/telegram/MessageContent.h index c99c41967..8cee533bf 100644 --- a/td/telegram/MessageContent.h +++ b/td/telegram/MessageContent.h @@ -110,6 +110,9 @@ unique_ptr create_screenshot_taken_message_content(); unique_ptr create_chat_set_ttl_message_content(int32 ttl, UserId from_user_id); +td_api::object_ptr extract_input_caption( + td_api::object_ptr &input_message_content); + Result get_input_message_content( DialogId dialog_id, tl_object_ptr &&input_message_content, Td *td, bool is_premium); diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp index 7b54a4756..d4cd89957 100644 --- a/td/telegram/MessageEntity.cpp +++ b/td/telegram/MessageEntity.cpp @@ -4472,38 +4472,6 @@ void truncate_formatted_text(FormattedText &text, size_t length) { remove_empty_entities(text.entities); } -td_api::object_ptr extract_input_caption( - tl_object_ptr &input_message_content) { - switch (input_message_content->get_id()) { - case td_api::inputMessageAnimation::ID: { - auto input_animation = static_cast(input_message_content.get()); - return std::move(input_animation->caption_); - } - case td_api::inputMessageAudio::ID: { - auto input_audio = static_cast(input_message_content.get()); - return std::move(input_audio->caption_); - } - case td_api::inputMessageDocument::ID: { - auto input_document = static_cast(input_message_content.get()); - return std::move(input_document->caption_); - } - case td_api::inputMessagePhoto::ID: { - auto input_photo = static_cast(input_message_content.get()); - return std::move(input_photo->caption_); - } - case td_api::inputMessageVideo::ID: { - auto input_video = static_cast(input_message_content.get()); - return std::move(input_video->caption_); - } - case td_api::inputMessageVoiceNote::ID: { - auto input_voice_note = static_cast(input_message_content.get()); - return std::move(input_voice_note->caption_); - } - default: - return nullptr; - } -} - Result get_formatted_text(const Td *td, DialogId dialog_id, td_api::object_ptr &&text, bool is_bot, bool allow_empty, bool skip_media_timestamps, bool skip_trim, diff --git a/td/telegram/MessageEntity.h b/td/telegram/MessageEntity.h index 2ed383cf8..b9f171ed7 100644 --- a/td/telegram/MessageEntity.h +++ b/td/telegram/MessageEntity.h @@ -237,9 +237,6 @@ FormattedText get_message_text(const UserManager *user_manager, string message_t void truncate_formatted_text(FormattedText &text, size_t length); -td_api::object_ptr extract_input_caption( - tl_object_ptr &input_message_content); - Result get_formatted_text(const Td *td, DialogId dialog_id, td_api::object_ptr &&text, bool is_bot, bool allow_empty, bool skip_media_timestamps, bool skip_trim,