yume/paricafe
1
0
Fork 0
mirror of https://github.com/paricafe/misskey.git synced 2024-11-28 14:16:44 -06:00
Code Issues Projects Releases Packages Wiki Activity

[MFM] Better hashtag parsing

Browse source
This commit is contained in:
syuilo 2018-11-25 04:44:42 +09:00
parent 02b07c1b5b
commit 3b10e93efe
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/mfm/parser.ts
View file

@ -112,9 +112,27 @@ const mfm = P.createLanguage({
const text = input.substr(i);
const match = text.match(/^#([^\s\.,!\?#]+)/i);
if (!match) 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 "#"');
return P.makeSuccess(i + match[0].length, makeNode('hashtag', { hashtag: match[1] }));
let hashtag = match[1];
let pendingBracket = 0;
const end = hashtag.split('').findIndex(char => {
if (char == ')') {
if (pendingBracket > 0) {
pendingBracket--;
return false;
} else {
return true;
}
} else if (char == '(') {
pendingBracket++;
return false;
} else {
return false;
}
});
if (end > 0) hashtag = hashtag.substr(0, end);
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 "#"');
return P.makeSuccess(i + ('#' + hashtag).length, makeNode('hashtag', { hashtag: hashtag }));
}),
//#endregion

25
test/mfm.ts
View file

@ -212,12 +212,37 @@ describe('Text', () => {
], tokens);
});
it('with brackets', () => {
const tokens = analyze('(#foo)');
assert.deepEqual([
text('('),
node('hashtag', { hashtag: 'foo' }),
text(')'),
], tokens);
});
it('with brackets (space before)', () => {
const tokens = analyze('(bar #foo)');
assert.deepEqual([
text('(bar '),
node('hashtag', { hashtag: 'foo' }),
text(')'),
], tokens);
});
it('disallow number only', () => {
const tokens = analyze('#123');
assert.deepEqual([
text('#123'),
], tokens);
});
it('disallow number only (with brackets)', () => {
const tokens = analyze('(#123)');
assert.deepEqual([
text('(#123)'),
], tokens);
});
});
describe('quote', () => {