usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[MFM] Better hashtag parsing: Ignore trailing colon

This commit is contained in:
syuilo 2019-01-12 14:10:16 +09:00
parent 3d62bd8007
commit cd628eaf54
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mfm/parser.ts
View File

@ -205,7 +205,7 @@ const mfm = P.createLanguage({
hashtag: r => hashtag: r =>
P((input, i) => { P((input, i) => {
const text = input.substr(i); const text = input.substr(i);
const match = text.match(/^#([^\s\.,!\?#]+)/i); const match = text.match(/^#([^\s\.,!\?#:]+)/i);
if (!match) return P.makeFailure(i, 'not a hashtag'); if (!match) return P.makeFailure(i, 'not a hashtag');
let hashtag = match[1]; let hashtag = match[1];
hashtag = removeOrphanedBrackets(hashtag); hashtag = removeOrphanedBrackets(hashtag);

8
test/mfm.ts
View File

@ -357,6 +357,14 @@ describe('MFM', () => {
]); ]);
}); });
it('ignore colon', () => {
const tokens = analyze('#Foo:');
assert.deepStrictEqual(tokens, [
leaf('hashtag', { hashtag: 'Foo' }),
text(':'),
]);
});
it('allow including number', () => { it('allow including number', () => {
const tokens = analyze('#foo123'); const tokens = analyze('#foo123');
assert.deepStrictEqual(tokens, [ assert.deepStrictEqual(tokens, [