natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #2949

This commit is contained in:
syuilo 2018-10-20 09:03:04 +09:00
parent 7d1ab6102f
commit 70d0937aab
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mfm/parse/elements/hashtag.ts
View File

@ -9,9 +9,9 @@ export type TextElementHashtag = {
}; };
export default function(text: string, i: number) { export default function(text: string, i: number) {
if (!(/^\s#[^\s\.,]+/.test(text) || (i == 0 && /^#[^\s\.,]+/.test(text)))) return null; if (!(/^\s#[^\s\.,!\?]+/.test(text) || (i == 0 && /^#[^\s\.,!\?]+/.test(text)))) return null;
const isHead = text.startsWith('#'); const isHead = text.startsWith('#');
const hashtag = text.match(/^\s?#[^\s\.,]+/)[0]; const hashtag = text.match(/^\s?#[^\s\.,!\?]+/)[0];
const res: any[] = !isHead ? [{ const res: any[] = !isHead ? [{
type: 'text', type: 'text',
content: text[0] content: text[0]

5
test/mfm.ts
View File

@ -122,6 +122,11 @@ describe('Text', () => {
{ type: 'hashtag', content: '#piyo', hashtag: 'piyo' }, { type: 'hashtag', content: '#piyo', hashtag: 'piyo' },
{ type: 'text', content: '.' } { type: 'text', content: '.' }
], tokens2); ], tokens2);
const tokens3 = analyze('#Foo!');
assert.deepEqual([
{ type: 'text', content: '#Foo!' },
], tokens3);
}); });
it('quote', () => { it('quote', () => {