#277

3 files changed, 25 insertions, 4 deletions

diff --git a/src/common/text/elements/link.js b/src/common/text/elements/link.js
new file mode 100644
index 0000000000..03315bb2c0
--- /dev/null
+++ b/src/common/text/elements/link.js
@@ -0,0 +1,19 @@
+/**
+ * Link
+ */
+
+module.exports = text => {
+	const match = text.match(/^\??\[(.+?)\]\((https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+)\)/);
+	if (!match) return null;
+	const silent = text[0] == '?';
+	const link = match[0];
+	const title = match[1];
+	const url = match[2];
+	return {
+		type: 'link',
+		content: link,
+		title: title,
+		url: url,
+		silent: silent
+	};
+};
diff --git a/src/common/text/elements/url.js b/src/common/text/elements/url.js
index f350b707ac..1003aff9c3 100644
--- a/src/common/text/elements/url.js
+++ b/src/common/text/elements/url.js
@@ -3,11 +3,12 @@
  */
 
 module.exports = text => {
-	const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+/); 
+	const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+/);
 	if (!match) return null;
-	const link = match[0];
+	const url = match[0];
 	return {
-		type: 'link',
-		content: link
+		type: 'url',
+		content: url,
+		url: url
 	};
 };
diff --git a/src/common/text/index.js b/src/common/text/index.js
index 4424169033..ab1342230c 100644
--- a/src/common/text/index.js
+++ b/src/common/text/index.js
@@ -5,6 +5,7 @@
 const elements = [
 	require('./elements/bold'),
 	require('./elements/url'),
+	require('./elements/link'),
 	require('./elements/mention'),
 	require('./elements/hashtag'),
 	require('./elements/code'),