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

Fix MFM URL parsing

Browse source
This commit is contained in:
syuilo 2019-06-17 20:15:19 +09:00
parent 63c659bc8f
commit 285d0d13f9
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mfm/language.ts
View file

@ -164,8 +164,10 @@ export const mfmLanguage = P.createLanguage({
} else } else
url = match[0]; url = match[0];
url = removeOrphanedBrackets(url); url = removeOrphanedBrackets(url);
if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.')); while (url.endsWith('.') || url.endsWith(',')) {
if (url.endsWith(',')) url = url.substr(0, url.lastIndexOf(',')); if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.'));
if (url.endsWith(',')) url = url.substr(0, url.lastIndexOf(','));
}
return P.makeSuccess(i + url.length, url); return P.makeSuccess(i + url.length, url);
}).map(x => createLeaf('url', { url: x })); }).map(x => createLeaf('url', { url: x }));
}, },

8
test/mfm.ts
View file

@ -804,6 +804,14 @@ describe('MFM', () => {
]); ]);
}); });
it('ignore trailing periods', () => {
const tokens = parse('https://example.com...');
assert.deepStrictEqual(tokens, [
leaf('url', { url: 'https://example.com' }),
text('...')
]);
});
it('with comma', () => { it('with comma', () => {
const tokens = parse('https://example.com/foo?bar=a,b'); const tokens = parse('https://example.com/foo?bar=a,b');
assert.deepStrictEqual(tokens, [ assert.deepStrictEqual(tokens, [