From 2cd12d504922ad7bf8aa729744dc478e5bcb63dd Mon Sep 17 00:00:00 2001 From: levlam Date: Sun, 11 Feb 2018 19:43:58 +0300 Subject: [PATCH] Add source to get_message_entities. GitOrigin-RevId: af699950241416adb082a08a8f6c4e106f0fb24d --- td/telegram/InlineQueriesManager.cpp | 3 ++- td/telegram/MessageEntity.cpp | 12 +++++++----- td/telegram/MessageEntity.h | 3 ++- td/telegram/MessagesManager.cpp | 4 ++-- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/td/telegram/InlineQueriesManager.cpp b/td/telegram/InlineQueriesManager.cpp index f0c2c8a2..403e33b8 100644 --- a/td/telegram/InlineQueriesManager.cpp +++ b/td/telegram/InlineQueriesManager.cpp @@ -330,7 +330,8 @@ bool InlineQueriesManager::register_inline_message_content( switch (inline_message->get_id()) { case telegram_api::botInlineMessageText::ID: { auto inline_message_text = move_tl_object_as(inline_message); - auto entities = get_message_entities(td_->contacts_manager_.get(), std::move(inline_message_text->entities_)); + auto entities = get_message_entities(td_->contacts_manager_.get(), std::move(inline_message_text->entities_), + "botInlineMessageText"); auto status = MessagesManager::fix_text_message(inline_message_text->message_, entities, false, true, true, false); if (status.is_error()) { diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp index 3a50e195..51016644 100644 --- a/td/telegram/MessageEntity.cpp +++ b/td/telegram/MessageEntity.cpp @@ -1641,7 +1641,8 @@ Result> get_message_entities(const ContactsManager *contac } vector get_message_entities(const ContactsManager *contacts_manager, - vector> &&server_entities) { + vector> &&server_entities, + const char *source) { vector entities; entities.reserve(server_entities.size()); for (auto &entity : server_entities) { @@ -1704,7 +1705,8 @@ vector get_message_entities(const ContactsManager *contacts_manag auto entity_text_url = static_cast(entity.get()); auto r_http_url = parse_url(entity_text_url->url_); if (r_http_url.is_error()) { - LOG(ERROR) << "Wrong URL entity: \"" << entity_text_url->url_ << "\": " << r_http_url.error().message(); + LOG(ERROR) << "Wrong URL entity: \"" << entity_text_url->url_ << "\": " << r_http_url.error().message() + << " from " << source; continue; } entities.emplace_back(MessageEntity::Type::TextUrl, entity_text_url->offset_, entity_text_url->length_, @@ -1715,15 +1717,15 @@ vector get_message_entities(const ContactsManager *contacts_manag auto entity_mention_name = static_cast(entity.get()); UserId user_id(entity_mention_name->user_id_); if (!user_id.is_valid()) { - LOG(ERROR) << "Receive invalid " << user_id << " in MentionName"; + LOG(ERROR) << "Receive invalid " << user_id << " in MentionName from " << source; continue; } if (!contacts_manager->have_user(user_id)) { - LOG(ERROR) << "Receive unknown " << user_id << " in MentionName"; + LOG(ERROR) << "Receive unknown " << user_id << " in MentionName from " << source; continue; } if (!contacts_manager->have_input_user(user_id)) { - LOG(ERROR) << "Receive unaccessible " << user_id << " in MentionName"; + LOG(ERROR) << "Receive unaccessible " << user_id << " in MentionName from " << source; continue; } entities.emplace_back(entity_mention_name->offset_, entity_mention_name->length_, user_id); diff --git a/td/telegram/MessageEntity.h b/td/telegram/MessageEntity.h index 4e203405..64ec6600 100644 --- a/td/telegram/MessageEntity.h +++ b/td/telegram/MessageEntity.h @@ -166,7 +166,8 @@ vector> get_input_secret_message_entiti const vector &entities); vector get_message_entities(const ContactsManager *contacts_manager, - vector> &&server_entities); + vector> &&server_entities, + const char *source); vector get_message_entities(vector> &&secret_entities); diff --git a/td/telegram/MessagesManager.cpp b/td/telegram/MessagesManager.cpp index d633bb1d..36636f54 100644 --- a/td/telegram/MessagesManager.cpp +++ b/td/telegram/MessagesManager.cpp @@ -12333,7 +12333,7 @@ unique_ptr MessagesManager::get_draft_message( } } - auto entities = get_message_entities(contacts_manager, std::move(draft->entities_)); + auto entities = get_message_entities(contacts_manager, std::move(draft->entities_), "draftMessage"); auto status = fix_text_message(draft->message_, entities, true, true, true, true); if (status.is_error()) { LOG(ERROR) << "Receive error " << status << " while parsing draft " << draft->message_; @@ -19944,7 +19944,7 @@ FormattedText MessagesManager::get_secret_media_caption(string &&message_text, s FormattedText MessagesManager::get_message_text(string message_text, vector> &&server_entities, int32 send_date) const { - auto entities = get_message_entities(td_->contacts_manager_.get(), std::move(server_entities)); + auto entities = get_message_entities(td_->contacts_manager_.get(), std::move(server_entities), "get_message_text"); auto status = fix_text_message(message_text, entities, true, true, true, false); if (status.is_error()) { if (send_date == 0 || send_date > 1497000000) { // approximate fix date