Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Sharkey
Manage
Activity
Members
Labels
Plan
Issues
336
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
23
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TransFem.org
Sharkey
Commits
4ecd036d
Unverified
Commit
4ecd036d
authored
4 years ago
by
MeiMei
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Fix HTML to MFM (#7150)
* Fix type * Fix HTML to MFM
parent
b2fb92cf
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/mfm/from-html.ts
+43
-19
43 additions, 19 deletions
src/mfm/from-html.ts
test/mfm.ts
+12
-0
12 additions, 0 deletions
test/mfm.ts
with
55 additions
and
19 deletions
src/mfm/from-html.ts
+
43
−
19
View file @
4ecd036d
import
{
parseFragment
,
DefaultTreeDocumentFragment
}
from
'
parse5
'
;
import
{
urlRegexFull
}
from
'
./prelude
'
;
import
*
as
parse5
from
'
parse5
'
;
import
treeAdapter
=
require
(
'
parse5/lib/tree-adapters/default
'
);
import
{
URL
}
from
'
url
'
;
import
{
urlRegex
,
urlRegexFull
}
from
'
./prelude
'
;
export
function
fromHtml
(
html
:
string
,
hashtagNames
?:
string
[]):
string
{
const
dom
=
parseFragment
(
html
)
as
DefaultTreeDocumentFragment
;
const
dom
=
parse5
.
parseFragment
(
html
);
let
text
=
''
;
...
...
@@ -12,30 +14,35 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
return
text
.
trim
();
function
getText
(
node
:
any
):
string
{
if
(
node
.
nodeName
===
'
#text
'
)
return
node
.
value
;
function
getText
(
node
:
parse5
.
Node
):
string
{
if
(
treeAdapter
.
isTextNode
(
node
))
return
node
.
value
;
if
(
!
treeAdapter
.
isElementNode
(
node
))
return
''
;
if
(
node
.
childNodes
)
{
return
node
.
childNodes
.
map
(
(
n
:
any
)
=>
getText
(
n
)).
join
(
''
);
return
node
.
childNodes
.
map
(
n
=>
getText
(
n
)).
join
(
''
);
}
return
''
;
}
function
analyze
(
node
:
any
)
{
switch
(
n
ode
.
node
Name
)
{
case
'
#text
'
:
text
+=
node
.
value
;
break
;
function
analyze
(
node
:
parse5
.
Node
)
{
if
(
treeAdapter
.
isTextN
ode
(
node
)
)
{
text
+=
node
.
value
;
return
;
}
// Skip comment or document type node
if
(
!
treeAdapter
.
isElementNode
(
node
))
return
;
switch
(
node
.
nodeName
)
{
case
'
br
'
:
text
+=
'
\n
'
;
break
;
case
'
a
'
:
const
txt
=
getText
(
node
);
const
rel
=
node
.
attrs
.
find
(
(
x
:
any
)
=>
x
.
name
===
'
rel
'
);
const
href
=
node
.
attrs
.
find
(
(
x
:
any
)
=>
x
.
name
===
'
href
'
);
const
rel
=
node
.
attrs
.
find
(
x
=>
x
.
name
===
'
rel
'
);
const
href
=
node
.
attrs
.
find
(
x
=>
x
.
name
===
'
href
'
);
// ハッシュタグ
if
(
hashtagNames
&&
href
&&
hashtagNames
.
map
(
x
=>
x
.
toLowerCase
()).
includes
(
txt
.
toLowerCase
()))
{
...
...
@@ -44,7 +51,7 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
}
else
if
(
txt
.
startsWith
(
'
@
'
)
&&
!
(
rel
&&
rel
.
value
.
match
(
/^me /
)))
{
const
part
=
txt
.
split
(
'
@
'
);
if
(
part
.
length
===
2
)
{
if
(
part
.
length
===
2
&&
href
)
{
//#region ホスト名部分が省略されているので復元する
const
acct
=
`
${
txt
}
@
${(
new
URL
(
href
.
value
)).
hostname
}
`
;
text
+=
acct
;
...
...
@@ -54,11 +61,28 @@ export function fromHtml(html: string, hashtagNames?: string[]): string {
}
// その他
}
else
{
text
+=
!
href
?
txt
:
txt
===
href
.
value
?
txt
.
match
(
urlRegexFull
)
?
txt
:
`<
${
txt
}
>`
:
`[
${
txt
}
](
${
href
.
value
}
)`
;
const
generateLink
=
()
=>
{
if
(
!
href
&&
!
txt
)
{
return
''
;
}
if
(
!
href
)
{
return
txt
;
}
if
(
!
txt
||
txt
===
href
.
value
)
{
// #6383: Missing text node
if
(
href
.
value
.
match
(
urlRegexFull
))
{
return
href
.
value
;
}
else
{
return
`<
${
href
.
value
}
>`
;
}
}
if
(
href
.
value
.
match
(
urlRegex
)
&&
!
href
.
value
.
match
(
urlRegexFull
))
{
return
`[
${
txt
}
](<
${
href
.
value
}
>)`
;
// #6846
}
else
{
return
`[
${
txt
}
](
${
href
.
value
}
)`
;
}
};
text
+=
generateLink
();
}
break
;
...
...
This diff is collapsed.
Click to expand it.
test/mfm.ts
+
12
−
0
View file @
4ecd036d
...
...
@@ -1167,6 +1167,10 @@ describe('fromHtml', () => {
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 different text, but not encoded
'
,
()
=>
{
assert
.
deepStrictEqual
(
fromHtml
(
'
<p>a <a href="https://example.com/ä">c</a> d</p>
'
),
'
a [c](<https://example.com/ä>) 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
'
);
});
...
...
@@ -1183,6 +1187,14 @@ describe('fromHtml', () => {
assert
.
deepStrictEqual
(
fromHtml
(
'
<p>a <a>c</a> d</p>
'
),
'
a c d
'
);
});
it
(
'
link without text
'
,
()
=>
{
assert
.
deepStrictEqual
(
fromHtml
(
'
<p>a <a href="https://example.com/b"></a> d</p>
'
),
'
a https://example.com/b d
'
);
});
it
(
'
link without both
'
,
()
=>
{
assert
.
deepStrictEqual
(
fromHtml
(
'
<p>a <a></a> d</p>
'
),
'
a 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
'
);
});
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment