From e3b849543140a9d3772fd96820ebdf67c32c3a5c Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Fri, 16 Nov 2018 21:30:01 +0900
Subject: [MFM] Better URL parsing

---
 src/mfm/parse/elements/url.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/mfm/parse/elements')

diff --git a/src/mfm/parse/elements/url.ts b/src/mfm/parse/elements/url.ts
index c711ca0236..411f2ebfad 100644
--- a/src/mfm/parse/elements/url.ts
+++ b/src/mfm/parse/elements/url.ts
@@ -9,9 +9,11 @@ export type TextElementUrl = {
 };
 
 export default function(text: string) {
-	const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.=\+\-]+/);
+	const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.,=\+\-]+/);
 	if (!match) return null;
-	const url = match[0];
+	let url = match[0];
+	if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.'));
+	if (url.endsWith(',')) url = url.substr(0, url.lastIndexOf(','));
 	return {
 		type: 'url',
 		content: url,
-- 
cgit v1.2.3-freya