mirror/iceshrimp
1
0
Fork 0
mirror of https://iceshrimp.dev/iceshrimp/iceshrimp synced 2024-11-24 23:26:07 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MFM] Fix hashtag detection

Browse Source
This commit is contained in:
syuilo 2018-11-24 17:18:11 +09:00
parent 8d536af5ba
commit d75a6faeba
2 changed files with 8 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

@ -112,7 +112,7 @@ const mfm = P.createLanguage({
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');
if (match[1].match(/[0-9]+/)) return P.makeFailure(i, 'not a hashtag'); if (match[1].match(/^[0-9]+$/)) return P.makeFailure(i, 'not a hashtag');
if (input[i - 1] != '\n' && input[i - 1] != ' ' && input[i - 1] != null) return P.makeFailure(i, 'require space before "#"'); if (input[i - 1] != '\n' && input[i - 1] != ' ' && input[i - 1] != null) return P.makeFailure(i, 'require space before "#"');
return P.makeSuccess(i + match[0].length, makeNode('hashtag', { hashtag: match[1] })); return P.makeSuccess(i + match[0].length, makeNode('hashtag', { hashtag: match[1] }));
}), }),

7
test/mfm.ts
View File

@ -205,6 +205,13 @@ describe('Text', () => {
], tokens); ], tokens);
}); });
it('allow including number', () => {
const tokens = analyze('#foo123');
assert.deepEqual([
node('hashtag', { hashtag: 'foo123' }),
], tokens);
});
it('disallow number only', () => { it('disallow number only', () => {
const tokens = analyze('#123'); const tokens = analyze('#123');
assert.deepEqual([ assert.deepEqual([