procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Fix timestamps adjacent to parentheses.

Browse source 
Fixes #6997.
This commit is contained in:
John Preston 2020-01-16 11:28:03 +03:00
parent 38d799de24
commit 5aee0f642a
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Telegram/SourceFiles/history/view/media/history_view_media.cpp
View file

@ -28,10 +28,13 @@ namespace {
auto ok3 = true;
auto minutes = minutes1.toString();
minutes += minutes2;
const auto result = (hours.isEmpty() ? 0 : hours.toInt(&ok1)) * 3600
+ minutes.toInt(&ok2) * 60
+ seconds.toInt(&ok3);
return (ok1 && ok2 && ok3) ? result : -1;
const auto value1 = (hours.isEmpty() ? 0 : hours.toInt(&ok1));
const auto value2 = minutes.toInt(&ok2);
const auto value3 = seconds.toInt(&ok3);
const auto ok = ok1 && ok2 && ok3;
return (ok && value3 < 60 && (hours.isEmpty() || value2 < 60))
? (value1 * 3600 + value2 * 60 + value3)
: -1;
}
} // namespace
@ -49,7 +52,7 @@ TextWithEntities AddTimestampLinks(
TimeId duration,
const QString &base) {
static const auto expression = QRegularExpression(
"(?<![^\\s])(?:(?:(\\d{1,2}):)?(\\d))?(\\d):(\\d\\d)(?![^\\s])");
"(?<![^\\s\\(\\)\"\\,\\.\\-])(?:(?:(\\d{1,2}):)?(\\d))?(\\d):(\\d\\d)(?![^\\s\\(\\)\",\\.\\-])");
const auto &string = text.text;
auto offset = 0;
while (true) {