Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add angle bracket covered url syntax to mfm (#4483)

Browse source 
* Add angle bracket covered url syntax to mfm

* Fix path

* Fix match

* Fix index
This commit is contained in:
Acid Chicken (硫酸鶏) 2019-03-14 21:23:15 +09:00 • committed by GitHub
parent 0f65b1bcc5
commit 38656103c0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 37 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/mfm/language.ts
View file

@ -1,5 +1,5 @@
import * as P from 'parsimmon';
import { createLeaf, createTree } from './types';
import { createLeaf, createTree, urlRegex } from './prelude';
import { takeWhile, cumulativeSum } from '../prelude/array';
import parseAcct from '../misc/acct/parse';
import { toUnicode } from 'punycode';
@ -154,9 +154,16 @@ export const mfmLanguage = P.createLanguage({
url: () => {
return P((input, i) => {
const text = input.substr(i);
const match = text.match(/^https?:\/\/[\w\/:%#@\$&\?!\(\)\[\]~\.,=\+\-]+/);
if (!match) return P.makeFailure(i, 'not a url');
let url = match[0];
const match = text.match(urlRegex);
let url: string;
if (!match) {
const match = text.match(/^<(https?:\/\/.*?)>/);
if (!match)
return P.makeFailure(i, 'not a url');
url = match[1];
i += 2;
} else
url = match[0];
url = removeOrphanedBrackets(url);
if (url.endsWith('.')) url = url.substr(0, url.lastIndexOf('.'));
if (url.endsWith(',')) url = url.substr(0, url.lastIndexOf(','));