From 9ce3aecd38632fdf65d42afe5fbe8d735f04353a Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Sat, 16 May 2015 09:49:28 +0200
Subject: [PATCH 1/2] No need for [url][/url]

No longer need to use the [url] tags to add **HTTPS** links. I want to
only link to "secure" site by default, hence only https.

Users can still use [url] tags if they want to.

The ENTIRE chat  code needs to be rewitten, as it is just packing more
code upon code. It can be done in another PR though. This just gets the
base working feature in place.
---
 cockatrice/src/chatview.cpp | 60 ++++++++++++++++++++++++++-----------
 1 file changed, 42 insertions(+), 18 deletions(-)

diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp
index 4b40d22a..692baf94 100644
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
@@ -161,43 +161,53 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
     }
     cursor.setCharFormat(messageFormat);
     
-    int index = -1, bracket = -1, at = -1;
+    int index = -1, bracketFirstIndex = -1, mentionFirstIndex = -1, urlFirstIndex = -1;
     bool mentionEnabled = settingsCache->getChatMention();
     while (message.size())
     {
         // search for the first [ or @
-        bracket = message.indexOf('[');
-        at = mentionEnabled ? message.indexOf('@') : -1;
-        if(bracket == -1)
-        {
-            if(at == -1)
-            {
-                // quick way out
-                cursor.insertText(message);
-                break;
+        bracketFirstIndex = message.indexOf('[');
+        mentionFirstIndex = mentionEnabled ? message.indexOf('@') : -1;
+        urlFirstIndex = message.indexOf("https://");
+        if(bracketFirstIndex == -1) {
+            if(mentionFirstIndex == -1) {
+                if (urlFirstIndex == -1) {
+                    // quick way out
+                    cursor.insertText(message);
+                    break;
+                } else {
+                    // url
+                    index = urlFirstIndex;
+                }
             } else {
-                // mention
-                index = at;
+                if (urlFirstIndex == -1) {
+                    // mention
+                    index = mentionFirstIndex;
+                } else {
+                    index = std::min(urlFirstIndex, mentionFirstIndex);
+                }
             }
         } else {
-            if(at == -1)
-            {
+            if(mentionFirstIndex == -1) {
                 // bracket
-                index = bracket;
+                index = bracketFirstIndex;
             } else {
                 // both, pick up the first one
-                index = std::min(bracket, at);
+                index = std::min(bracketFirstIndex, mentionFirstIndex);
+            }
+            if(urlFirstIndex != -1) {
+                index = std::min(index, urlFirstIndex);
             }
         }
 
-        // insert the message text up to the [ / @
+        // insert the message text up to the [ / @ / https://
         if(index > 0)
         {
             cursor.insertText(message.left(index), defaultFormat);
             message = message.mid(index);            
         }
 
-        if(index == bracket)
+        if(index == bracketFirstIndex)
         {
             if (message.startsWith("[card]")) {
                 message = message.mid(6);
@@ -234,6 +244,20 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
                 cursor.insertText("[", defaultFormat);
                 message = message.mid(1);
             }
+        } else if (index == urlFirstIndex) {
+            int urlEndIndex = message.indexOf(QRegExp("\\s"), 0);
+            if (urlEndIndex == -1)
+                urlEndIndex = message.size();
+            QString urlText = message.left(urlEndIndex);
+            QUrl qUrl(urlText);
+            if (qUrl.isValid())
+                appendUrlTag(cursor, urlText);
+            else
+                cursor.insertText(urlText);
+            if (urlEndIndex == -1)
+                message.clear();
+            else
+                message = message.mid(urlEndIndex);
         } else {
             if (message.startsWith(mention, Qt::CaseInsensitive)) {
                 // you have been mentioned

From af29d4529c8da3576c3cb76949e936ac51446d6a Mon Sep 17 00:00:00 2001
From: Matt Lowe <matthewneillowe@gmail.com>
Date: Tue, 19 May 2015 11:11:20 +0200
Subject: [PATCH 2/2] Can now use more url types

Can now use
http://
https://
www.
---
 cockatrice/src/chatview.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cockatrice/src/chatview.cpp b/cockatrice/src/chatview.cpp
index 692baf94..c11f2d1c 100644
--- a/cockatrice/src/chatview.cpp
+++ b/cockatrice/src/chatview.cpp
@@ -168,7 +168,7 @@ void ChatView::appendMessage(QString message, QString sender, UserLevelFlags use
         // search for the first [ or @
         bracketFirstIndex = message.indexOf('[');
         mentionFirstIndex = mentionEnabled ? message.indexOf('@') : -1;
-        urlFirstIndex = message.indexOf("https://");
+        urlFirstIndex = message.indexOf(QRegExp("https?://|www."));
         if(bracketFirstIndex == -1) {
             if(mentionFirstIndex == -1) {
                 if (urlFirstIndex == -1) {