From 9ec459526a2bf4d119ab779473c9606c524b6131 Mon Sep 17 00:00:00 2001
From: Elias Nahum <nahumhbl@gmail.com>
Date: Fri, 1 Apr 2016 12:40:07 -0300
Subject: Rename extractLinks to extractFirstLink

---
 webapp/components/post_body_additional_content.jsx |  2 +-
 webapp/utils/utils.jsx                             | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/webapp/components/post_body_additional_content.jsx b/webapp/components/post_body_additional_content.jsx
index 2cd82f213..452597dde 100644
--- a/webapp/components/post_body_additional_content.jsx
+++ b/webapp/components/post_body_additional_content.jsx
@@ -70,7 +70,7 @@ export default class PostBodyAdditionalContent extends React.Component {
             return this.getSlackAttachment();
         }
 
-        const link = Utils.extractLinks(this.props.post.message)[0];
+        const link = Utils.extractFirstLink(this.props.post.message);
         if (!link) {
             return null;
         }
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 9af36f9dd..dc9291ab7 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -313,9 +313,8 @@ export function getTimestamp() {
 }
 
 // extracts links not styled by Markdown
-export function extractLinks(text) {
-    const pattern = /(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/gi;
-    let links;
+export function extractFirstLink(text) {
+    const pattern = /(^|[\s\n]|<br\/?>)((?:https?|ftp):\/\/[\-A-Z0-9+\u0026\u2019@#\/%?=()~_|!:,.;]*[\-A-Z0-9+\u0026@#\/%=~()_|])/i;
     let inText = text;
 
     // strip out code blocks
@@ -324,13 +323,12 @@ export function extractLinks(text) {
     // strip out inline markdown images
     inText = inText.replace(/!\[[^\]]*\]\([^\)]*\)/g, '');
 
-    links = inText.match(pattern) || [];
+    const match = pattern.exec(inText);
+    if (match) {
+        return match[0].trim();
+    }
 
-    return links.map(
-        (url) => {
-            return url.trim();
-        }
-    );
+    return '';
 }
 
 export function escapeRegExp(string) {
-- 
cgit v1.2.3-1-g7c22