From f5a937c523b2165dedd1edd94267c3a0efb5a7a4 Mon Sep 17 00:00:00 2001 From: syuilo Date: Mon, 17 Sep 2018 22:51:10 +0900 Subject: Better hashtag parsing --- src/mfm/parse/elements/hashtag.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mfm/parse/elements') diff --git a/src/mfm/parse/elements/hashtag.ts b/src/mfm/parse/elements/hashtag.ts index f4b6a78fa8..339026228a 100644 --- a/src/mfm/parse/elements/hashtag.ts +++ b/src/mfm/parse/elements/hashtag.ts @@ -9,9 +9,9 @@ export type TextElementHashtag = { }; export default function(text: string, i: number) { - if (!(/^\s#[^\s]+/.test(text) || (i == 0 && /^#[^\s]+/.test(text)))) return null; + if (!(/^\s#[^\s\.,]+/.test(text) || (i == 0 && /^#[^\s\.,]+/.test(text)))) return null; const isHead = text.startsWith('#'); - const hashtag = text.match(/^\s?#[^\s]+/)[0]; + const hashtag = text.match(/^\s?#[^\s\.,]+/)[0]; const res: any[] = !isHead ? [{ type: 'text', content: text[0] -- cgit v1.2.3-freya