add a separator between statuses

Display timestamps such as when a status was created using local time.

cmd/enbas/show.go

@@ -7,29 +7,34 @@ import (
 
 	"codeflow.dananglin.me.uk/apollo/enbas/internal/client"
 	"codeflow.dananglin.me.uk/apollo/enbas/internal/config"
+	"codeflow.dananglin.me.uk/apollo/enbas/internal/model"
 )
 
 type showCommand struct {
 	*flag.FlagSet
-	myAccount  bool
+	myAccount       bool
-	targetType string
+	targetType      string
-	account    string
+	account         string
-	statusID   string
+	statusID        string
+	timelineType    string
+	timelineListID  string
+	timelineTagName string
+	timelineLimit   int
 }
 
 func newShowCommand(name, summary string) *showCommand {
 	command := showCommand{
-		FlagSet:    flag.NewFlagSet(name, flag.ExitOnError),
+		FlagSet: flag.NewFlagSet(name, flag.ExitOnError),
-		myAccount:  false,
-		targetType: "",
-		account:    "",
-		statusID:   "",
 	}
 
 	command.BoolVar(&command.myAccount, "my-account", false, "set to true to lookup your account")
 	command.StringVar(&command.targetType, "type", "", "specify the type of resource to display")
 	command.StringVar(&command.account, "account", "", "specify the account URI to lookup")
 	command.StringVar(&command.statusID, "status-id", "", "specify the ID of the status to display")
+	command.StringVar(&command.timelineType, "timeline-type", "home", "specify the type of timeline to display (valid values are home, public, list and tag)")
+	command.StringVar(&command.timelineListID, "timeline-list-id", "", "specify the ID of the list timeline to display")
+	command.StringVar(&command.timelineTagName, "timeline-tag-name", "", "specify the name of the tag timeline to display")
+	command.IntVar(&command.timelineLimit, "timeline-limit", 5, "specify the number of statuses to display")
 	command.Usage = commandUsageFunc(name, summary, command.FlagSet)
 
 	return &command
@@ -45,6 +50,7 @@ func (c *showCommand) Execute() error {
 		"instance": c.showInstance,
 		"account":  c.showAccount,
 		"status":   c.showStatus,
+		"timeline": c.showTimeline,
 	}
 
 	doFunc, ok := funcMap[c.targetType]
@@ -108,3 +114,53 @@ func (c *showCommand) showStatus(gts *client.Client) error {
 
 	return nil
 }
+
+func (c *showCommand) showTimeline(gts *client.Client) error {
+	var (
+		statuses []model.Status
+		err      error
+	)
+
+	switch c.timelineType {
+	case "home":
+		statuses, err = gts.GetHomeTimeline(c.timelineLimit)
+	case "public":
+		statuses, err = gts.GetPublicTimeline(c.timelineLimit)
+	case "list":
+		if c.timelineListID == "" {
+			return errors.New("the timeline-list-id flag is not set")
+		}
+
+		statuses, err = gts.GetListTimeline(c.timelineListID, c.timelineLimit)
+	case "tag":
+		if c.timelineTagName == "" {
+			return errors.New("the timeline-tag-name flag is not set")
+		}
+
+		statuses, err = gts.GetTagTimeline(c.timelineTagName, c.timelineLimit)
+	default:
+		return fmt.Errorf("%q is not a valid type of timeline", c.timelineType)
+	}
+
+	if err != nil {
+		return fmt.Errorf("unable to retrieve the %s timeline; %w", c.timelineType, err)
+	}
+
+	if len(statuses) == 0 {
+		fmt.Println("There are no statuses in this timeline.")
+
+		return nil
+	}
+
+
+	separator := "────────────────────────────────────────────────────────────────────────"
+
+	fmt.Println(separator)
+
+	for _, status := range statuses {
+		fmt.Println(status)
+		fmt.Println(separator)
+	}
+
+	return nil
+}

cmd/enbas/usage.go

@@ -22,8 +22,7 @@ func commandUsageFunc(name, summary string, flagset *flag.FlagSet) func() {
 		flagset.VisitAll(func(f *flag.Flag) {
 			fmt.Fprintf(
 				&builder,
-				"\n  -%s, --%s\n        %s",
+				"\n  --%s\n        %s",
-				f.Name,
 				f.Name,
 				f.Usage,
 			)
@@ -63,9 +62,9 @@ func enbasUsageFunc(summaries map[string]string) func() {
 			fmt.Fprintf(&builder, "\n    %s\t%s", cmd, summaries[cmd])
 		}
 
-		builder.WriteString("\n\nFLAGS:\n    -help, --help\n        print the help message\n")
+		builder.WriteString("\n\nFLAGS:\n    --help\n        print the help message\n")
 		flag.VisitAll(func(f *flag.Flag) {
-			fmt.Fprintf(&builder, "\n    -%s, --%s\n        %s\n", f.Name, f.Name, f.Usage)
+			fmt.Fprintf(&builder, "\n    --%s\n        %s\n", f.Name, f.Usage)
 		})
 
 		builder.WriteString("\nUse \"enbas [command] --help\" for more information about a command.\n")

internal/client/client.go

@@ -71,7 +71,7 @@ func (g *Client) GetInstance() (model.InstanceV2, error) {
 }
 
 func (g *Client) GetAccount(accountURI string) (model.Account, error) {
-	path := "/api/v1/accounts/lookup" + "?acct=" + accountURI
+	path := "/api/v1/accounts/lookup?acct=" + accountURI
 	url := g.Authentication.Instance + path
 
 	var account model.Account
@@ -96,6 +96,42 @@ func (g *Client) GetStatus(statusID string) (model.Status, error) {
 	return status, nil
 }
 
+func (g *Client) GetHomeTimeline(limit int) ([]model.Status, error) {
+	path := fmt.Sprintf("/api/v1/timelines/home?limit=%d", limit)
+
+	return g.getTimeline(path)
+}
+
+func (g *Client) GetPublicTimeline(limit int) ([]model.Status, error) {
+	path := fmt.Sprintf("/api/v1/timelines/public?limit=%d", limit)
+
+	return g.getTimeline(path)
+}
+
+func (g *Client) GetListTimeline(listID string, limit int) ([]model.Status, error) {
+	path := fmt.Sprintf("/api/v1/timelines/list/%s?limit=%d", listID, limit)
+
+	return g.getTimeline(path)
+}
+
+func (g *Client) GetTagTimeline(tag string, limit int) ([]model.Status, error) {
+	path := fmt.Sprintf("/api/v1/timelines/tag/%s?limit=%d", tag, limit)
+
+	return g.getTimeline(path)
+}
+
+func (g *Client) getTimeline(path string) ([]model.Status, error) {
+	url := g.Authentication.Instance + path
+
+	var statuses []model.Status
+
+	if err := g.sendRequest(http.MethodGet, url, nil, &statuses); err != nil {
+		return nil, fmt.Errorf("received an error after sending the request to get the timeline; %w", err)
+	}
+
+	return statuses, nil
+}
+
 func (g *Client) sendRequest(method string, url string, requestBody io.Reader, object any) error {
 	ctx, cancel := context.WithTimeout(context.Background(), g.Timeout)
 	defer cancel()

internal/model/account.go

@@ -96,7 +96,7 @@ func (a Account) String() string {
 		utilities.Header("ACCOUNT ID:"),
 		a.ID,
 		utilities.Header("JOINED ON:"),
-		a.CreatedAt.Format("02 Jan 2006"),
+		utilities.FormatDate(a.CreatedAt),
 		utilities.Header("STATS:"),
 		a.FollowersCount,
 		a.FollowingCount,

internal/model/status.go

@@ -186,7 +186,7 @@ func (s Status) String() string {
 		utilities.Header("STATUS ID:"),
 		s.ID,
 		utilities.Header("CREATED AT:"),
-		s.CreatedAt.Format("02 Jan 2006, 03:04"),
+		utilities.FormatTime(s.CreatedAt),
 		utilities.Header("STATS:"),
 		s.RebloggsCount,
 		s.FavouritesCount,

internal/utilities/utilities.go

@@ -2,6 +2,7 @@ package utilities
 
 import (
 	"strings"
+	"time"
 	"unicode"
 
 	"golang.org/x/net/html"
@@ -54,3 +55,11 @@ func WrapLine(line, separator string, charLimit int) string {
 func Header(text string) string {
 	return boldblue + text + reset
 }
+
+func FormatDate(date time.Time) string {
+	return date.Local().Format("02 Jan 2006")
+}
+
+func FormatTime(date time.Time) string {
+	return date.Local().Format("02 Jan 2006, 15:04 (MST)")
+}