OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-14 23:15:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

[MFM] Better hashtag detection

Browse source
This commit is contained in:
syuilo 2018-12-02 06:53:57 +09:00
parent 10fb399588
commit c58027e521
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mfm/parser.ts
View file

@ -162,7 +162,7 @@ const mfm = P.createLanguage({
let hashtag = match[1]; let hashtag = match[1];
hashtag = hashtag.substr(0, getTrailingPosition(hashtag)); hashtag = hashtag.substr(0, getTrailingPosition(hashtag));
if (hashtag.match(/^[0-9]+$/)) return P.makeFailure(i, 'not a 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 })); return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag }));
}), }),
//#endregion //#endregion

4
test/mfm.ts
View file

@ -187,9 +187,9 @@ describe('Text', () => {
}); });
it('with text (zenkaku)', () => { it('with text (zenkaku)', () => {
const tokens = analyze('こんにちは　#世界'); const tokens = analyze('こんにちは#世界');
assert.deepEqual([ assert.deepEqual([
text('こんにちは　'), text('こんにちは'),
node('hashtag', { hashtag: '世界' }) node('hashtag', { hashtag: '世界' })
], tokens); ], tokens);
}); });