diff --git a/internal/model/account.go b/internal/model/account.go index 0ecd146..e9f6807 100644 --- a/internal/model/account.go +++ b/internal/model/account.go @@ -60,23 +60,23 @@ func (a Account) String() string { format := ` %s (@%s) -ACCOUNT ID: +%s %s -JOINED ON: +%s %s -STATS: +%s Followers: %d Following: %d Statuses: %d -BIOGRAPHY: +%s %s -METADATA: %s +%s %s -ACCOUNT URL: +%s %s ` metadata := "" @@ -93,13 +93,19 @@ ACCOUNT URL: format, a.DisplayName, a.Username, + utilities.Header("ACCOUNT ID:"), a.ID, + utilities.Header("JOINED ON:"), a.CreatedAt.Format("02 Jan 2006"), + utilities.Header("STATS:"), a.FollowersCount, a.FollowingCount, a.StatusCount, + utilities.Header("BIOGRAPHY:"), utilities.WrapLine(utilities.StripHTMLTags(a.Note), "\n ", 80), + utilities.Header("METADATA:"), metadata, + utilities.Header("ACCOUNT URL:"), a.URL, ) } diff --git a/internal/model/instance_v2.go b/internal/model/instance_v2.go index 47ebbad..a7dba28 100644 --- a/internal/model/instance_v2.go +++ b/internal/model/instance_v2.go @@ -1,6 +1,10 @@ package model -import "fmt" +import ( + "fmt" + + "codeflow.dananglin.me.uk/apollo/enbas/internal/utilities" +) type InstanceV2 struct { AccountDomain string `json:"account_domain"` @@ -109,16 +113,16 @@ type InstanceV2Users struct { func (i InstanceV2) String() string { format := ` -INSTANCE: +%s %s - %s -DOMAIN: +%s %s -VERSION: +%s Running GoToSocial %s -CONTACT: +%s name: %s username: %s email: %s @@ -126,10 +130,14 @@ CONTACT: return fmt.Sprintf( format, + utilities.Header("INSTANCE:"), i.Title, i.Description, + utilities.Header("DOMAIN:"), i.Domain, + utilities.Header("VERSION:"), i.Version, + utilities.Header("CONTACT:"), i.Contact.Account.DisplayName, i.Contact.Account.Username, i.Contact.Email, diff --git a/internal/model/status.go b/internal/model/status.go index b5826b7..7f9d534 100644 --- a/internal/model/status.go +++ b/internal/model/status.go @@ -156,24 +156,24 @@ func (s Status) String() string { format := ` %s (@%s) -CONTENT: +%s %s -STATUS ID: +%s %s -CREATED AT: +%s %s -STATS: +%s Boosts: %d Likes: %d Replies: %d -VISIBILITY: +%s %s -URL: +%s %s ` @@ -181,13 +181,19 @@ URL: format, s.Account.DisplayName, s.Account.Username, + utilities.Header("CONTENT:"), utilities.StripHTMLTags(s.Content), + utilities.Header("STATUS ID:"), s.ID, + utilities.Header("CREATED AT:"), s.CreatedAt.Format("02 Jan 2006, 03:04"), + utilities.Header("STATS:"), s.RebloggsCount, s.FavouritesCount, s.RepliesCount, + utilities.Header("VISIBILITY:"), s.Visibility, + utilities.Header("URL:"), s.URL, ) } diff --git a/internal/utilities/utilities.go b/internal/utilities/utilities.go index b5147b7..1c6c69e 100644 --- a/internal/utilities/utilities.go +++ b/internal/utilities/utilities.go @@ -7,6 +7,11 @@ import ( "golang.org/x/net/html" ) +const ( + reset = "\033[0m" + boldblue = "\033[34;1m" +) + func StripHTMLTags(text string) string { token := html.NewTokenizer(strings.NewReader(text)) @@ -45,3 +50,7 @@ func WrapLine(line, separator string, charLimit int) string { return builder.String() } + +func Header(text string) string { + return boldblue + text + reset +}