internal/model/account.go

@@ -88,7 +88,7 @@ func (a Account) Display(noColor bool) string {
 		metadata += fmt.Sprintf(
 			"\n  %s: %s",
 			utilities.FieldFormat(noColor, field.Name),
-			utilities.ConvertHTMLToText(field.Value),
+			utilities.StripHTMLTags(field.Value),
 		)
 	}
 
@@ -105,7 +105,7 @@ func (a Account) Display(noColor bool) string {
 		utilities.FieldFormat(noColor, "Following:"), a.FollowingCount,
 		utilities.FieldFormat(noColor, "Statuses:"), a.StatusCount,
 		utilities.HeaderFormat(noColor, "BIOGRAPHY:"),
-		utilities.WrapLines(utilities.ConvertHTMLToText(a.Note), "\n  ", 80),
+		utilities.WrapLines(utilities.StripHTMLTags(a.Note), "\n  ", 80),
 		utilities.HeaderFormat(noColor, "METADATA:"),
 		metadata,
 		utilities.HeaderFormat(noColor, "ACCOUNT URL:"),

internal/model/status.go

@@ -180,7 +180,7 @@ func (s Status) Display(noColor bool) string {
 		format,
 		utilities.DisplayNameFormat(noColor, s.Account.DisplayName), s.Account.Username,
 		utilities.HeaderFormat(noColor, "CONTENT:"),
-		utilities.WrapLines(utilities.ConvertHTMLToText(s.Content), "\n  ", 80),
+		utilities.WrapLines(utilities.StripHTMLTags(s.Content), "\n  ", 80),
 		utilities.HeaderFormat(noColor, "STATUS ID:"),
 		s.ID,
 		utilities.HeaderFormat(noColor, "CREATED AT:"),

internal/model/timeline.go

@@ -30,7 +30,7 @@ func (t Timeline) Display(noColor bool) string {
 			createdAt = status.Reblog.CreatedAt
 		}
 
-		builder.WriteString(utilities.WrapLines(utilities.ConvertHTMLToText(status.Content), "\n", 80) + "\n\n")
+		builder.WriteString(utilities.WrapLines(utilities.StripHTMLTags(status.Content), "\n", 80) + "\n\n")
 		builder.WriteString(utilities.FieldFormat(noColor, "ID:") + " " + statusID + "\t" + utilities.FieldFormat(noColor, "Created at:") + " " + utilities.FormatTime(createdAt) + "\n")
 		builder.WriteString(separator + "\n")
 	}

internal/utilities/html.go

@@ -1,27 +1,16 @@
 package utilities
 
 import (
-	"io"
-	"strconv"
 	"strings"
 
 	"golang.org/x/net/html"
 )
 
-const (
-	htmlNoList int = iota
-	htmlOrderedList
-	htmlUnorderedList
-)
-
-func ConvertHTMLToText(text string) string {
-	var builder strings.Builder
-
-	htmlList := htmlNoList
-	orderedListNumber := 1
-
+func StripHTMLTags(text string) string {
 	token := html.NewTokenizer(strings.NewReader(text))
 
+	var builder strings.Builder
+
 	for {
 		tt := token.Next()
 		switch tt {
@@ -32,35 +21,18 @@ func ConvertHTMLToText(text string) string {
 			builder.WriteString(text)
 		case html.StartTagToken, html.EndTagToken:
 			tag := token.Token().String()
-			htmlList, orderedListNumber = processTagToken(&builder, tag, htmlList, orderedListNumber)
+			builder.WriteString(transformTag(tag))
 		}
 	}
 }
 
-func processTagToken(writer io.StringWriter, tag string, htmlList, orderedListNumber int) (int, int) {
+func transformTag(tag string) string {
 	switch tag {
-	case "<br>", "<p>", "</p>", "</li>":
-		_, _ = writer.WriteString("\n")
-	case "<ul>":
-		htmlList = htmlUnorderedList
-		_, _ = writer.WriteString("\n")
-	case "<ol>":
-		htmlList = htmlOrderedList
-		_, _ = writer.WriteString("\n")
-	case "</ul>":
-		htmlList = htmlNoList
-	case "</ol>":
-		htmlList = htmlNoList
-		orderedListNumber = 1
-	case "<li>":
-		switch htmlList {
-		case htmlUnorderedList:
-			_, _ = writer.WriteString("• ")
-		case htmlOrderedList:
-			_, _ = writer.WriteString(strconv.Itoa(orderedListNumber) + ". ")
-			orderedListNumber++
-		}
+	case "<br>":
+		return "\n"
+	case "<p>", "</p>":
+		return "\n"
 	}
 
-	return htmlList, orderedListNumber
+	return ""
 }