Compare commits
1 commit
cc4e91295e
...
0e26b65a54
Author | SHA1 | Date | |
---|---|---|---|
0e26b65a54 |
3 changed files with 6 additions and 26 deletions
|
@ -32,7 +32,7 @@ func (p Printer) PrintAccount(account model.Account, relationship *model.Account
|
|||
builder.WriteString("\n\n" + p.headerFormat("METADATA:"))
|
||||
|
||||
for _, field := range account.Fields {
|
||||
builder.WriteString("\n" + p.fieldFormat(field.Name) + ": " + utilities.ConvertHTMLToText(field.Value))
|
||||
builder.WriteString("\n" + p.fieldFormat(field.Name) + ": " + field.Value)
|
||||
}
|
||||
|
||||
builder.WriteString("\n\n" + p.headerFormat("ACCOUNT URL:"))
|
||||
|
|
|
@ -13,8 +13,7 @@ import (
|
|||
)
|
||||
|
||||
const (
|
||||
minTerminalWidth = 40
|
||||
noMediaDescription = "This media has no description."
|
||||
minTerminalWidth = 40
|
||||
)
|
||||
|
||||
type theme struct {
|
||||
|
|
|
@ -22,24 +22,6 @@ func (p Printer) PrintStatus(status model.Status) {
|
|||
builder.WriteString("\n\n" + p.headerFormat("CONTENT:"))
|
||||
builder.WriteString(utilities.WrapLines(utilities.ConvertHTMLToText(status.Content), "\n", p.maxTerminalWidth))
|
||||
|
||||
// Details of media attachments (if any).
|
||||
if len(status.MediaAttachments) > 0 {
|
||||
builder.WriteString("\n\n" + p.headerFormat("MEDIA ATTACHMENTS:"))
|
||||
|
||||
for ind, media := range status.MediaAttachments {
|
||||
builder.WriteString("\n\n[" + strconv.Itoa(ind) + "] " + p.fieldFormat("ID:") + " " + media.ID)
|
||||
builder.WriteString("\n " + p.fieldFormat("Type:") + " " + media.Type)
|
||||
|
||||
description := media.Description
|
||||
if description == "" {
|
||||
description = noMediaDescription
|
||||
}
|
||||
|
||||
builder.WriteString("\n " + p.fieldFormat("Description:") + " " + description)
|
||||
builder.WriteString("\n " + p.fieldFormat("Media URL:") + " " + media.URL)
|
||||
}
|
||||
}
|
||||
|
||||
// If a poll exists in a status, write the contents to the builder.
|
||||
if status.Poll != nil {
|
||||
builder.WriteString(p.pollOptions(*status.Poll))
|
||||
|
@ -100,12 +82,11 @@ func (p Printer) PrintStatusList(list model.StatusList) {
|
|||
for _, media := range status.MediaAttachments {
|
||||
builder.WriteString("\n\n" + p.imageIcon + " Media (" + media.ID + ")" + "\n ")
|
||||
|
||||
description := media.Description
|
||||
if description == "" {
|
||||
description = noMediaDescription
|
||||
if media.Description == "" {
|
||||
builder.WriteString("This media has no description.")
|
||||
} else {
|
||||
builder.WriteString(utilities.WrapLines(media.Description, "\n ", p.maxTerminalWidth-3))
|
||||
}
|
||||
|
||||
builder.WriteString(utilities.WrapLines(description, "\n ", p.maxTerminalWidth-3))
|
||||
}
|
||||
|
||||
builder.WriteString(
|
||||
|
|
Loading…
Reference in a new issue