account code cleanup, regen docs

diff --git a/cmd/account.go b/cmd/account.go
index b8eda38638975b79028d5d1505991bd928510d1a..70abfa3d112b919d7a9d78c9e5f40c832f02c8fe 100644 (file)
--- a/cmd/account.go
+++ b/cmd/account.go
@@ -68,7 +68,11 @@ var getFollowersCmd = &cobra.Command{
        },
 
        Run: func(cmd *cobra.Command, args []string) {
-               followers, err := account.GetFollowers(&mAPI)
+               if accountID == "" {
+                       accountID = account.ID
+               }
+
+               followers, err := mastodon.GetFollowers(accountID, &mAPI)
                if err != nil {
                        log.Fatal(err.Error())
                }
@@ -90,7 +94,11 @@ var getFollowingCmd = &cobra.Command{
        },
 
        Run: func(cmd *cobra.Command, args []string) {
-               following, err := account.GetFollowing(&mAPI)
+               if accountID == "" {
+                       accountID = account.ID
+               }
+
+               following, err := mastodon.GetFollowing(accountID, &mAPI)
                if err != nil {
                        log.Fatal("Failed to get following list.")
                }
@@ -134,7 +142,10 @@ var getStatusesCmd = &cobra.Command{
        },
 
        Run: func(cmd *cobra.Command, args []string) {
-               statuses, err := account.GetStatuses(&mAPI)
+               if accountID == "" {
+                       accountID = account.ID
+               }
+               statuses, err := mastodon.GetStatuses(accountID, &mAPI)
                if err != nil {
                        log.Fatal("Failed to retrieve statuses.")
                }

diff --git a/doc/dead-tooter.md b/doc/dead-tooter.md
index 5d24e8b8b0bdc12fb167019f11539f681af65be5..6034376f47793bfd1b063d50f3dbf34d86a4ba73 100644 (file)
--- a/doc/dead-tooter.md
+++ b/doc/dead-tooter.md
@@ -20,9 +20,9 @@ be present in the Mastodon web UI.
 * [dead-tooter account](dead-tooter_account.md)         - Account commands
 * [dead-tooter application](dead-tooter_application.md)         - Register and perform application-level actions
 * [dead-tooter completion](dead-tooter_completion.md)   - Generate the autocompletion script for the specified shell
-* [dead-tooter docs](dead-tooter_docs.md)       - Generate dead-tooter docs
+* [dead-tooter doc](dead-tooter_doc.md)         - Generate dead-tooter docs
 * [dead-tooter lists](dead-tooter_lists.md)     - List commands
 * [dead-tooter login](dead-tooter_login.md)     - Login to Mastodon
 * [dead-tooter version](dead-tooter_version.md)         - Print the version number of d34d-t00ter
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_account.md b/doc/dead-tooter_account.md
index 9cba203562b390e21b74b7be3d4a3e8635bc7c01..6512e1fe20bfcf8f8af195bdc76f1de890acd9b9 100644 (file)
--- a/doc/dead-tooter_account.md
+++ b/doc/dead-tooter_account.md
@@ -29,4 +29,4 @@ Commands related to the logged in Mastodon account.
 * [dead-tooter account lists](dead-tooter_account_lists.md)     - Get account's lists
 * [dead-tooter account statuses](dead-tooter_account_statuses.md)       - Get account's statuses
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_account_followers.md b/doc/dead-tooter_account_followers.md
index 7384f53349a3dab08a22e04f29ec77535b061d87..c42f72cddaf7e50a5aa0aef62c9b453f0429709d 100644 (file)
--- a/doc/dead-tooter_account_followers.md
+++ b/doc/dead-tooter_account_followers.md
@@ -28,4 +28,4 @@ dead-tooter account followers [flags]
 
 * [dead-tooter account](dead-tooter_account.md)         - Account commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_account_following.md b/doc/dead-tooter_account_following.md
index aabb0a62035e7fbee309cdf2ab5b4279e49ae1e6..cb27f94255b9b1962fc62066d69a16698124c3b8 100644 (file)
--- a/doc/dead-tooter_account_following.md
+++ b/doc/dead-tooter_account_following.md
@@ -28,4 +28,4 @@ dead-tooter account following [flags]
 
 * [dead-tooter account](dead-tooter_account.md)         - Account commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_account_get.md b/doc/dead-tooter_account_get.md
index 133f860626e4cb71ffd4e69fd683eb30b5913fe7..d96b0be384dc206a21235e041599d73c9fd4d380 100644 (file)
--- a/doc/dead-tooter_account_get.md
+++ b/doc/dead-tooter_account_get.md
@@ -29,4 +29,4 @@ dead-tooter account get [flags]
 
 * [dead-tooter account](dead-tooter_account.md)         - Account commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_account_lists.md b/doc/dead-tooter_account_lists.md
index cb7f140a53890b459ef380bc4582854ce71f8fbe..d56d8538ec3c26bbc0a83a4caf373951ba8b0762 100644 (file)
--- a/doc/dead-tooter_account_lists.md
+++ b/doc/dead-tooter_account_lists.md
@@ -28,4 +28,4 @@ dead-tooter account lists [flags]
 
 * [dead-tooter account](dead-tooter_account.md)         - Account commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_account_statuses.md b/doc/dead-tooter_account_statuses.md
index b678c485628e51031bdd60a83448c4cb2253b8fa..eb1b8e3144735b8910eef67d39fa1168208f952b 100644 (file)
--- a/doc/dead-tooter_account_statuses.md
+++ b/doc/dead-tooter_account_statuses.md
@@ -28,4 +28,4 @@ dead-tooter account statuses [flags]
 
 * [dead-tooter account](dead-tooter_account.md)         - Account commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_application.md b/doc/dead-tooter_application.md
index f67db72500855678079a4f6d7f47eed5aa8540f0..b777cde2b0fac68f98fa474d3b62dc25daafa7b9 100644 (file)
--- a/doc/dead-tooter_application.md
+++ b/doc/dead-tooter_application.md
@@ -27,4 +27,4 @@ dead-tooter application [flags]
 
 * [dead-tooter](dead-tooter.md)         - A CLI for Mastodon hate scripts
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_completion.md b/doc/dead-tooter_completion.md
index 9381a8dc7c7d3b52497e1df393cd1bf05e7e5a50..d33a7ee685dd5989f4e8fcc4879b3271e8430291 100644 (file)
--- a/doc/dead-tooter_completion.md
+++ b/doc/dead-tooter_completion.md
@@ -29,4 +29,4 @@ See each sub-command's help for details on how to use the generated script.
 * [dead-tooter completion powershell](dead-tooter_completion_powershell.md)     - Generate the autocompletion script for powershell
 * [dead-tooter completion zsh](dead-tooter_completion_zsh.md)   - Generate the autocompletion script for zsh
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_completion_bash.md b/doc/dead-tooter_completion_bash.md
index 04344f836c69db4ef6d3995a7d572f0225da9138..78de38a8e164ad01192a9ad24b340d5c5fbc6b5b 100644 (file)
--- a/doc/dead-tooter_completion_bash.md
+++ b/doc/dead-tooter_completion_bash.md
@@ -48,4 +48,4 @@ dead-tooter completion bash
 
 * [dead-tooter completion](dead-tooter_completion.md)   - Generate the autocompletion script for the specified shell
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_completion_fish.md b/doc/dead-tooter_completion_fish.md
index 6f2fef46b2f622f36a755dc1d2728eacf6dac5ce..529927b29bd6d131e6baa7ac5dba1463f921515f 100644 (file)
--- a/doc/dead-tooter_completion_fish.md
+++ b/doc/dead-tooter_completion_fish.md
@@ -39,4 +39,4 @@ dead-tooter completion fish [flags]
 
 * [dead-tooter completion](dead-tooter_completion.md)   - Generate the autocompletion script for the specified shell
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_completion_powershell.md b/doc/dead-tooter_completion_powershell.md
index 9ce457f293f2c907b585dd45fa8e6183e3df0e68..de4ebbac1b1b03c2378ec2e1d4e1be547b0bed53 100644 (file)
--- a/doc/dead-tooter_completion_powershell.md
+++ b/doc/dead-tooter_completion_powershell.md
@@ -36,4 +36,4 @@ dead-tooter completion powershell [flags]
 
 * [dead-tooter completion](dead-tooter_completion.md)   - Generate the autocompletion script for the specified shell
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_completion_zsh.md b/doc/dead-tooter_completion_zsh.md
index 562821d0e80d2a513c2bd04da4e81e9e5d973f99..3ad689497fd4c8f54475bc031a2087c111d0665d 100644 (file)
--- a/doc/dead-tooter_completion_zsh.md
+++ b/doc/dead-tooter_completion_zsh.md
@@ -50,4 +50,4 @@ dead-tooter completion zsh [flags]
 
 * [dead-tooter completion](dead-tooter_completion.md)   - Generate the autocompletion script for the specified shell
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_doc.md b/doc/dead-tooter_doc.md
new file mode 100644 (file)
index 0000000..3f7d46f
--- /dev/null
+++ b/doc/dead-tooter_doc.md
@@ -0,0 +1,30 @@
+## dead-tooter doc
+
+Generate dead-tooter docs
+
+### Synopsis
+
+Generate markdown documentation for dead-tooter.
+
+```
+dead-tooter doc [flags]
+```
+
+### Options
+
+```
+  -h, --help   help for doc
+```
+
+### Options inherited from parent commands
+
+```
+  -H, --host string    Mastodon host where your account lives.
+      --proxy string   Address of proxy server.
+```
+
+### SEE ALSO
+
+* [dead-tooter](dead-tooter.md)         - A CLI for Mastodon hate scripts
+
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_lists.md b/doc/dead-tooter_lists.md
index f37d3d4e2fd2cc21f569df4db0223d8ac8d466fc..c0b1d41116130bbe99e3ea9fb2f9336e6e00c847 100644 (file)
--- a/doc/dead-tooter_lists.md
+++ b/doc/dead-tooter_lists.md
@@ -25,4 +25,4 @@ Commands related to account lists.
 * [dead-tooter lists accounts](dead-tooter_lists_accounts.md)   - Get list accounts
 * [dead-tooter lists containing](dead-tooter_lists_containing.md)       - Get lists containing [accountid]
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_lists_accounts.md b/doc/dead-tooter_lists_accounts.md
index 99206e3b077ac6a9485a6f5b2828357c3cd7cb26..00c58bf2cd7d6e0fcf2a6c78b89701d27e8a00d8 100644 (file)
--- a/doc/dead-tooter_lists_accounts.md
+++ b/doc/dead-tooter_lists_accounts.md
@@ -27,4 +27,4 @@ dead-tooter lists accounts [flags]
 
 * [dead-tooter lists](dead-tooter_lists.md)     - List commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_lists_containing.md b/doc/dead-tooter_lists_containing.md
index 9300344ad3f7f6244ffacd1139249ff14504e5ba..c072decccf541153136524912fcc6951fe63f0ba 100644 (file)
--- a/doc/dead-tooter_lists_containing.md
+++ b/doc/dead-tooter_lists_containing.md
@@ -27,4 +27,4 @@ dead-tooter lists containing [flags]
 
 * [dead-tooter lists](dead-tooter_lists.md)     - List commands
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_login.md b/doc/dead-tooter_login.md
index e81264685c7fff2f5c28eda1bf4ef5c79b320568..28e650a813b1421ac479b22635b8f08e0fe75bda 100644 (file)
--- a/doc/dead-tooter_login.md
+++ b/doc/dead-tooter_login.md
@@ -27,4 +27,4 @@ dead-tooter login [flags]
 
 * [dead-tooter](dead-tooter.md)         - A CLI for Mastodon hate scripts
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/doc/dead-tooter_version.md b/doc/dead-tooter_version.md
index bf421cd3446fc71f93ba33458fd71341a2c9060d..d0c125e7031a65204b3cdb04b22b586bd5670a2a 100644 (file)
--- a/doc/dead-tooter_version.md
+++ b/doc/dead-tooter_version.md
@@ -27,4 +27,4 @@ dead-tooter version [flags]
 
 * [dead-tooter](dead-tooter.md)         - A CLI for Mastodon hate scripts
 
-###### Auto generated by spf13/cobra on 7-Jan-2023
+###### Auto generated by spf13/cobra on 8-Jan-2023

diff --git a/pkg/mastodon/account.go b/pkg/mastodon/account.go
index aaaf1d1924dc1e41a0662b85a50c375a7a3db85d..0a630a966731a014f0b5b26dc46e5202d139d39c 100644 (file)
--- a/pkg/mastodon/account.go
+++ b/pkg/mastodon/account.go
@@ -94,9 +94,9 @@ func (a *Account) DisplayLong() (err error) {
 }
 
 // Display a collection of Accounts
-func (aa AccountCollection) Display() {
+func (ac AccountCollection) Display() {
        w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-       for _, value := range aa {
+       for _, value := range ac {
                fmt.Fprintln(w, value.Display())
        }
        w.Flush()
@@ -184,7 +184,6 @@ func (a *Account) VerifyCredentials(mAPI *api.API) (err error) {
 
        body, err := api.Get(u, mAPI)
        if err != nil {
-               fmt.Printf("%+v", err)
                return err
        }
 
@@ -224,15 +223,10 @@ func GetAccount(ID string, mAPI *api.API) (account Account, err error) {
        return account, err
 }
 
-// Get returns the currently logged in account.
-func (a *Account) Get(mAPI *api.API) (account Account, err error) {
-       return GetAccount(a.ID, mAPI)
-}
-
-// GetFollowers returns a list of all accounts following the logged in user
-func (a *Account) GetFollowers(mAPI *api.API) (followers AccountCollection, err error) {
+// GetFollowers returns a list of accounts following the specified usera.
+func GetFollowers(ID string, mAPI *api.API) (followers AccountCollection, err error) {
 
-       id := url.PathEscape(a.ID)
+       id := url.PathEscape(ID)
        path, err := url.JoinPath("api/v1/accounts", id, "followers")
        if err != nil {
                return followers, err
@@ -257,10 +251,10 @@ func (a *Account) GetFollowers(mAPI *api.API) (followers AccountCollection, err
        return followers, err
 }
 
-// GetFollowing returns a list of all accounts followed by the logged in user
-func (a *Account) GetFollowing(mAPI *api.API) (following AccountCollection, err error) {
+// GetFollowing returns a list of all accounts followed by the specified user.
+func GetFollowing(ID string, mAPI *api.API) (following AccountCollection, err error) {
 
-       id := url.PathEscape(a.ID)
+       id := url.PathEscape(ID)
        path, err := url.JoinPath("api/v1/accounts", id, "following")
        if err != nil {
                return
@@ -306,31 +300,3 @@ func (a *Account) GetLists(mAPI *api.API) (lists ListCollection, err error) {
 
        return lists, err
 }
-
-// GetStatuses fetches a list of statuses by the account.
-func (a *Account) GetStatuses(mAPI *api.API) (statuses StatusCollection, err error) {
-
-       id := url.PathEscape(a.ID)
-       path, err := url.JoinPath("api/v1/accounts", id, "statuses")
-       if err != nil {
-               return
-       }
-
-       u := url.URL{
-               Host: mAPI.Host,
-               Path: path,
-       }
-       u.Scheme = "https"
-
-       body, err := api.Get(u, mAPI)
-       if err != nil {
-               return
-       }
-
-       err = json.Unmarshal(body, &statuses)
-       if err != nil {
-               return
-       }
-
-       return statuses, err
-}

diff --git a/pkg/mastodon/list.go b/pkg/mastodon/list.go
index a954e7ac037d880059971667d2ea3e6fa4a7074a..629d08d168c6d00f3113974e0927ab976d7ad192 100644 (file)
--- a/pkg/mastodon/list.go
+++ b/pkg/mastodon/list.go
@@ -27,9 +27,9 @@ func (l *List) Display() string {
 }
 
 // Display a collection of Lists
-func (ll ListCollection) Display() {
+func (lc ListCollection) Display() {
        w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-       for _, value := range ll {
+       for _, value := range lc {
                fmt.Fprintln(w, value.Display())
        }
        w.Flush()

diff --git a/pkg/mastodon/status.go b/pkg/mastodon/status.go
index 76f2aff0697c63e746d56af301c0b310ce11749d..33e00a2f671e9de7038995697e1fb47a7ffa5a77 100644 (file)
--- a/pkg/mastodon/status.go
+++ b/pkg/mastodon/status.go
@@ -1,10 +1,14 @@
 package mastodon
 
 import (
+       "encoding/json"
        "fmt"
+       "net/url"
        "os"
        "strings"
        "text/tabwriter"
+
+       "git.vexingworkshop.com/signal9/dead-tooter/pkg/mastodon/api"
 )
 
 // Status represents a post by an account.
@@ -84,10 +88,38 @@ func (s *Status) Display() string {
 }
 
 // Display a collection of Statuses
-func (ss StatusCollection) Display() {
+func (sc StatusCollection) Display() {
        w := tabwriter.NewWriter(os.Stdout, 0, 0, 3, ' ', 0)
-       for _, value := range ss {
+       for _, value := range sc {
                fmt.Fprintln(w, value.Display())
        }
        w.Flush()
 }
+
+// GetStatuses fetches a list of statuses by the specified account.
+func GetStatuses(ID string, mAPI *api.API) (statuses StatusCollection, err error) {
+
+       id := url.PathEscape(ID)
+       path, err := url.JoinPath("api/v1/accounts", id, "statuses")
+       if err != nil {
+               return
+       }
+
+       u := url.URL{
+               Host: mAPI.Host,
+               Path: path,
+       }
+       u.Scheme = "https"
+
+       body, err := api.Get(u, mAPI)
+       if err != nil {
+               return
+       }
+
+       err = json.Unmarshal(body, &statuses)
+       if err != nil {
+               return
+       }
+
+       return statuses, err
+}