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

Simplify get_message_content/get_secret_message_content implementation.

Browse Source 
GitOrigin-RevId: 833a59386271a665050c57b5737a12bd2e336f97
This commit is contained in:
levlam 2020-02-25 00:06:29 +03:00
parent 81d0172f33
commit 182caecccc
1 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
td/telegram/MessageContent.cpp
View File

@ -3484,18 +3484,7 @@ unique_ptr<MessageContent> get_secret_message_content(
entities.clear(); entities.clear();
} }
if (media == nullptr) { int32 constructor_id = media == nullptr ? secret_api::decryptedMessageMediaEmpty::ID : media->get_id();
return create_text_message_content(std::move(message_text), std::move(entities), WebPageId());
}
int32 constructor_id = media->get_id();
if (message_text.size()) {
if (constructor_id != secret_api::decryptedMessageMediaEmpty::ID) {
LOG(INFO) << "Receive non-empty message text and media";
} else {
return create_text_message_content(std::move(message_text), std::move(entities), WebPageId());
}
}
// support of old layer and old constructions // support of old layer and old constructions
switch (constructor_id) { switch (constructor_id) {
@ -3516,7 +3505,9 @@ unique_ptr<MessageContent> get_secret_message_content(
bool is_media_empty = false; bool is_media_empty = false;
switch (constructor_id) { switch (constructor_id) {
case secret_api::decryptedMessageMediaEmpty::ID: case secret_api::decryptedMessageMediaEmpty::ID:
LOG(ERROR) << "Receive empty message text and media"; if (message_text.empty()) {
LOG(ERROR) << "Receive empty message text and media";
}
is_media_empty = true; is_media_empty = true;
break; break;
case secret_api::decryptedMessageMediaGeoPoint::ID: { case secret_api::decryptedMessageMediaGeoPoint::ID: {
@ -3639,21 +3630,12 @@ unique_ptr<MessageContent> get_message_content(Td *td, FormattedText message,
tl_object_ptr<telegram_api::MessageMedia> &&media, tl_object_ptr<telegram_api::MessageMedia> &&media,
DialogId owner_dialog_id, bool is_content_read, UserId via_bot_user_id, DialogId owner_dialog_id, bool is_content_read, UserId via_bot_user_id,
int32 *ttl) { int32 *ttl) {
if (media == nullptr) { int32 constructor_id = media == nullptr ? telegram_api::messageMediaEmpty::ID : media->get_id();
return make_unique<MessageText>(std::move(message), WebPageId());
}
int32 constructor_id = media->get_id();
if (message.text.size()) {
if (constructor_id != telegram_api::messageMediaEmpty::ID) {
LOG(INFO) << "Receive non-empty message text and media for message from " << owner_dialog_id;
} else {
return make_unique<MessageText>(std::move(message), WebPageId());
}
}
switch (constructor_id) { switch (constructor_id) {
case telegram_api::messageMediaEmpty::ID: case telegram_api::messageMediaEmpty::ID:
LOG(ERROR) << "Receive empty message text and media for message from " << owner_dialog_id; if (message.text.empty()) {
LOG(ERROR) << "Receive empty message text and media for message from " << owner_dialog_id;
}
return make_unique<MessageText>(std::move(message), WebPageId()); return make_unique<MessageText>(std::move(message), WebPageId());
case telegram_api::messageMediaPhoto::ID: { case telegram_api::messageMediaPhoto::ID: {
auto message_photo = move_tl_object_as<telegram_api::messageMediaPhoto>(media); auto message_photo = move_tl_object_as<telegram_api::messageMediaPhoto>(media);