1 files changed, 50 insertions, 54 deletions

diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx
index fadab27a7..35ce49ae2 100644
--- a/web/react/utils/utils.jsx
+++ b/web/react/utils/utils.jsx
@@ -211,11 +211,15 @@ export function displayDateTime(ticks) {
     }
 
     interval = Math.floor(seconds / 60);
-    if (interval > 1) {
+    if (interval >= 2) {
         return interval + ' minutes ago';
     }
 
-    return '1 minute ago';
+    if (interval >= 1) {
+        return '1 minute ago';
+    }
+
+    return 'just now';
 }
 
 export function displayCommentDateTime(ticks) {
@@ -227,46 +231,62 @@ export function getTimestamp() {
     return Date.now();
 }
 
-function testUrlMatch(text) {
-    var urlMatcher = new Autolinker.matchParser.MatchParser({
+// extracts links not styled by Markdown
+export function extractLinks(text) {
+    const urlMatcher = new Autolinker.matchParser.MatchParser({
         urls: true,
         emails: false,
         twitter: false,
         phone: false,
         hashtag: false
     });
-    var result = [];
+    const links = [];
+    let replaceText = text;
+
+    // pull out the Markdown code blocks
+    const codeBlocks = [];
+    const splitText = replaceText.split('`'); // also handles ```
+    for (let i = 1; i < splitText.length; i += 2) {
+        if (splitText[i].trim() !== '') {
+            codeBlocks.push(splitText[i]);
+        }
+    }
+
     function replaceFn(match) {
-        var linkData = {};
-        var matchText = match.getMatchedText();
+        let link = '';
+        const matchText = match.getMatchedText();
+        const tempText = replaceText;
+
+        const start = replaceText.indexOf(matchText);
+        const end = start + matchText.length;
+
+        replaceText = replaceText.substring(0, start) + replaceText.substring(end);
+
+        // if it's a Markdown link, just skip it
+        if (start > 1) {
+            if (tempText.charAt(start - 2) === ']' && tempText.charAt(start - 1) === '(' && tempText.charAt(end) === ')') {
+                return;
+            }
+        }
+
+        // if it's in a Markdown code block, skip it
+        for (const i in codeBlocks) {
+            if (codeBlocks[i].indexOf(matchText) === 0) {
+                codeBlocks[i] = codeBlocks[i].replace(matchText, '');
+                return;
+            }
+        }
 
-        linkData.text = matchText;
         if (matchText.trim().indexOf('http') === 0) {
-            linkData.link = matchText;
+            link = matchText;
         } else {
-            linkData.link = 'http://' + matchText;
+            link = 'http://' + matchText;
         }
 
-        result.push(linkData);
+        links.push(link);
     }
     urlMatcher.replace(text, replaceFn, this);
-    return result;
-}
-
-export function extractLinks(text) {
-    var repRegex = new RegExp('<br>', 'g');
-    var matches = testUrlMatch(text.replace(repRegex, '\n'));
-
-    if (!matches.length) {
-        return {links: null, text: text};
-    }
-
-    var links = [];
-    for (var i = 0; i < matches.length; i++) {
-        links.push(matches[i].link);
-    }
-
-    return {links: links, text: text};
+    return {links, text};
 }
 
 export function escapeRegExp(string) {
@@ -404,11 +424,6 @@ export function toTitleCase(str) {
 }
 
 export function applyTheme(theme) {
-    if (!theme.codeTheme) {
-        theme.codeTheme = Constants.DEFAULT_CODE_THEME;
-    }
-    updateCodeTheme(theme.codeTheme);
-
     if (theme.sidebarBg) {
         changeCss('.sidebar--left, .settings-modal .settings-table .settings-links, .sidebar--menu', 'background:' + theme.sidebarBg, 1);
     }
@@ -439,6 +454,8 @@ export function applyTheme(theme) {
     if (theme.sidebarTextActiveColor) {
         changeCss('.sidebar--left .nav-pills__container li.active a, .sidebar--left .nav-pills__container li.active a:hover, .sidebar--left .nav-pills__container li.active a:focus, .settings-modal .nav-pills>li.active a, .settings-modal .nav-pills>li.active a:hover, .settings-modal .nav-pills>li.active a:active', 'color:' + theme.sidebarTextActiveColor, 2);
         changeCss('.sidebar--left .nav li.active a, .sidebar--left .nav li.active a:hover, .sidebar--left .nav li.active a:focus', 'background:' + changeOpacity(theme.sidebarTextActiveColor, 0.1), 1);
+        changeCss('.search-help-popover .search-autocomplete__item:hover', 'background:' + changeOpacity(theme.sidebarTextActiveColor, 0.05), 1);
+        changeCss('.search-help-popover .search-autocomplete__item.selected', 'background:' + changeOpacity(theme.sidebarTextActiveColor, 0.15), 1);
     }
 
     if (theme.sidebarHeaderBg) {
@@ -595,27 +612,6 @@ export function rgb2hex(rgbIn) {
     return '#' + hex(rgb[1]) + hex(rgb[2]) + hex(rgb[3]);
 }
 
-export function updateCodeTheme(theme) {
-    const path = '/static/css/highlight/' + theme + '.css';
-    const $link = $('link.code_theme');
-    if (path !== $link.attr('href')) {
-        changeCss('code.hljs', 'visibility: hidden');
-        var xmlHTTP = new XMLHttpRequest();
-        xmlHTTP.open('GET', path, true);
-        xmlHTTP.onload = function onLoad() {
-            $link.attr('href', path);
-            if (isBrowserFirefox()) {
-                $link.one('load', () => {
-                    changeCss('code.hljs', 'visibility: visible');
-                });
-            } else {
-                changeCss('code.hljs', 'visibility: visible');
-            }
-        };
-        xmlHTTP.send();
-    }
-}
-
 export function placeCaretAtEnd(el) {
     el.focus();
     if (typeof window.getSelection != 'undefined' && typeof document.createRange != 'undefined') {