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

Add force to get_input_media.

Browse Source 
GitOrigin-RevId: 4477e6cb08505aef269b5110e8ef4bbff04d0bd3
This commit is contained in:
levlam 2019-03-17 00:07:10 +03:00
parent e24278903b
commit 84878f9750
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/MessageContent.cpp
View File

@ -2204,10 +2204,10 @@ tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *co
return input_media; return input_media;
} }
tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *content, Td *td, int32 ttl) { tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *content, Td *td, int32 ttl, bool force) {
auto input_media = get_input_media(content, td, nullptr, nullptr, ttl); auto input_media = get_input_media(content, td, nullptr, nullptr, ttl);
auto file_reference = FileManager::extract_file_reference(input_media); auto file_reference = FileManager::extract_file_reference(input_media);
if (file_reference == FileReferenceView::invalid_file_reference()) { if (file_reference == FileReferenceView::invalid_file_reference() && !force) {
return nullptr; return nullptr;
} }
return input_media; return input_media;

2
td/telegram/MessageContent.h
View File

@ -149,7 +149,7 @@ tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *co
tl_object_ptr<telegram_api::InputFile> input_thumbnail, tl_object_ptr<telegram_api::InputFile> input_thumbnail,
FileId file_id, FileId thumbnail_file_id, int32 ttl); FileId file_id, FileId thumbnail_file_id, int32 ttl);
tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *content, Td *td, int32 ttl); tl_object_ptr<telegram_api::InputMedia> get_input_media(const MessageContent *content, Td *td, int32 ttl, bool force);
void delete_message_content_thumbnail(MessageContent *content, Td *td); void delete_message_content_thumbnail(MessageContent *content, Td *td);

10
td/telegram/MessagesManager.cpp
View File

@ -15754,7 +15754,7 @@ void MessagesManager::do_send_message(DialogId dialog_id, Message *m, vector<int
on_secret_message_media_uploaded(dialog_id, m, std::move(secret_input_media), file_id, thumbnail_file_id); on_secret_message_media_uploaded(dialog_id, m, std::move(secret_input_media), file_id, thumbnail_file_id);
} }
} else { } else {
auto input_media = get_input_media(content, td_, m->ttl); auto input_media = get_input_media(content, td_, m->ttl, false);
if (input_media == nullptr) { if (input_media == nullptr) {
if (content_type == MessageContentType::Photo) { if (content_type == MessageContentType::Photo) {
thumbnail_file_id = FileId(); thumbnail_file_id = FileId();
@ -15920,7 +15920,7 @@ void MessagesManager::on_upload_message_media_success(DialogId dialog_id, Messag
update_message_content(dialog_id, m, std::move(content), true, true, true); update_message_content(dialog_id, m, std::move(content), true, true, true);
auto input_media = get_input_media(m->content.get(), td_, m->ttl); auto input_media = get_input_media(m->content.get(), td_, m->ttl, true);
Status result; Status result;
if (input_media == nullptr) { if (input_media == nullptr) {
result = Status::Error(400, "Failed to upload file"); result = Status::Error(400, "Failed to upload file");
@ -16059,7 +16059,7 @@ void MessagesManager::do_send_message_group(int64 media_album_id) {
file_ids.push_back(get_message_content_file_id(m->content.get())); file_ids.push_back(get_message_content_file_id(m->content.get()));
random_ids.push_back(begin_send_message(dialog_id, m)); random_ids.push_back(begin_send_message(dialog_id, m));
const FormattedText *caption = get_message_content_caption(m->content.get()); const FormattedText *caption = get_message_content_caption(m->content.get());
auto input_media = get_input_media(m->content.get(), td_, m->ttl); auto input_media = get_input_media(m->content.get(), td_, m->ttl, true);
CHECK(input_media != nullptr); CHECK(input_media != nullptr);
auto entities = get_input_message_entities(td_->contacts_manager_.get(), caption, "do_send_message_group"); auto entities = get_input_message_entities(td_->contacts_manager_.get(), caption, "do_send_message_group");
int32 input_single_media_flags = 0; int32 input_single_media_flags = 0;
@ -17086,7 +17086,7 @@ void MessagesManager::edit_inline_message_media(const string &inline_message_id,
return promise.set_error(Status::Error(400, "Wrong inline message identifier specified")); return promise.set_error(Status::Error(400, "Wrong inline message identifier specified"));
} }
auto input_media = get_input_media(content.content.get(), td_, 0); auto input_media = get_input_media(content.content.get(), td_, 0, true);
if (input_media == nullptr) { if (input_media == nullptr) {
return promise.set_error(Status::Error(400, "Wrong message content specified")); return promise.set_error(Status::Error(400, "Wrong message content specified"));
} }
@ -18360,7 +18360,7 @@ vector<Notification> MessagesManager::get_message_notifications_from_database_fo
LOG_CHECK(m->notification_id.get() < from_notification_id.get()) LOG_CHECK(m->notification_id.get() < from_notification_id.get())
<< from_mentions << " " << d->dialog_id << " " << m->message_id << " " << m->notification_id << " " << from_mentions << " " << d->dialog_id << " " << m->message_id << " " << m->notification_id << " "
<< from_message_id << " " << from_notification_id << " " << group_info.group_id << " " << from_message_id << " " << from_notification_id << " " << group_info.group_id << " "
<< group_info.last_notification_date << " " << greoup_info.last_notification_id << " " << group_info.last_notification_date << " " << group_info.last_notification_id << " "
<< group_info.max_removed_notification_id; << group_info.max_removed_notification_id;
from_notification_id = m->notification_id; from_notification_id = m->notification_id;
from_message_id = m->message_id; from_message_id = m->message_id;