Compare commits
No commits in common. "0928803a34c3a8e2f595ae29d127d9b4d450d565" and "72c2c4796a52dd1bdf7a6971b3a1ff51675db4ce" have entirely different histories.
0928803a34
...
72c2c4796a
5 changed files with 32 additions and 49 deletions
|
@ -67,9 +67,9 @@ func (a Account) String() string {
|
||||||
%s
|
%s
|
||||||
|
|
||||||
%s
|
%s
|
||||||
%s %d
|
Followers: %d
|
||||||
%s %d
|
Following: %d
|
||||||
%s %d
|
Statuses: %d
|
||||||
|
|
||||||
%s
|
%s
|
||||||
%s
|
%s
|
||||||
|
@ -84,28 +84,28 @@ func (a Account) String() string {
|
||||||
for _, field := range a.Fields {
|
for _, field := range a.Fields {
|
||||||
metadata += fmt.Sprintf(
|
metadata += fmt.Sprintf(
|
||||||
"\n %s: %s",
|
"\n %s: %s",
|
||||||
utilities.FieldFormat(field.Name),
|
field.Name,
|
||||||
utilities.StripHTMLTags(field.Value),
|
utilities.StripHTMLTags(field.Value),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
format,
|
format,
|
||||||
utilities.DisplayNameFormat(a.DisplayName),
|
a.DisplayName,
|
||||||
a.Username,
|
a.Username,
|
||||||
utilities.HeaderFormat("ACCOUNT ID:"),
|
utilities.Header("ACCOUNT ID:"),
|
||||||
a.ID,
|
a.ID,
|
||||||
utilities.HeaderFormat("JOINED ON:"),
|
utilities.Header("JOINED ON:"),
|
||||||
utilities.FormatDate(a.CreatedAt),
|
utilities.FormatDate(a.CreatedAt),
|
||||||
utilities.HeaderFormat("STATS:"),
|
utilities.Header("STATS:"),
|
||||||
utilities.FieldFormat("Followers:"), a.FollowersCount,
|
a.FollowersCount,
|
||||||
utilities.FieldFormat("Followeing:"), a.FollowingCount,
|
a.FollowingCount,
|
||||||
utilities.FieldFormat("Statuses:"), a.StatusCount,
|
a.StatusCount,
|
||||||
utilities.HeaderFormat("BIOGRAPHY:"),
|
utilities.Header("BIOGRAPHY:"),
|
||||||
utilities.WrapLine(utilities.StripHTMLTags(a.Note), "\n ", 80),
|
utilities.WrapLine(utilities.StripHTMLTags(a.Note), "\n ", 80),
|
||||||
utilities.HeaderFormat("METADATA:"),
|
utilities.Header("METADATA:"),
|
||||||
metadata,
|
metadata,
|
||||||
utilities.HeaderFormat("ACCOUNT URL:"),
|
utilities.Header("ACCOUNT URL:"),
|
||||||
a.URL,
|
a.URL,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -123,26 +123,23 @@ func (i InstanceV2) String() string {
|
||||||
Running GoToSocial %s
|
Running GoToSocial %s
|
||||||
|
|
||||||
%s
|
%s
|
||||||
%s %s
|
name: %s
|
||||||
%s %s
|
username: %s
|
||||||
%s %s
|
email: %s
|
||||||
`
|
`
|
||||||
|
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
format,
|
format,
|
||||||
utilities.HeaderFormat("INSTANCE:"),
|
utilities.Header("INSTANCE:"),
|
||||||
i.Title,
|
i.Title,
|
||||||
i.Description,
|
i.Description,
|
||||||
utilities.HeaderFormat("DOMAIN:"),
|
utilities.Header("DOMAIN:"),
|
||||||
i.Domain,
|
i.Domain,
|
||||||
utilities.HeaderFormat("VERSION:"),
|
utilities.Header("VERSION:"),
|
||||||
i.Version,
|
i.Version,
|
||||||
utilities.HeaderFormat("CONTACT:"),
|
utilities.Header("CONTACT:"),
|
||||||
utilities.FieldFormat("Name:"),
|
i.Contact.Account.DisplayName,
|
||||||
utilities.DisplayNameFormat(i.Contact.Account.DisplayName),
|
|
||||||
utilities.FieldFormat("Username:"),
|
|
||||||
i.Contact.Account.Username,
|
i.Contact.Account.Username,
|
||||||
utilities.FieldFormat("Email:"),
|
|
||||||
i.Contact.Email,
|
i.Contact.Email,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -179,21 +179,21 @@ func (s Status) String() string {
|
||||||
|
|
||||||
return fmt.Sprintf(
|
return fmt.Sprintf(
|
||||||
format,
|
format,
|
||||||
utilities.DisplayNameFormat(s.Account.DisplayName),
|
s.Account.DisplayName,
|
||||||
s.Account.Username,
|
s.Account.Username,
|
||||||
utilities.HeaderFormat("CONTENT:"),
|
utilities.Header("CONTENT:"),
|
||||||
utilities.StripHTMLTags(s.Content),
|
utilities.StripHTMLTags(s.Content),
|
||||||
utilities.HeaderFormat("STATUS ID:"),
|
utilities.Header("STATUS ID:"),
|
||||||
s.ID,
|
s.ID,
|
||||||
utilities.HeaderFormat("CREATED AT:"),
|
utilities.Header("CREATED AT:"),
|
||||||
utilities.FormatTime(s.CreatedAt),
|
utilities.FormatTime(s.CreatedAt),
|
||||||
utilities.HeaderFormat("STATS:"),
|
utilities.Header("STATS:"),
|
||||||
s.RebloggsCount,
|
s.RebloggsCount,
|
||||||
s.FavouritesCount,
|
s.FavouritesCount,
|
||||||
s.RepliesCount,
|
s.RepliesCount,
|
||||||
utilities.HeaderFormat("VISIBILITY:"),
|
utilities.Header("VISIBILITY:"),
|
||||||
s.Visibility,
|
s.Visibility,
|
||||||
utilities.HeaderFormat("URL:"),
|
utilities.Header("URL:"),
|
||||||
s.URL,
|
s.URL,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,9 +19,9 @@ func (t Timeline) String() string {
|
||||||
builder.WriteString(t.Name + "\n" + separator + "\n")
|
builder.WriteString(t.Name + "\n" + separator + "\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(status.Account.DisplayName + " (@" + status.Account.Username + ")\n\n")
|
||||||
builder.WriteString(utilities.WrapLine(utilities.StripHTMLTags(status.Content), "\n", 80) + "\n\n")
|
builder.WriteString(utilities.WrapLine(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("ID: " + status.ID + "\tCreated at: " + utilities.FormatTime(status.CreatedAt) + "\n")
|
||||||
builder.WriteString(separator + "\n")
|
builder.WriteString(separator + "\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
package utilities
|
package utilities
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"regexp"
|
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
"unicode"
|
"unicode"
|
||||||
|
@ -12,8 +11,6 @@ import (
|
||||||
const (
|
const (
|
||||||
reset = "\033[0m"
|
reset = "\033[0m"
|
||||||
boldblue = "\033[34;1m"
|
boldblue = "\033[34;1m"
|
||||||
boldmagenta = "\033[35;1m"
|
|
||||||
green = "\033[32m"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func StripHTMLTags(text string) string {
|
func StripHTMLTags(text string) string {
|
||||||
|
@ -55,21 +52,10 @@ func WrapLine(line, separator string, charLimit int) string {
|
||||||
return builder.String()
|
return builder.String()
|
||||||
}
|
}
|
||||||
|
|
||||||
func HeaderFormat(text string) string {
|
func Header(text string) string {
|
||||||
return boldblue + text + reset
|
return boldblue + text + reset
|
||||||
}
|
}
|
||||||
|
|
||||||
func FieldFormat(text string) string {
|
|
||||||
return green + text + reset
|
|
||||||
}
|
|
||||||
|
|
||||||
func DisplayNameFormat(text string) string {
|
|
||||||
// use this pattern to remove all emoji strings
|
|
||||||
pattern := regexp.MustCompile(`\s:[A-Za-z0-9]*:`)
|
|
||||||
|
|
||||||
return boldmagenta + pattern.ReplaceAllString(text, "") + reset
|
|
||||||
}
|
|
||||||
|
|
||||||
func FormatDate(date time.Time) string {
|
func FormatDate(date time.Time) string {
|
||||||
return date.Local().Format("02 Jan 2006")
|
return date.Local().Format("02 Jan 2006")
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue