tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add fast path in fix_formatted_text.

Browse Source
This commit is contained in:
levlam 2021-02-13 22:45:11 +03:00
parent 025cb9b6a4
commit 65b381f7fd
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
td/telegram/MessageEntity.cpp
View File

@ -3753,23 +3753,32 @@ static void merge_new_entities(vector<MessageEntity> &entities, vector<MessageEn
Status fix_formatted_text(string &text, vector<MessageEntity> &entities, bool allow_empty, bool skip_new_entities, Status fix_formatted_text(string &text, vector<MessageEntity> &entities, bool allow_empty, bool skip_new_entities,
bool skip_bot_commands, bool for_draft) { bool skip_bot_commands, bool for_draft) {
if (!check_utf8(text)) { string result;
return Status::Error(400, "Strings must be encoded in UTF-8"); if (entities.empty()) {
} // fast path
if (!clean_input_string(text)) {
for (auto &entity : entities) { return Status::Error(400, "Strings must be encoded in UTF-8");
if (entity.offset < 0 || entity.offset > 1000000) {
return Status::Error(400, PSLICE() << "Receive an entity with incorrect offset " << entity.offset);
} }
if (entity.length < 0 || entity.length > 1000000) { result = std::move(text);
return Status::Error(400, PSLICE() << "Receive an entity with incorrect length " << entity.length); } else {
if (!check_utf8(text)) {
return Status::Error(400, "Strings must be encoded in UTF-8");
} }
for (auto &entity : entities) {
if (entity.offset < 0 || entity.offset > 1000000) {
return Status::Error(400, PSLICE() << "Receive an entity with incorrect offset " << entity.offset);
}
if (entity.length < 0 || entity.length > 1000000) {
return Status::Error(400, PSLICE() << "Receive an entity with incorrect length " << entity.length);
}
}
td::remove_if(entities, [](const MessageEntity &entity) { return entity.length == 0; });
fix_entities(entities);
TRY_RESULT_ASSIGN(result, clean_input_string_with_entities(text, entities));
} }
td::remove_if(entities, [](const MessageEntity &entity) { return entity.length == 0; });
fix_entities(entities);
TRY_RESULT(result, clean_input_string_with_entities(text, entities));
// now entities are still sorted by offset and length, but not type, // now entities are still sorted by offset and length, but not type,
// because some characters could be deleted and after that some entities begin to share a common end // because some characters could be deleted and after that some entities begin to share a common end