From ff51282a50f195d2f3e3a457342332222010dc39 Mon Sep 17 00:00:00 2001 From: levlam Date: Thu, 5 Dec 2019 15:53:22 +0300 Subject: [PATCH] Remove textEntityTypeBlockQuote from public API. GitOrigin-RevId: aa718d3c4882e6ce29545e83a6cca8168c66d35a --- td/generate/scheme/td_api.tl | 5 +---- td/generate/scheme/td_api.tlo | Bin 165156 -> 165088 bytes td/telegram/MessageEntity.cpp | 10 +++++----- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl index 38661450..faf76551 100644 --- a/td/generate/scheme/td_api.tl +++ b/td/generate/scheme/td_api.tl @@ -70,7 +70,7 @@ textEntity offset:int32 length:int32 type:TextEntityType = TextEntity; textEntities entities:vector = TextEntities; //@description A text with some entities @text The text @entities Entities contained in the text. Entities can be nested, but must not mutually intersect each other. -//-Pre, Code and PreCode entities can't contain other entities. Bold, Italic, Underline, Strikethrough and BlockQuote entities can contain and to be contained in any other entities. All other entities can't contain each other +//-Pre, Code and PreCode entities can't contain other entities. Bold, Italic, Underline and Strikethrough entities can contain and to be contained in any other entities. All other entities can't contain each other formattedText text:string entities:vector = FormattedText; @@ -1457,9 +1457,6 @@ textEntityTypeUnderline = TextEntityType; //@description A strike-through text textEntityTypeStrikethrough = TextEntityType; -//@description A block quote; this entity can't be sent for now -textEntityTypeBlockQuote = TextEntityType; - //@description Text that must be formatted as if inside a code HTML tag textEntityTypeCode = TextEntityType; diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo index e9bab17499f29397ad6dd503494687a4d7193926..307d1dde8a6748f6d6c5af7fdd9e756537c65536 100644 GIT binary patch delta 512 zcmZ3|#r2?*Yr_LI(Z@4X7xIOqR+PBrm1LGwhEx`$G6+l#WEJ1cqprfj^q;BONPD}H zHsi8L7Ld~EcUl;2BtWd2$Ao+sfS|~kO^3s_?I2jzpp{Vrw`>7k*$u6XI=JT{u zW?UA@0#Z8tP79-r1c-I>n2-+x5EMDH>2TP#9R$l7v@&YomMy?5yP=g)2e;lYt&A$T zWewW!=`F!4yQ2-C$zR&=`N*UlpKM7xqfQL2umXi02waupiaBARaYUj7B@&!+@{_Xz zOY=)ofogD>F?~lnUbo|wHRxc};DnjXIDMiJqdp{xrvN3utjP MessageEntity::get_text_entity_type_object case MessageEntity::Type::Strikethrough: return make_tl_object(); case MessageEntity::Type::BlockQuote: - return make_tl_object(); + return nullptr; case MessageEntity::Type::Code: return make_tl_object(); case MessageEntity::Type::Pre: @@ -134,7 +134,10 @@ vector> get_text_entities_object(const vector< result.reserve(entities.size()); for (auto &entity : entities) { - result.push_back(entity.get_text_entity_object()); + auto entity_object = entity.get_text_entity_object(); + if (entity_object->type_ != nullptr) { + result.push_back(std::move(entity_object)); + } } return result; @@ -2096,9 +2099,6 @@ Result> get_message_entities(const ContactsManager *contac case td_api::textEntityTypeStrikethrough::ID: entities.emplace_back(MessageEntity::Type::Strikethrough, entity->offset_, entity->length_); break; - case td_api::textEntityTypeBlockQuote::ID: - // entities.emplace_back(MessageEntity::Type::BlockQuote, entity->offset_, entity->length_); - break; case td_api::textEntityTypeCode::ID: entities.emplace_back(MessageEntity::Type::Code, entity->offset_, entity->length_); break;