diff --git a/README.md b/README.md index d365e5b9a..5d1e40f7b 100644 --- a/README.md +++ b/README.md @@ -22,3 +22,11 @@ download the [boost library](https://sourceforge.net/projects/boost/files/boost/ ### linux ??? + +### Mac OSX +1. Install XCode and XCode Command Line Utilites +2. Install QT Creator +3. Install brew https://brew.sh/ +4. `brew install boost openssl rapidjson` +5. Build the garbage using QT creator +6. gachiGASM \ No newline at end of file diff --git a/src/messages/messagebuilder.cpp b/src/messages/messagebuilder.cpp index aec581b8b..6c2bf89f7 100644 --- a/src/messages/messagebuilder.cpp +++ b/src/messages/messagebuilder.cpp @@ -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