From 66d40fe4b99e1f148f0dfed95d827b6b3499579e Mon Sep 17 00:00:00 2001
From: Luke Childs <lukechilds123@gmail.com>
Date: Wed, 4 May 2016 18:50:14 +0100
Subject: [PATCH] Use my-name-is-url regex for urls

---
 package.json  | 4 +++-
 src/parser.js | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 07afeae..a5dc1c4 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,9 @@
   "version": "0.0.0",
   "description": "Social text parser",
   "main": "dist/athash.js",
-  "dependencies": {},
+  "dependencies": {
+    "my-name-is-url": "^1.3.1"
+  },
   "devDependencies": {
     "babel-cli": "^6.7.5",
     "babel-plugin-add-module-exports": "^0.1.2",
diff --git a/src/parser.js b/src/parser.js
index 051b97e..1f5bb26 100644
--- a/src/parser.js
+++ b/src/parser.js
@@ -1,4 +1,5 @@
 import defaultFilters from './filters';
+import { regex as urlRegex } from 'my-name-is-url';
 
 export default class Parser {
 
@@ -12,7 +13,7 @@ export default class Parser {
         regex: /\B@\w*[a-zA-Z]+\w*/g
       },
       urls: {
-        regex: /https?:\/\/[^\s,]*[^\s,.]/g,
+        regex: urlRegex,
         filter: url => `<a target="_blank" href="${url}">${url}</a>`
       }
     };