checkpoint: use Content instead of Text

Content from Mastodon statuses are not converted to plain text server
side unfortunately so it needs to be done client side.

Display messages from the Content field and run the content through the
StripHTMLTags function before printing.
This commit is contained in:
Dan Anglin 2024-05-26 03:09:47 +01:00
parent 7a3f2928de
commit 6844c6e348
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
3 changed files with 4 additions and 4 deletions

View file

@ -182,7 +182,7 @@ func (s Status) String() string {
utilities.DisplayNameFormat(s.Account.DisplayName), utilities.DisplayNameFormat(s.Account.DisplayName),
s.Account.Username, s.Account.Username,
utilities.HeaderFormat("CONTENT:"), utilities.HeaderFormat("CONTENT:"),
utilities.WrapLines(s.Text, "\n ", 80), utilities.WrapLines(s.Content, "\n ", 80),
utilities.HeaderFormat("STATUS ID:"), utilities.HeaderFormat("STATUS ID:"),
s.ID, s.ID,
utilities.HeaderFormat("CREATED AT:"), utilities.HeaderFormat("CREATED AT:"),

View file

@ -16,11 +16,11 @@ func (t Timeline) String() string {
separator := "────────────────────────────────────────────────────────────────────────────────" separator := "────────────────────────────────────────────────────────────────────────────────"
builder.WriteString(t.Name + "\n" + separator + "\n") builder.WriteString(utilities.HeaderFormat(t.Name) + "\n\n")
for _, status := range t.Statuses { for _, status := range t.Statuses {
builder.WriteString(utilities.DisplayNameFormat(status.Account.DisplayName) + " (@" + status.Account.Username + ")\n\n") builder.WriteString(utilities.DisplayNameFormat(status.Account.DisplayName) + " (@" + status.Account.Username + ")\n\n")
builder.WriteString(utilities.WrapLines(status.Text, "\n", 80) + "\n\n") builder.WriteString(utilities.WrapLines(utilities.StripHTMLTags(status.Content), "\n", 80) + "\n\n")
builder.WriteString(utilities.FieldFormat("ID:") + " " + status.ID + "\t" + utilities.FieldFormat("Created at:") + " " + utilities.FormatTime(status.CreatedAt) + "\n") builder.WriteString(utilities.FieldFormat("ID:") + " " + status.ID + "\t" + utilities.FieldFormat("Created at:") + " " + utilities.FormatTime(status.CreatedAt) + "\n")
builder.WriteString(separator + "\n") builder.WriteString(separator + "\n")
} }

View file

@ -43,7 +43,7 @@ func StripHTMLTags(text string) string {
case html.ErrorToken: case html.ErrorToken:
return builder.String() return builder.String()
case html.TextToken: case html.TextToken:
text := token.Token().String() text := token.Token().Data
builder.WriteString(text) builder.WriteString(text)
case html.StartTagToken: case html.StartTagToken:
tag := token.Token().String() tag := token.Token().String()