andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Add MessagesManager::create_input_message_content.

Browse Source 
GitOrigin-RevId: e230e6c6069777e05dde34230492981846064646
This commit is contained in:
levlam 2018-09-28 16:59:29 +03:00
parent 99862b4834
commit bfde2f0e32
2 changed files with 85 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
td/telegram/MessagesManager.cpp
View File

@ -16948,21 +16948,20 @@ Result<MessageId> MessagesManager::send_message(DialogId dialog_id, MessageId re
return message_id; return message_id;
} }
Result<MessagesManager::InputMessageContent> MessagesManager::process_input_message_content( Result<InputMessageContent> MessagesManager::process_input_message_content(
DialogId dialog_id, tl_object_ptr<td_api::InputMessageContent> &&input_message_content) const { DialogId dialog_id, tl_object_ptr<td_api::InputMessageContent> &&input_message_content) const {
if (input_message_content == nullptr) { if (input_message_content == nullptr) {
return Status::Error(5, "Can't send message without content"); return Status::Error(5, "Can't send message without content");
} }
bool is_secret = dialog_id.get_type() == DialogType::SecretChat; bool is_secret = dialog_id.get_type() == DialogType::SecretChat;
int32 message_type = input_message_content->get_id();
bool have_file = true; bool have_file = true;
// TODO: send from secret chat to common // TODO: send from secret chat to common
Result<FileId> r_file_id = Status::Error(500, "Have no file"); Result<FileId> r_file_id = Status::Error(500, "Have no file");
tl_object_ptr<td_api::inputThumbnail> input_thumbnail; tl_object_ptr<td_api::inputThumbnail> input_thumbnail;
vector<FileId> sticker_file_ids; vector<FileId> sticker_file_ids;
switch (message_type) { switch (input_message_content->get_id()) {
case td_api::inputMessageAnimation::ID: { case td_api::inputMessageAnimation::ID: {
auto input_message = static_cast<td_api::inputMessageAnimation *>(input_message_content.get()); auto input_message = static_cast<td_api::inputMessageAnimation *>(input_message_content.get());
r_file_id = td_->file_manager_->get_input_file_id(FileType::Animation, input_message->animation_, dialog_id, r_file_id = td_->file_manager_->get_input_file_id(FileType::Animation, input_message->animation_, dialog_id,
@ -17033,23 +17032,14 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
// TODO is path of files must be stored in bytes instead of UTF-8 string? // TODO is path of files must be stored in bytes instead of UTF-8 string?
FileId file_id; FileId file_id;
FileView file_view;
string file_name;
string mime_type;
if (have_file) { if (have_file) {
if (r_file_id.is_error()) { if (r_file_id.is_error()) {
return Status::Error(7, r_file_id.error().message()); return Status::Error(7, r_file_id.error().message());
} }
file_id = r_file_id.ok(); file_id = r_file_id.ok();
CHECK(file_id.is_valid()); CHECK(file_id.is_valid());
file_view = td_->file_manager_->get_file_view(file_id);
auto suggested_name = file_view.suggested_name();
const PathView path_view(suggested_name);
file_name = path_view.file_name().str();
mime_type = MimeType::from_extension(path_view.extension());
} }
FileId thumbnail_file_id;
PhotoSize thumbnail; PhotoSize thumbnail;
if (input_thumbnail != nullptr) { if (input_thumbnail != nullptr) {
auto r_thumbnail_file_id = auto r_thumbnail_file_id =
@ -17057,21 +17047,51 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
if (r_thumbnail_file_id.is_error()) { if (r_thumbnail_file_id.is_error()) {
LOG(WARNING) << "Ignore thumbnail file: " << r_thumbnail_file_id.error().message(); LOG(WARNING) << "Ignore thumbnail file: " << r_thumbnail_file_id.error().message();
} else { } else {
thumbnail_file_id = r_thumbnail_file_id.ok();
CHECK(thumbnail_file_id.is_valid());
thumbnail.type = 't'; thumbnail.type = 't';
thumbnail.dimensions = get_dimensions(input_thumbnail->width_, input_thumbnail->height_); thumbnail.dimensions = get_dimensions(input_thumbnail->width_, input_thumbnail->height_);
thumbnail.file_id = thumbnail_file_id; thumbnail.file_id = r_thumbnail_file_id.ok();
CHECK(thumbnail.file_id.is_valid());
FileView thumbnail_file_view = td_->file_manager_->get_file_view(thumbnail_file_id); FileView thumbnail_file_view = td_->file_manager_->get_file_view(thumbnail.file_id);
if (thumbnail_file_view.has_remote_location()) { if (thumbnail_file_view.has_remote_location()) {
// TODO td->file_manager_->delete_remote_location(thumbnail_file_id); // TODO td->file_manager_->delete_remote_location(thumbnail.file_id);
} }
} }
} }
LOG(INFO) << "Send file " << file_id << " and thumbnail " << thumbnail_file_id; TRY_RESULT(content, create_input_message_content(dialog_id, std::move(input_message_content), td_, file_id,
std::move(thumbnail), std::move(sticker_file_ids)));
if (content.ttl < 0 || content.ttl > MAX_PRIVATE_MESSAGE_TTL) {
return Status::Error(10, "Wrong message TTL specified");
}
if (content.ttl > 0 && dialog_id.get_type() != DialogType::User) {
return Status::Error(10, "Message TTL can be specified only in private chats");
}
if (dialog_id != DialogId()) {
TRY_STATUS(can_send_message_content(dialog_id, content.content.get(), false));
}
return std::move(content);
}
Result<InputMessageContent> MessagesManager::create_input_message_content(
DialogId dialog_id, tl_object_ptr<td_api::InputMessageContent> &&input_message_content, Td *td, FileId file_id,
PhotoSize thumbnail, vector<FileId> sticker_file_ids) const {
CHECK(input_message_content != nullptr);
LOG(INFO) << "Create InputMessageContent with file " << file_id << " and thumbnail " << thumbnail.file_id;
FileView file_view;
string file_name;
string mime_type;
if (file_id.is_valid()) {
file_view = td->file_manager_->get_file_view(file_id);
auto suggested_name = file_view.suggested_name();
const PathView path_view(suggested_name);
file_name = path_view.file_name().str();
mime_type = MimeType::from_extension(path_view.extension());
}
bool disable_web_page_preview = false; bool disable_web_page_preview = false;
bool clear_draft = false; bool clear_draft = false;
@ -17079,17 +17099,18 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
UserId via_bot_user_id; UserId via_bot_user_id;
int32 ttl = 0; int32 ttl = 0;
bool is_bot = td_->auth_manager_->is_bot(); bool is_bot = td_->auth_manager_->is_bot();
switch (message_type) { switch (input_message_content->get_id()) {
case td_api::inputMessageText::ID: { case td_api::inputMessageText::ID: {
TRY_RESULT(input_message_text, process_input_message_text(dialog_id, std::move(input_message_content), is_bot)); TRY_RESULT(input_message_text, process_input_message_text(dialog_id, std::move(input_message_content), is_bot));
disable_web_page_preview = input_message_text.disable_web_page_preview; disable_web_page_preview = input_message_text.disable_web_page_preview;
clear_draft = input_message_text.clear_draft; clear_draft = input_message_text.clear_draft;
WebPageId web_page_id; WebPageId web_page_id;
if (!td_->auth_manager_->is_bot() && !disable_web_page_preview && bool can_add_web_page_previews =
(dialog_id.get_type() != DialogType::Channel || dialog_id.get_type() != DialogType::Channel ||
td_->contacts_manager_->get_channel_status(dialog_id.get_channel_id()).can_add_web_page_previews())) { td->contacts_manager_->get_channel_status(dialog_id.get_channel_id()).can_add_web_page_previews();
web_page_id = td_->web_pages_manager_->get_web_page_by_url( if (!is_bot && !disable_web_page_preview && can_add_web_page_previews) {
web_page_id = td->web_pages_manager_->get_web_page_by_url(
get_first_url(input_message_text.text.text, input_message_text.text.entities)); get_first_url(input_message_text.text.text, input_message_text.text.entities));
} }
content = make_unique<MessageText>(std::move(input_message_text.text), web_page_id); content = make_unique<MessageText>(std::move(input_message_text.text), web_page_id);
@ -17100,7 +17121,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_animation->caption_), is_bot)); TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_animation->caption_), is_bot));
td_->animations_manager_->create_animation( td->animations_manager_->create_animation(
file_id, thumbnail, std::move(file_name), std::move(mime_type), input_animation->duration_, file_id, thumbnail, std::move(file_name), std::move(mime_type), input_animation->duration_,
get_dimensions(input_animation->width_, input_animation->height_), false); get_dimensions(input_animation->width_, input_animation->height_), false);
@ -17118,7 +17139,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
} }
TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_audio->caption_), is_bot)); TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_audio->caption_), is_bot));
td_->audios_manager_->create_audio(file_id, thumbnail, std::move(file_name), std::move(mime_type), td->audios_manager_->create_audio(file_id, thumbnail, std::move(file_name), std::move(mime_type),
input_audio->duration_, std::move(input_audio->title_), input_audio->duration_, std::move(input_audio->title_),
std::move(input_audio->performer_), false); std::move(input_audio->performer_), false);
@ -17130,7 +17151,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_document->caption_), is_bot)); TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_document->caption_), is_bot));
td_->documents_manager_->create_document(file_id, thumbnail, std::move(file_name), std::move(mime_type), false); td->documents_manager_->create_document(file_id, thumbnail, std::move(file_name), std::move(mime_type), false);
content = make_unique<MessageDocument>(file_id, std::move(caption)); content = make_unique<MessageDocument>(file_id, std::move(caption));
break; break;
@ -17160,8 +17181,8 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
s.size = static_cast<int32>(file_view.size()); s.size = static_cast<int32>(file_view.size());
s.file_id = file_id; s.file_id = file_id;
if (thumbnail_file_id.is_valid()) { if (thumbnail.file_id.is_valid()) {
message_photo->photo.photos.push_back(thumbnail); message_photo->photo.photos.push_back(std::move(thumbnail));
} }
message_photo->photo.photos.push_back(s); message_photo->photo.photos.push_back(s);
@ -17176,7 +17197,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
} }
case td_api::inputMessageSticker::ID: { case td_api::inputMessageSticker::ID: {
auto input_sticker = static_cast<td_api::inputMessageSticker *>(input_message_content.get()); auto input_sticker = static_cast<td_api::inputMessageSticker *>(input_message_content.get());
td_->stickers_manager_->create_sticker( td->stickers_manager_->create_sticker(
file_id, thumbnail, get_dimensions(input_sticker->width_, input_sticker->height_), true, nullptr, nullptr); file_id, thumbnail, get_dimensions(input_sticker->width_, input_sticker->height_), true, nullptr, nullptr);
content = make_unique<MessageSticker>(file_id); content = make_unique<MessageSticker>(file_id);
@ -17189,7 +17210,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
ttl = input_video->ttl_; ttl = input_video->ttl_;
bool has_stickers = !sticker_file_ids.empty(); bool has_stickers = !sticker_file_ids.empty();
td_->videos_manager_->create_video(file_id, thumbnail, has_stickers, std::move(sticker_file_ids), td->videos_manager_->create_video(file_id, thumbnail, has_stickers, std::move(sticker_file_ids),
std::move(file_name), std::move(mime_type), input_video->duration_, std::move(file_name), std::move(mime_type), input_video->duration_,
get_dimensions(input_video->width_, input_video->height_), get_dimensions(input_video->width_, input_video->height_),
input_video->supports_streaming_, false); input_video->supports_streaming_, false);
@ -17205,7 +17226,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
return Status::Error(400, "Wrong video note length"); return Status::Error(400, "Wrong video note length");
} }
td_->video_notes_manager_->create_video_note(file_id, thumbnail, input_video_note->duration_, td->video_notes_manager_->create_video_note(file_id, thumbnail, input_video_note->duration_,
get_dimensions(length, length), false); get_dimensions(length, length), false);
content = make_unique<MessageVideoNote>(file_id, false); content = make_unique<MessageVideoNote>(file_id, false);
@ -17216,7 +17237,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_voice_note->caption_), is_bot)); TRY_RESULT(caption, process_input_caption(dialog_id, std::move(input_voice_note->caption_), is_bot));
td_->voice_notes_manager_->create_voice_note(file_id, std::move(mime_type), input_voice_note->duration_, td->voice_notes_manager_->create_voice_note(file_id, std::move(mime_type), input_voice_note->duration_,
std::move(input_voice_note->waveform_), false); std::move(input_voice_note->waveform_), false);
content = make_unique<MessageVoiceNote>(file_id, std::move(caption), false); content = make_unique<MessageVoiceNote>(file_id, std::move(caption), false);
@ -17242,9 +17263,9 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
break; break;
} }
case td_api::inputMessageGame::ID: { case td_api::inputMessageGame::ID: {
TRY_RESULT(game, process_input_message_game(td_->contacts_manager_.get(), std::move(input_message_content))); TRY_RESULT(game, process_input_message_game(td->contacts_manager_.get(), std::move(input_message_content)));
via_bot_user_id = game.get_bot_user_id(); via_bot_user_id = game.get_bot_user_id();
if (via_bot_user_id == td_->contacts_manager_->get_my_id("send_message")) { if (via_bot_user_id == td->contacts_manager_->get_my_id("send_message")) {
via_bot_user_id = UserId(); via_bot_user_id = UserId();
} }
@ -17291,7 +17312,7 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
message_invoice->photo.id = -2; message_invoice->photo.id = -2;
} else { } else {
auto url = r_http_url.ok().get_url(); auto url = r_http_url.ok().get_url();
auto r_invoice_file_id = td_->file_manager_->from_persistent_id(url, FileType::Temp); auto r_invoice_file_id = td->file_manager_->from_persistent_id(url, FileType::Temp);
if (r_invoice_file_id.is_error()) { if (r_invoice_file_id.is_error()) {
LOG(INFO) << "Can't register url " << url; LOG(INFO) << "Can't register url " << url;
message_invoice->photo.id = -2; message_invoice->photo.id = -2;
@ -17361,17 +17382,6 @@ Result<MessagesManager::InputMessageContent> MessagesManager::process_input_mess
default: default:
UNREACHABLE(); UNREACHABLE();
} }
if (ttl < 0 || ttl > MAX_PRIVATE_MESSAGE_TTL) {
return Status::Error(10, "Wrong message TTL specified");
}
if (ttl > 0 && dialog_id.get_type() != DialogType::User) {
return Status::Error(10, "Message TTL can be specified only in private chats");
}
if (dialog_id != DialogId()) {
TRY_STATUS(can_send_message_content(dialog_id, content.get(), false));
}
return InputMessageContent{std::move(content), disable_web_page_preview, clear_draft, ttl, via_bot_user_id}; return InputMessageContent{std::move(content), disable_web_page_preview, clear_draft, ttl, via_bot_user_id};
} }

