diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-16 21:30:01 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-16 21:30:01 +0900 |
| commit | e3b849543140a9d3772fd96820ebdf67c32c3a5c (patch) | |
| tree | 1437f8657205f6a02472e9152467f22f43374ac1 /src/mfm/parse/elements | |
| parent | [Client] Add missing icon (diff) | |
| download | misskey-e3b849543140a9d3772fd96820ebdf67c32c3a5c.tar.gz misskey-e3b849543140a9d3772fd96820ebdf67c32c3a5c.tar.bz2 misskey-e3b849543140a9d3772fd96820ebdf67c32c3a5c.zip | |
[MFM] Better URL parsing
Diffstat (limited to 'src/mfm/parse/elements')
| -rw-r--r-- | src/mfm/parse/elements/url.ts | 6 |
1 files changed, 4 insertions, 2 deletions
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, |