sphericalkat/medium.rip
1
0
Fork 0
mirror of https://github.com/SphericalKat/medium.rip.git synced 2024-12-26 01:25:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(markup): only escape innermost markup

Browse Source 
Signed-off-by: Sphericalkat <amolele@gmail.com>
This commit is contained in:
Amogh Lele 2023-05-29 13:34:42 +05:30
parent ce73ad4dfc
commit 8e68c7bcc2
4 changed files with 580 additions and 789 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkg/converters/markup_converter.go
View File

@ -82,36 +82,39 @@ func ConvertMarkup(text string, markups []entities.Markup) string {
utf16Text := utf16.Encode([]rune(text))
ranged := utf16Text[r.Range[0]:r.Range[1]]
textToWrap := string(utf16.Decode(ranged))
markedUp.WriteString(wrapInMarkups(textToWrap, r.Markups))
markedUp.WriteString(wrapInMarkups(textToWrap, r.Markups, false))
}
return markedUp.String()
}
func wrapInMarkups(child string, markups []entities.Markup) string {
func wrapInMarkups(child string, markups []entities.Markup, childIsMarkup bool) string {
if len(markups) == 0 {
return child
}
if !childIsMarkup {
child = html.EscapeString(child)
}
markedUp := markupNodeInContainer(child, markups[0])
return wrapInMarkups(markedUp, markups[1:])
return wrapInMarkups(markedUp, markups[1:], true)
}
func markupNodeInContainer(child string, markup entities.Markup) string {
switch markup.Type {
case "A":
if markup.Href != nil {
return fmt.Sprintf(`<a href="%s">%s</a>`, *markup.Href, html.EscapeString(child))
return fmt.Sprintf(`<a href="%s">%s</a>`, *markup.Href, child)
} else if markup.UserID != nil {
return fmt.Sprintf(`<a href="https://medium.com/u/%s">%s</a>`, markup.UserID, html.EscapeString(child))
return fmt.Sprintf(`<a href="https://medium.com/u/%s">%s</a>`, markup.UserID, child)
}
case "CODE":
return fmt.Sprintf(`<code>%s</code>`, html.EscapeString(child))
return fmt.Sprintf(`<code>%s</code>`, child)
case "EM":
return fmt.Sprintf(`<em>%s</em>`, html.EscapeString(child))
return fmt.Sprintf(`<em>%s</em>`, child)
case "STRONG":
return fmt.Sprintf(`<strong>%s</strong>`, html.EscapeString(child))
return fmt.Sprintf(`<strong>%s</strong>`, child)
default:
return fmt.Sprintf(`<code>%s</code>`, html.EscapeString(child))
return fmt.Sprintf(`<code>%s</code>`, child)
}
return html.EscapeString(child)
return child
}

5
pkg/converters/paragraph_converter.go
View File

@ -58,7 +58,10 @@ func ConvertParagraphs(paragraphs []entities.Paragraph) string {
}
switch p.Type {
case "BQ", "MIXTAPE_EMBED", "PQ":
case "BQ", "PQ":
children := ConvertMarkup(p.Text, p.Markups)
ps.WriteString(fmt.Sprintf("<blockquote><p>%s</p></blockquote>", children))
case "MIXTAPE_EMBED":
children := ConvertMarkup(p.Text, p.Markups)
ps.WriteString(fmt.Sprintf("<blockquote><p>%s</p></blockquote>", children))
case "H2":

1333
response.json
View File

File diff suppressed because it is too large Load Diff