summaryrefslogtreecommitdiff
path: root/src/mfm/parser.ts
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-12-02 06:53:57 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-12-02 06:53:57 +0900
commitc58027e5217c72a6c936aa27b4b02f0ff7f5bbda (patch)
tree4d80ef1e8b57207360759d5682b045f1b2e34e33 /src/mfm/parser.ts
parentMerge branch 'develop' of https://github.com/syuilo/misskey into develop (diff)
downloadmisskey-c58027e5217c72a6c936aa27b4b02f0ff7f5bbda.tar.gz
misskey-c58027e5217c72a6c936aa27b4b02f0ff7f5bbda.tar.bz2
misskey-c58027e5217c72a6c936aa27b4b02f0ff7f5bbda.zip
[MFM] Better hashtag detection
Diffstat (limited to 'src/mfm/parser.ts')
-rw-r--r--src/mfm/parser.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mfm/parser.ts b/src/mfm/parser.ts
index 467097d4f1..3e77d56435 100644
--- a/src/mfm/parser.ts
+++ b/src/mfm/parser.ts
@@ -162,7 +162,7 @@ const mfm = P.createLanguage({
let hashtag = match[1];
hashtag = hashtag.substr(0, getTrailingPosition(hashtag));
if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag');
- if (!['\n', ' ', ' ', '(', '「', null, undefined].includes(input[i - 1])) return P.makeFailure(i, 'require space before "#"');
+ if (input[i - 1] != null && input[i - 1].match(/[a-z0-9]/i)) return P.makeFailure(i, 'not a hashtag');
return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag }));
}),
//#endregion