mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-12-23 18:03:08 +02:00
In HTML to MFM, use angle bracket if needed (#6817)
This commit is contained in:
parent
a8776002f3
commit
27d0ac3d75
3 changed files with 43 additions and 3 deletions
|
@ -1,5 +1,5 @@
|
|||
import { parseFragment, DefaultTreeDocumentFragment } from 'parse5';
|
||||
import { urlRegex } from './prelude';
|
||||
import { urlRegexFull } from './prelude';
|
||||
|
||||
export function fromHtml(html: string, hashtagNames?: string[]): string {
|
||||
const dom = parseFragment(html) as DefaultTreeDocumentFragment;
|
||||
|
@ -54,7 +54,11 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
|
|||
}
|
||||
// その他
|
||||
} else {
|
||||
text += (!href || (txt === href.value && txt.match(urlRegex))) ? txt : `[${txt}](${href.value})`;
|
||||
text += !href ? txt
|
||||
: txt === href.value
|
||||
? txt.match(urlRegexFull) ? txt
|
||||
: `<${txt}>`
|
||||
: `[${txt}](${href.value})`;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
|
@ -36,4 +36,5 @@ export function createTree(type: string, children: MfmForest, props: any): MfmTr
|
|||
return T.createTree({ type, props }, children);
|
||||
}
|
||||
|
||||
export const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
|
||||
export const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
|
||||
export const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
|
||||
|
|
35
test/mfm.ts
35
test/mfm.ts
|
@ -12,6 +12,7 @@ import * as assert from 'assert';
|
|||
|
||||
import { parse, parsePlain } from '../src/mfm/parse';
|
||||
import { toHtml } from '../src/mfm/to-html';
|
||||
import { fromHtml } from '../src/mfm/from-html';
|
||||
import { toString } from '../src/mfm/to-string';
|
||||
import { createTree as tree, createLeaf as leaf, MfmTree } from '../src/mfm/prelude';
|
||||
import { removeOrphanedBrackets } from '../src/mfm/language';
|
||||
|
@ -1199,3 +1200,37 @@ describe('MFM', () => {
|
|||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('fromHtml', () => {
|
||||
it('br', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>abc<br><br/>d</p>'), 'abc\n\nd');
|
||||
});
|
||||
|
||||
it('link with different text', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b">c</a> d</p>'), 'a [c](https://example.com/b) d');
|
||||
});
|
||||
|
||||
it('link with same text', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/b">https://example.com/b</a> d</p>'), 'a https://example.com/b d');
|
||||
});
|
||||
|
||||
it('link with same text, but not encoded', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/ä">https://example.com/ä</a> d</p>'), 'a <https://example.com/ä> d');
|
||||
});
|
||||
|
||||
it('link with no url', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a href="b">c</a> d</p>'), 'a [c](b) d');
|
||||
});
|
||||
|
||||
it('link without href', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a>c</a> d</p>'), 'a c d');
|
||||
});
|
||||
|
||||
it('mention', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/@user" class="u-url mention">@user</a> d</p>'), 'a @user@example.com d');
|
||||
});
|
||||
|
||||
it('hashtag', () => {
|
||||
assert.deepStrictEqual(fromHtml('<p>a <a href="https://example.com/tags/a">#a</a> d</p>', ['#a']), 'a #a d');
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Reference in a new issue