internal/executor/add.go

@@ -47,7 +47,7 @@ func NewAddExecutor(printer *printer.Printer, config *config.Config, name, summa
 	addExe.StringVar(&addExe.content, flagContent, "", "The content of the resource")
 	addExe.StringVar(&addExe.pollID, flagPollID, "", "The ID of the poll")
 	addExe.Var(&addExe.accountNames, flagAccountName, "The name of the account")
-	addExe.Var(&addExe.choices, flagVote, "Add a vote to an option in a poll")
+	addExe.Var(&addExe.choices, flagChoose, "Specify your choice ")
 
 	addExe.Usage = commandUsageFunc(name, summary, addExe.FlagSet)
 
@@ -270,7 +270,7 @@ func (a *AddExecutor) addToPoll(gtsClient *client.Client) error {
 
 func (a *AddExecutor) addVoteToPoll(gtsClient *client.Client) error {
 	if len(a.choices) == 0 {
-		return errors.New("please use --" + flagVote + " to make a choice in this poll")
+		return errors.New("please use --" + flagChoose + " to make a choice in this poll")
 	}
 
 	poll, err := gtsClient.GetPoll(a.pollID)

internal/executor/errors.go

@@ -52,19 +52,6 @@ func (e UnsupportedRemoveOperationError) Error() string {
 		"' is not supported"
 }
 
-type UnsupportedShowOperationError struct {
-	ResourceType         string
-	ShowFromResourceType string
-}
-
-func (e UnsupportedShowOperationError) Error() string {
-	return "showing '" +
-		e.ResourceType +
-		"' from '" +
-		e.ShowFromResourceType +
-		"' is not supported"
-}
-
 type EmptyContentError struct {
 	ResourceType string
 	Hint         string

internal/executor/flags.go

@@ -16,6 +16,7 @@ const (
 	flagAccountName               = "account-name"
 	flagAttachmentID              = "attachment-id"
 	flagBrowser                   = "browser"
+	flagChoose                    = "choose"
 	flagContentType               = "content-type"
 	flagContent                   = "content"
 	flagEnableFederation          = "enable-federation"
@@ -51,7 +52,6 @@ const (
 	flagTo                        = "to"
 	flagType                      = "type"
 	flagVisibility                = "visibility"
-	flagVote                      = "vote"
 )
 
 type MultiStringFlagValue []string

internal/executor/show.go

@@ -287,26 +287,6 @@ func (s *ShowExecutor) showLists(gtsClient *client.Client) error {
 }
 
 func (s *ShowExecutor) showFollowers(gtsClient *client.Client) error {
-	if s.fromResourceType == "" {
-		return FlagNotSetError{flagText: flagFrom}
-	}
-
-	funcMap := map[string]func(*client.Client) error{
-		resourceAccount: s.showFollowersFromAccount,
-	}
-
-	doFunc, ok := funcMap[s.fromResourceType]
-	if !ok {
-		return UnsupportedShowOperationError{
-			ResourceType:         s.resourceType,
-			ShowFromResourceType: s.fromResourceType,
-		}
-	}
-
-	return doFunc(gtsClient)
-}
-
-func (s *ShowExecutor) showFollowersFromAccount(gtsClient *client.Client) error {
 	accountID, err := getAccountID(gtsClient, s.myAccount, s.accountName, s.config.CredentialsFile)
 	if err != nil {
 		return fmt.Errorf("received an error while getting the account ID: %w", err)
@@ -327,26 +307,6 @@ func (s *ShowExecutor) showFollowersFromAccount(gtsClient *client.Client) error
 }
 
 func (s *ShowExecutor) showFollowing(gtsClient *client.Client) error {
-	if s.fromResourceType == "" {
-		return FlagNotSetError{flagText: flagFrom}
-	}
-
-	funcMap := map[string]func(*client.Client) error{
-		resourceAccount: s.showFollowingFromAccount,
-	}
-
-	doFunc, ok := funcMap[s.fromResourceType]
-	if !ok {
-		return UnsupportedShowOperationError{
-			ResourceType:         s.resourceType,
-			ShowFromResourceType: s.fromResourceType,
-		}
-	}
-
-	return doFunc(gtsClient)
-}
-
-func (s *ShowExecutor) showFollowingFromAccount(gtsClient *client.Client) error {
 	accountID, err := getAccountID(gtsClient, s.myAccount, s.accountName, s.config.CredentialsFile)
 	if err != nil {
 		return fmt.Errorf("received an error while getting the account ID: %w", err)
@@ -489,10 +449,7 @@ func (s *ShowExecutor) showMedia(gtsClient *client.Client) error {
 
 	doFunc, ok := funcMap[s.fromResourceType]
 	if !ok {
-		return UnsupportedShowOperationError{
-			ResourceType:         s.resourceType,
-			ShowFromResourceType: s.fromResourceType,
-		}
+		return fmt.Errorf("do not support viewing media from %s", s.fromResourceType)
 	}
 
 	return doFunc(gtsClient)