From 718067e218adea217f48812a5151e6bbf8e75ebd Mon Sep 17 00:00:00 2001 From: levlam Date: Tue, 10 Mar 2020 17:06:22 +0300 Subject: [PATCH] Remove wrong check from remove_invalid_entities. GitOrigin-RevId: 843dea6a6668de87287a23532d95e9c6712c5b09 --- td/telegram/MessageEntity.cpp | 3 ++- test/message_entities.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp index 2f2677f81..702364c5a 100644 --- a/td/telegram/MessageEntity.cpp +++ b/td/telegram/MessageEntity.cpp @@ -3319,9 +3319,10 @@ static Result clean_input_string_with_entities(const string &text, vecto } // removes entities containing whitespaces only +// entities must be sorted by offset and length, but not necessary by type // returns {last_non_whitespace_pos, last_non_whitespace_utf16_offset} static std::pair remove_invalid_entities(const string &text, vector &entities) { - check_is_sorted(entities); + // check_is_sorted(entities); vector nested_entities_stack; size_t current_entity = 0; diff --git a/test/message_entities.cpp b/test/message_entities.cpp index d2f47758c..f55508e86 100644 --- a/test/message_entities.cpp +++ b/test/message_entities.cpp @@ -783,6 +783,16 @@ TEST(MessageEntities, fix_formatted_text) { } } + check_fix_formatted_text("a\rbc\r", + {{td::MessageEntity::Type::Italic, 0, 1}, + {td::MessageEntity::Type::Bold, 0, 2}, + {td::MessageEntity::Type::Italic, 3, 2}, + {td::MessageEntity::Type::Bold, 3, 1}}, + "abc", + {{td::MessageEntity::Type::Bold, 0, 1}, + {td::MessageEntity::Type::Italic, 0, 1}, + {td::MessageEntity::Type::Bold, 2, 1}, + {td::MessageEntity::Type::Italic, 2, 1}}); check_fix_formatted_text("abc", {{td::MessageEntity::Type::Italic, 1, 1}, {td::MessageEntity::Type::Italic, 0, 1}}, "abc", {{td::MessageEntity::Type::Italic, 0, 2}}); check_fix_formatted_text("abc", {{td::MessageEntity::Type::Italic, 1, 1}, {td::MessageEntity::Type::Italic, 1, 1}},