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

Add text_length function.

Browse Source 
GitOrigin-RevId: bf58e5427e0c354e6fdddd4756e67cf7eeaf49a9
This commit is contained in:
levlam 2020-03-10 17:43:07 +03:00
parent 08d32673a3
commit 83cf2b3dd1
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
td/telegram/MessageEntity.cpp
View File

@ -1142,6 +1142,10 @@ vector<std::pair<Slice, bool>> find_urls(Slice str) {
return result; return result;
} }
static int32 text_length(Slice text) {
return narrow_cast<int32>(utf8_utf16_length(text));
}
static void sort_entities(vector<MessageEntity> &entities) { static void sort_entities(vector<MessageEntity> &entities) {
if (std::is_sorted(entities.begin(), entities.end())) { if (std::is_sorted(entities.begin(), entities.end())) {
return; return;
@ -1966,15 +1970,15 @@ static FormattedText parse_text_url_entities_v3(Slice text, vector<MessageEntity
CHECK(parsed_part_text[url_end_pos] == ')'); CHECK(parsed_part_text[url_end_pos] == ')');
Slice before_text_url = parsed_part_text.substr(prev_pos, text_begin_pos - prev_pos); Slice before_text_url = parsed_part_text.substr(prev_pos, text_begin_pos - prev_pos);
auto before_text_url_utf16_length = narrow_cast<int32>(utf8_utf16_length(before_text_url)); auto before_text_url_utf16_length = text_length(before_text_url);
result_text_utf16_length += before_text_url_utf16_length; result_text_utf16_length += before_text_url_utf16_length;
result.text.append(before_text_url.begin(), before_text_url.size()); result.text.append(before_text_url.begin(), before_text_url.size());
text_utf16_offset += before_text_url_utf16_length; text_utf16_offset += before_text_url_utf16_length;
Slice text_url = parsed_part_text.substr(text_begin_pos + 1, text_end_pos - text_begin_pos - 1); Slice text_url = parsed_part_text.substr(text_begin_pos + 1, text_end_pos - text_begin_pos - 1);
auto text_url_utf16_length = narrow_cast<int32>(utf8_utf16_length(text_url)); auto text_url_utf16_length = text_length(text_url);
Slice url = parsed_part_text.substr(url_begin_pos + 1, url_end_pos - url_begin_pos - 1); Slice url = parsed_part_text.substr(url_begin_pos + 1, url_end_pos - url_begin_pos - 1);
auto url_utf16_length = narrow_cast<int32>(utf8_utf16_length(url)); auto url_utf16_length = text_length(url);
result.entities.emplace_back(MessageEntity::Type::TextUrl, result_text_utf16_length, text_url_utf16_length, result.entities.emplace_back(MessageEntity::Type::TextUrl, result_text_utf16_length, text_url_utf16_length,
check_url(url).move_as_ok()); check_url(url).move_as_ok());
result.text.append(text_url.begin(), text_url.size()); result.text.append(text_url.begin(), text_url.size());
@ -2090,7 +2094,7 @@ static FormattedText parse_text_url_entities_v3(Slice text, vector<MessageEntity
part_entities.push_back(entity); part_entities.push_back(entity);
part_entities.back().offset -= skipped_length; part_entities.back().offset -= skipped_length;
} }
add_part(part_begin + narrow_cast<int32>(utf8_utf16_length(text))); add_part(part_begin + text_length(text));
return result; return result;
} }
@ -2345,7 +2349,7 @@ static FormattedText parse_pre_entities_v3(Slice text, vector<MessageEntity> ent
result.entities.push_back(std::move(entity)); result.entities.push_back(std::move(entity));
result.entities.back().offset -= skipped_length; result.entities.back().offset -= skipped_length;
} }
add_part(part_begin + narrow_cast<int32>(utf8_utf16_length(text))); add_part(part_begin + text_length(text));
return result; return result;
} }
@ -2389,7 +2393,7 @@ FormattedText parse_markdown_v3(FormattedText text) {
entity.offset += result_text_utf16_length; entity.offset += result_text_utf16_length;
} }
append(result.entities, std::move(part.entities)); append(result.entities, std::move(part.entities));
result_text_utf16_length += narrow_cast<int32>(utf8_utf16_length(part.text)); result_text_utf16_length += text_length(part.text);
part_begin = part_end; part_begin = part_end;
}; };
@ -2417,7 +2421,7 @@ FormattedText parse_markdown_v3(FormattedText text) {
max_end = td::max(max_end, entity.offset + entity.length); max_end = td::max(max_end, entity.offset + entity.length);
} }
add_part(part_begin + narrow_cast<int32>(utf8_utf16_length(left_text))); add_part(part_begin + text_length(left_text));
return result; return result;
} }
@ -3657,7 +3661,7 @@ Status fix_formatted_text(string &text, vector<MessageEntity> &entities, bool al
} }
text.resize(new_size); text.resize(new_size);
td::remove_if(entities, [text_utf16_length = narrow_cast<int32>(utf8_utf16_length(text))](const auto &entity) { td::remove_if(entities, [text_utf16_length = text_length(text)](const auto &entity) {
return entity.offset + entity.length > text_utf16_length; return entity.offset + entity.length > text_utf16_length;
}); });
} }