Compare commits
1 commit
7b9ef14d92
...
8ecc2ec301
Author | SHA1 | Date | |
---|---|---|---|
8ecc2ec301 |
5 changed files with 22 additions and 20 deletions
|
@ -65,7 +65,7 @@ type Field struct {
|
||||||
|
|
||||||
func (a Account) Display(noColor bool) string {
|
func (a Account) Display(noColor bool) string {
|
||||||
format := `
|
format := `
|
||||||
%s
|
%s (@%s)
|
||||||
|
|
||||||
%s
|
%s
|
||||||
%s
|
%s
|
||||||
|
@ -98,7 +98,8 @@ func (a Account) Display(noColor bool) string {
|
||||||
|
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
format,
|
format,
|
||||||
utilities.FullDisplayNameFormat(noColor, a.DisplayName, a.Acct),
|
utilities.DisplayNameFormat(noColor, a.DisplayName),
|
||||||
|
a.Username,
|
||||||
utilities.HeaderFormat(noColor, "ACCOUNT ID:"),
|
utilities.HeaderFormat(noColor, "ACCOUNT ID:"),
|
||||||
a.ID,
|
a.ID,
|
||||||
utilities.HeaderFormat(noColor, "JOINED ON:"),
|
utilities.HeaderFormat(noColor, "JOINED ON:"),
|
||||||
|
@ -217,7 +218,11 @@ func (a AccountList) Display(noColor bool) string {
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
for i := range a.Accounts {
|
for i := range a.Accounts {
|
||||||
output += "\n • " + utilities.FullDisplayNameFormat(noColor, a.Accounts[i].DisplayName, a.Accounts[i].Acct)
|
output += fmt.Sprintf(
|
||||||
|
"\n • %s (%s)",
|
||||||
|
utilities.DisplayNameFormat(noColor, a.Accounts[i].DisplayName),
|
||||||
|
a.Accounts[i].Acct,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -154,9 +154,9 @@ func (i InstanceV2) Display(noColor bool) string {
|
||||||
i.Version,
|
i.Version,
|
||||||
utilities.HeaderFormat(noColor, "CONTACT:"),
|
utilities.HeaderFormat(noColor, "CONTACT:"),
|
||||||
utilities.FieldFormat(noColor, "Name:"),
|
utilities.FieldFormat(noColor, "Name:"),
|
||||||
i.Contact.Account.DisplayName,
|
utilities.DisplayNameFormat(noColor, i.Contact.Account.DisplayName),
|
||||||
utilities.FieldFormat(noColor, "Username:"),
|
utilities.FieldFormat(noColor, "Username:"),
|
||||||
i.Contact.Account.Acct,
|
i.Contact.Account.Username,
|
||||||
utilities.FieldFormat(noColor, "Email:"),
|
utilities.FieldFormat(noColor, "Email:"),
|
||||||
i.Contact.Email,
|
i.Contact.Email,
|
||||||
)
|
)
|
||||||
|
|
|
@ -131,7 +131,11 @@ func (l List) Display(noColor bool) string {
|
||||||
|
|
||||||
if len(l.Accounts) > 0 {
|
if len(l.Accounts) > 0 {
|
||||||
for acct, name := range l.Accounts {
|
for acct, name := range l.Accounts {
|
||||||
output += "\n • " + utilities.FullDisplayNameFormat(noColor, name, acct)
|
output += fmt.Sprintf(
|
||||||
|
"\n • %s (%s)",
|
||||||
|
utilities.DisplayNameFormat(noColor, name),
|
||||||
|
acct,
|
||||||
|
)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
output += "\n None"
|
output += "\n None"
|
||||||
|
|
|
@ -159,7 +159,7 @@ type MediaDimensions struct {
|
||||||
|
|
||||||
func (s Status) Display(noColor bool) string {
|
func (s Status) Display(noColor bool) string {
|
||||||
format := `
|
format := `
|
||||||
%s
|
%s (@%s)
|
||||||
|
|
||||||
%s
|
%s
|
||||||
%s
|
%s
|
||||||
|
@ -183,7 +183,7 @@ func (s Status) Display(noColor bool) string {
|
||||||
|
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
format,
|
format,
|
||||||
utilities.FullDisplayNameFormat(noColor, s.Account.DisplayName, s.Account.Acct),
|
utilities.DisplayNameFormat(noColor, s.Account.DisplayName), s.Account.Username,
|
||||||
utilities.HeaderFormat(noColor, "CONTENT:"),
|
utilities.HeaderFormat(noColor, "CONTENT:"),
|
||||||
utilities.WrapLines(utilities.ConvertHTMLToText(s.Content), "\n ", 80),
|
utilities.WrapLines(utilities.ConvertHTMLToText(s.Content), "\n ", 80),
|
||||||
utilities.HeaderFormat(noColor, "STATUS ID:"),
|
utilities.HeaderFormat(noColor, "STATUS ID:"),
|
||||||
|
@ -214,13 +214,13 @@ func (s StatusList) Display(noColor bool) string {
|
||||||
builder.WriteString(utilities.HeaderFormat(noColor, s.Name) + "\n")
|
builder.WriteString(utilities.HeaderFormat(noColor, s.Name) + "\n")
|
||||||
|
|
||||||
for _, status := range s.Statuses {
|
for _, status := range s.Statuses {
|
||||||
builder.WriteString("\n" + utilities.FullDisplayNameFormat(noColor, status.Account.DisplayName, status.Account.Acct) + "\n")
|
builder.WriteString("\n" + utilities.DisplayNameFormat(noColor, status.Account.DisplayName) + " (@" + status.Account.Acct + ")\n")
|
||||||
|
|
||||||
statusID := status.ID
|
statusID := status.ID
|
||||||
createdAt := status.CreatedAt
|
createdAt := status.CreatedAt
|
||||||
|
|
||||||
if status.Reblog != nil {
|
if status.Reblog != nil {
|
||||||
builder.WriteString("reposted this status from " + utilities.FullDisplayNameFormat(noColor, status.Reblog.Account.DisplayName, status.Reblog.Account.Acct) + "\n")
|
builder.WriteString("reposted this status from " + utilities.DisplayNameFormat(noColor, status.Reblog.Account.DisplayName) + " (@" + status.Reblog.Account.Acct + ")\n")
|
||||||
statusID = status.Reblog.ID
|
statusID = status.Reblog.ID
|
||||||
createdAt = status.Reblog.CreatedAt
|
createdAt = status.Reblog.CreatedAt
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,7 +6,6 @@ package utilities
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
|
||||||
"time"
|
"time"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -33,21 +32,15 @@ func FieldFormat(noColor bool, text string) string {
|
||||||
return green + text + reset
|
return green + text + reset
|
||||||
}
|
}
|
||||||
|
|
||||||
func FullDisplayNameFormat(noColor bool, displayName, acct string) string {
|
func DisplayNameFormat(noColor bool, text string) string {
|
||||||
// use this pattern to remove all emoji strings
|
// use this pattern to remove all emoji strings
|
||||||
pattern := regexp.MustCompile(`\s:[A-Za-z0-9]*:`)
|
pattern := regexp.MustCompile(`\s:[A-Za-z0-9]*:`)
|
||||||
|
|
||||||
var builder strings.Builder
|
|
||||||
|
|
||||||
if noColor {
|
if noColor {
|
||||||
builder.WriteString(pattern.ReplaceAllString(displayName, ""))
|
return pattern.ReplaceAllString(text, "")
|
||||||
} else {
|
|
||||||
builder.WriteString(boldmagenta + pattern.ReplaceAllString(displayName, "") + reset)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
builder.WriteString(" (@" + acct + ")")
|
return boldmagenta + pattern.ReplaceAllString(text, "") + reset
|
||||||
|
|
||||||
return builder.String()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func FormatDate(date time.Time) string {
|
func FormatDate(date time.Time) string {
|
||||||
|
|
Loading…
Reference in a new issue