chatterino2
Code Issues

Added support for non http/https links. (#82)

Browse Source
This commit is contained in:
Cranken
2017-07-26 12:01:23 +02:00
committed by pajlada
parent b3b89e8019
commit f787d3f464
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/messagebuilder.cpp
+6 -3
View File
@@ -10,7 +10,7 @@ MessageBuilder::MessageBuilder()
: _words()
{
_parseTime = std::chrono::system_clock::now();
regex.setPattern("\\bhttps?:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[A-Z0-9+&@#\/%=~_|]");
regex.setPattern("(\\bhttps?:\/\/)?[-A-Z0-9+&@#\/%?=~_|!:,.;]*[A-Z0-9+&@#\/%=~_|]");
regex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
}
@@ -54,8 +54,11 @@ void MessageBuilder::appendTimestamp(time_t time)
QString MessageBuilder::matchLink(const QString &string)
{
QRegularExpressionMatch match = regex.match(string);
return match.captured();
QString match = regex.match(string,0,QRegularExpression::PartialPreferCompleteMatch,QRegularExpression::NoMatchOption).captured();
if(!match.contains(QRegularExpression("\\bhttps?:\/\/"))){
match.insert(0,"https://");
}
return match;
}
} // namespace messages