Moved emoticon parsing to happen after url parsing so that we don't have smilies accidentally occuring in urls

1 files changed, 4 insertions, 4 deletions

diff --git a/web/react/utils/text_formatting.jsx b/web/react/utils/text_formatting.jsx
index be82f7b9c..940bd0485 100644
--- a/web/react/utils/text_formatting.jsx
+++ b/web/react/utils/text_formatting.jsx
@@ -36,14 +36,14 @@ export function formatText(text, options = {}) {
     const tokens = new Map();
 
     // replace important words and phrases with tokens
-    if (!('emoticons' in options) || options.emoticon) {
-        output = Emoticons.handleEmoticons(output, tokens);
-    }
-
     output = autolinkUrls(output, tokens, !!options.markdown);
     output = autolinkAtMentions(output, tokens);
     output = autolinkHashtags(output, tokens);
 
+    if (!('emoticons' in options) || options.emoticon) {
+        output = Emoticons.handleEmoticons(output, tokens);
+    }
+
     if (options.searchTerm) {
         output = highlightSearchTerm(output, tokens, options.searchTerm);
     }