graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-10 10:13:09 +02:00
Code Issues Projects Releases Packages Wiki Activity

[MFM] Improve hashtag detection

Browse source 
Resolve #3387
This commit is contained in:
syuilo 2018-11-23 16:02:17 +09:00
parent 73df6e0347
commit 1d1024c57a
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/mfm/parser.ts
View file

@ -112,6 +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 (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

@ -204,6 +204,13 @@ describe('Text', () => {
text('!'), text('!'),
], tokens); ], tokens);
}); });
it('disallow number only', () => {
const tokens = analyze('#123');
assert.deepEqual([
text('#123'),
], tokens);
});
}); });
describe('quote', () => { describe('quote', () => {