golang/mikael/madonctl: comparison cmd/accounts.go

equal deleted inserted replaced

-:498d5d188119
+:a685b52c2ddf
 	comment               string // For account reports
 	displayName, note     string // For account update
 	avatar, header        string // For account update
 	locked                bool   // For account update
 	muteNotifications     bool   // For account mute
+	following             bool   // For account search
 }
 var accountUpdateFlags, accountMuteFlags *flag.FlagSet
 func init() {
 	accountFollowRequestsSubcommand.Flags().BoolVar(&accountsOpts.list, "list", false, "List pending follow requests")
 	accountFollowRequestsSubcommand.Flags().BoolVar(&accountsOpts.acceptFR, "accept", false, "Accept the follow request from the account ID")
 	accountFollowRequestsSubcommand.Flags().BoolVar(&accountsOpts.rejectFR, "reject", false, "Reject the follow request from the account ID")
 	accountBlockSubcommand.Flags().BoolVarP(&accountsOpts.unset, "unset", "", false, "Unblock the account")
 	accountMuteSubcommand.Flags().BoolVarP(&accountsOpts.unset, "unset", "", false, "Unmute the account")
 	accountMuteSubcommand.Flags().BoolVarP(&accountsOpts.muteNotifications, "notifications", "", true, "Mute the notifications")
 	accountFollowSubcommand.Flags().BoolVarP(&accountsOpts.unset, "unset", "", false, "Unfollow the account")
 	accountFollowSubcommand.Flags().StringVarP(&accountsOpts.remoteUID, "remote", "r", "", "Follow remote account (user@domain)")
 	accountRelationshipsSubcommand.Flags().StringVar(&accountsOpts.accountIDs, "account-ids", "", "Comma-separated list of account IDs")
 	accountReportsSubcommand.Flags().StringVar(&accountsOpts.statusIDs, "status-ids", "", "Comma-separated list of status IDs")
 	accountReportsSubcommand.Flags().StringVar(&accountsOpts.comment, "comment", "", "Report comment")
 	accountReportsSubcommand.Flags().BoolVar(&accountsOpts.list, "list", false, "List current user reports")
+	accountSearchSubcommand.Flags().BoolVar(&accountsOpts.following, "following", false, "Restrict search to accounts you are following")
 	accountUpdateSubcommand.Flags().StringVar(&accountsOpts.displayName, "display-name", "", "User display name")
 	accountUpdateSubcommand.Flags().StringVar(&accountsOpts.note, "note", "", "User note (a.k.a. bio)")
 	accountUpdateSubcommand.Flags().StringVar(&accountsOpts.avatar, "avatar", "", "User avatar image")
 	accountUpdateSubcommand.Flags().StringVar(&accountsOpts.header, "header", "", "User header image")
 		Short:   "Display the user's muted accounts",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			return accountSubcommandsRunE(cmd.Name(), args)
 		},
 	},
-	&cobra.Command{
+	accountSearchSubcommand,
-		Use:   "search TEXT",
-		Short: "Search for user accounts",
-		Long: `Search for user accounts.
-The server will lookup an account remotely if the search term is in the
-username@domain format and not yet in the database.`,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return accountSubcommandsRunE(cmd.Name(), args)
-		},
-	},
 	accountStatusesSubcommand,
 	accountFollowRequestsSubcommand,
 	accountFollowSubcommand,
 	accountBlockSubcommand,
 	accountMuteSubcommand,
 	accountRelationshipsSubcommand,
 	accountReportsSubcommand,
 	accountUpdateSubcommand,
 }
+var accountSearchSubcommand = &cobra.Command{
+	Use:   "search TEXT",
+	Short: "Search for user accounts",
+	Long: `Search for user accounts.
+er will lookup an account remotely if the search term is in the
+@domain format and not yet in the database.`,
+	RunE: func(cmd *cobra.Command, args []string) error {
+		return accountSubcommandsRunE(cmd.Name(), args)
+	},
+}
 var accountStatusesSubcommand = &cobra.Command{
 	Use:     "statuses",
 	Aliases: []string{"st"},
 	Short:   "Display the account statuses",
 	RunE: func(cmd *cobra.Command, args []string) error {
 			account, err = gClient.GetCurrentAccount()
 		}
 		obj = account
 	case "search":
 		var accountList []madon.Account
-		accountList, err = gClient.SearchAccounts(strings.Join(args, " "), limOpts)
+		accountList, err = gClient.SearchAccounts(strings.Join(args, " "), opt.following, limOpts)
 		obj = accountList
 	case "followers":
 		var accountList []madon.Account
 		accountList, err = gClient.GetAccountFollowers(opt.accountID, limOpts)
 		if opt.keep > 0 && len(accountList) > int(opt.keep) {
 		}
 	} else {
 		// Remove leading '@'
 		user = strings.TrimLeft(user, "@")
-		accList, err := gClient.SearchAccounts(user, &madon.LimitParams{Limit: 2})
+		accList, err := gClient.SearchAccounts(user, false, &madon.LimitParams{Limit: 2})
 		if err != nil {
 			return 0, err
 		}
 		for _, u := range accList {
 			if u.Acct == user {

changeset 184	a685b52c2ddf
parent 182	842f6cea448f
child 185	564d92b54b00