From 5a07029e6bc55d19fa0a32d60918133b49cc12c1 Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Thu, 3 Oct 2019 02:39:10 +0300
Subject: [PATCH] Add Markdownv2 support to td_api::parseTextEntities.

GitOrigin-RevId: 79fc37ce5f1c243150433dca54ff915c55ce884d
---
 td/generate/scheme/td_api.tl  |   3 ++-
 td/generate/scheme/td_api.tlo | Bin 160708 -> 160740 bytes
 td/telegram/Td.cpp            |  12 ++++++++++--
 td/telegram/cli.cpp           |   6 +++---
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/td/generate/scheme/td_api.tl b/td/generate/scheme/td_api.tl
index 061b9992..a6967787 100644
--- a/td/generate/scheme/td_api.tl
+++ b/td/generate/scheme/td_api.tl
@@ -2575,7 +2575,8 @@ deepLinkInfo text:formattedText need_update_application:Bool = DeepLinkInfo;
 //@class TextParseMode @description Describes the way the text should be parsed for TextEntities
 
 //@description The text should be parsed in markdown-style
-textParseModeMarkdown = TextParseMode;
+//@version Version of the parser, 0 - Bot API 1.0 parser, 1 - Bot API 4.5 rules with underline, strikethrough and nested entities support
+textParseModeMarkdown version:int32 = TextParseMode;
 
 //@description The text should be parsed in HTML-style
 textParseModeHTML = TextParseMode;
diff --git a/td/generate/scheme/td_api.tlo b/td/generate/scheme/td_api.tlo
index 4bdb117d664da199d6601118725fd1ad08b58595..66eee5b97b4921cc5cee2862f949666e8e2362cc 100644
GIT binary patch
delta 122
zcmX@|ob$<Z&J9OYS$uk%%9~H9Za<;QXc4Kp-=j=av?R5nBp|V<IMp{lCDk{vC_5#;
zJdc3^r1Iu5As@!+e~&UMPZmh#0BfFZQqQO&0h43^f+A-&9S+;JgCMc(1@(*>E5Qo4
K-_c-t;ROJ@l`lI0

delta 123
zcmaFzob$+Y&J9OYS>}H*jBY-my8VPIqeY}ij_FZL(UR1Pl7Pgb;#A-KlvLluqU@CX
y@;n9xkjk6KgnSr)pvaj`hr_n*AV_R_NIj#91TNX_6Y3c=R)VeB{zrr9g%<$$4lqyv

diff --git a/td/telegram/Td.cpp b/td/telegram/Td.cpp
index 93b6b177..3086c09c 100644
--- a/td/telegram/Td.cpp
+++ b/td/telegram/Td.cpp
@@ -7656,8 +7656,16 @@ td_api::object_ptr<td_api::Object> Td::do_static_request(td_api::parseTextEntiti
     switch (request.parse_mode_->get_id()) {
       case td_api::textParseModeHTML::ID:
         return parse_html(request.text_);
-      case td_api::textParseModeMarkdown::ID:
-        return parse_markdown(request.text_);
+      case td_api::textParseModeMarkdown::ID: {
+        auto version = static_cast<const td_api::textParseModeMarkdown *>(request.parse_mode_.get())->version_;
+        if (version == 0) {
+          return parse_markdown(request.text_);
+        }
+        if (version == 1) {
+          return parse_markdown_v2(request.text_);
+        }
+        return Status::Error("Wrong Markdown version specified");
+      }
       default:
         UNREACHABLE();
         return Status::Error(500, "Unknown parse mode");
diff --git a/td/telegram/cli.cpp b/td/telegram/cli.cpp
index 7f0c421a..00ca58e5 100644
--- a/td/telegram/cli.cpp
+++ b/td/telegram/cli.cpp
@@ -901,7 +901,7 @@ class CliClient final : public Actor {
       string text, vector<td_api::object_ptr<td_api::textEntity>> entities = {}) {
     if (entities.empty() && !text.empty()) {
       auto parsed_text = execute(
-          td_api::make_object<td_api::parseTextEntities>(text, td_api::make_object<td_api::textParseModeMarkdown>()));
+          td_api::make_object<td_api::parseTextEntities>(text, td_api::make_object<td_api::textParseModeMarkdown>(1)));
       if (parsed_text->get_id() == td_api::formattedText::ID) {
         return td_api::move_object_as<td_api::formattedText>(parsed_text);
       }
@@ -2563,13 +2563,13 @@ class CliClient final : public Actor {
       execute(td_api::make_object<td_api::getTextEntities>(args));
     } else if (op == "pte") {
       send_request(
-          td_api::make_object<td_api::parseTextEntities>(args, td_api::make_object<td_api::textParseModeMarkdown>()));
+          td_api::make_object<td_api::parseTextEntities>(args, td_api::make_object<td_api::textParseModeMarkdown>(1)));
     } else if (op == "pteh") {
       send_request(
           td_api::make_object<td_api::parseTextEntities>(args, td_api::make_object<td_api::textParseModeHTML>()));
     } else if (op == "ptes") {
       execute(
-          td_api::make_object<td_api::parseTextEntities>(args, td_api::make_object<td_api::textParseModeMarkdown>()));
+          td_api::make_object<td_api::parseTextEntities>(args, td_api::make_object<td_api::textParseModeMarkdown>(1)));
     } else if (op == "ptehs") {
       execute(td_api::make_object<td_api::parseTextEntities>(args, td_api::make_object<td_api::textParseModeHTML>()));
     } else if (op == "gfmt") {