fix(markup): only escape innermost markup

Signed-off-by: Sphericalkat <amolele@gmail.com>

frontend/index.html

@@ -13,7 +13,7 @@
     <title>RIP Medium</title>
 
     <script>
-          // On page load or when changing themes, best to add inline in `head` to avoid FOUC
+        // On page load or when changing themes, best to add inline in `head` to avoid FOUC
         if (localStorage.theme === 'dark' || (!('theme' in localStorage) && window.matchMedia('(prefers-color-scheme: dark)').matches)) {
             document.documentElement.classList.add('dark')
         } else {

pkg/converters/markup_converter.go

@@ -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
 }

pkg/converters/paragraph_converter.go

@@ -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":
@@ -132,7 +135,7 @@ func convertOli(ps []entities.Paragraph) (string, int) {
 			break
 		}
 	}
-	
+
 	return sb.String(), count
 }
 
@@ -149,6 +152,6 @@ func convertUli(ps []entities.Paragraph) (string, int) {
 			break
 		}
 	}
-	
+
 	return sb.String(), count
 }