noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

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
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/messages/messagebuilder.cpp
View file

@ -10,7 +10,7 @@ MessageBuilder::MessageBuilder()
: _words() : _words()
{ {
_parseTime = std::chrono::system_clock::now(); _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); regex.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
} }
@ -54,8 +54,11 @@ void MessageBuilder::appendTimestamp(time_t time)
QString MessageBuilder::matchLink(const QString &string) QString MessageBuilder::matchLink(const QString &string)
{ {
QRegularExpressionMatch match = regex.match(string); QString match = regex.match(string,0,QRegularExpression::PartialPreferCompleteMatch,QRegularExpression::NoMatchOption).captured();
return match.captured(); if(!match.contains(QRegularExpression("\\bhttps?:\/\/"))){
match.insert(0,"https://");
}
return match;
} }
} // namespace messages } // namespace messages