38
td/telegram/MessagesManager.h
View File

@ -671,6 +671,23 @@ class MessagePassportDataReceived : public MessageContent {
} }
}; };
struct InputMessageContent {
unique_ptr<MessageContent> content;
bool disable_web_page_preview = false;
bool clear_draft = false;
int32 ttl = 0;
UserId via_bot_user_id;
InputMessageContent(unique_ptr<MessageContent> &&content, bool disable_web_page_preview, bool clear_draft, int32 ttl,
UserId via_bot_user_id)
: content(std::move(content))
, disable_web_page_preview(disable_web_page_preview)
, clear_draft(clear_draft)
, ttl(ttl)
, via_bot_user_id(via_bot_user_id) {
}
};
class InputMessageText { class InputMessageText {
public: public:
FormattedText text; FormattedText text;
@ -1869,23 +1886,6 @@ class MessagesManager : public Actor {
Promise<> success_promise; Promise<> success_promise;
}; };
struct InputMessageContent {
unique_ptr<MessageContent> content;
bool disable_web_page_preview = false;
bool clear_draft = false;
int32 ttl = 0;
UserId via_bot_user_id;
InputMessageContent(unique_ptr<MessageContent> &&content, bool disable_web_page_preview, bool clear_draft,
int32 ttl, UserId via_bot_user_id)
: content(std::move(content))
, disable_web_page_preview(disable_web_page_preview)
, clear_draft(clear_draft)
, ttl(ttl)
, via_bot_user_id(via_bot_user_id) {
}
};
class DeleteAllChannelMessagesFromUserOnServerLogEvent; class DeleteAllChannelMessagesFromUserOnServerLogEvent;
class DeleteDialogHistoryFromServerLogEvent; class DeleteDialogHistoryFromServerLogEvent;
class DeleteMessageLogEvent; class DeleteMessageLogEvent;
@ -1982,6 +1982,10 @@ class MessagesManager : public Actor {
Result<InputMessageContent> process_input_message_content( Result<InputMessageContent> process_input_message_content(
DialogId dialog_id, tl_object_ptr<td_api::InputMessageContent> &&input_message_content) const; DialogId dialog_id, tl_object_ptr<td_api::InputMessageContent> &&input_message_content) const;
Result<InputMessageContent> create_input_message_content(
DialogId dialog_id, tl_object_ptr<td_api::InputMessageContent> &&input_message_content, Td *td, FileId file_id,
PhotoSize thumbnail, vector<FileId> sticker_file_ids) const;
Message *get_message_to_send(Dialog *d, MessageId reply_to_message_id, bool disable_notification, Message *get_message_to_send(Dialog *d, MessageId reply_to_message_id, bool disable_notification,
bool from_background, unique_ptr<MessageContent> &&content, bool *need_update_dialog_pos, bool from_background, unique_ptr<MessageContent> &&content, bool *need_update_dialog_pos,
unique_ptr<MessageForwardInfo> forward_info = nullptr); unique_ptr<MessageForwardInfo> forward_info = nullptr);