Merge pull request #358 from stigger/master

Linkify URLs with "file:" scheme
psi-im · Apr 8, 2018 · 51ea60c · 51ea60c
2 parents 6e4d934 + ee00b11
commit 51ea60c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/textutil.cpp b/src/textutil.cpp
@@ -349,6 +349,11 @@ QString TextUtil::linkify(const QString &in)
             isUrl = true;
             href = "";
         }
+        else if(linkify_pmatch(out, n, "file://")) {
+            n += 7;
+            isUrl = true;
+            href = "";
+        }
         else if (linkify_pmatch(out, n, "magnet:")) {
             n += 7;
             isUrl = true;

diff --git a/themes/chatview/util.js b/themes/chatview/util.js
@@ -242,7 +242,7 @@ function initPsiTheme() {
                     var linkEl = links[li];
                     if (youtube.indexOf(linkEl.hostname) != -1) {
                         chat.util.replaceYoutube(linkEl);
-                    } else if ((linkEl.protocol == "http:" || linkEl.protocol == "https:") && linkEl.hostname != "psi") {
+                    } else if ((linkEl.protocol == "http:" || linkEl.protocol == "https:" || linkEl.protocol == "file:") && linkEl.hostname != "psi") {
                         chat.util.replaceLinkAsync(linkEl);
                     }
                 }