Skip to content

Allow timestamp links inside text formatting entities #30669

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
evtn wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Allow timestamp links inside text formatting entities #30669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions Telegram/SourceFiles/history/view/media/history_view_media.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,20 @@ TextWithEntities AddTimestampLinks(
"(?:(?:(\\d{1,2}):)?(\\d))?(\\d):(\\d\\d)"
"(?![^\\s\\(\\)\\[\\]\",\\.\\-\\+])");
const auto &string = text.text;
const auto canContainTimestamp = [](EntityType type) {
switch (type) {
case EntityType::Bold:
case EntityType::Semibold:
case EntityType::Italic:
case EntityType::Underline:
case EntityType::StrikeOut:
case EntityType::Spoiler:
case EntityType::Blockquote:
return true;
default:
return false;
}
};
auto offset = 0;
while (true) {
const auto m = expression.match(string, offset);
Expand Down Expand Up @@ -163,7 +177,7 @@ TextWithEntities AddTimestampLinks(
&EntityInText::offset);
while (i != entities.end()
&& i->offset() < till
&& i->type() == EntityType::Spoiler) {
&& canContainTimestamp(i->type())) {
++i;
}
if (i != entities.end() && i->offset() < till) {
Expand All @@ -172,7 +186,7 @@ TextWithEntities AddTimestampLinks(

const auto intersects = [&](const EntityInText &entity) {
return (entity.offset() + entity.length() > from)
&& (entity.type() != EntityType::Spoiler);
&& !canContainTimestamp(entity.type());
};
auto j = std::make_reverse_iterator(i);
const auto e = std::make_reverse_iterator(entities.begin());
Expand Down