diff options
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gotosocial/action/admin/account/account.go | 6 | ||||
| -rw-r--r-- | cmd/gotosocial/admin.go | 27 |
2 files changed, 7 insertions, 26 deletions
diff --git a/cmd/gotosocial/action/admin/account/account.go b/cmd/gotosocial/action/admin/account/account.go index 17a27c199..3306b8dbe 100644 --- a/cmd/gotosocial/action/admin/account/account.go +++ b/cmd/gotosocial/action/admin/account/account.go @@ -232,12 +232,6 @@ var Disable action.GTSAction = func(ctx context.Context) error { return dbConn.Stop(ctx) } -// Suspend suspends the target account, cleanly removing all of its media, followers, following, likes, statuses, etc. -var Suspend action.GTSAction = func(ctx context.Context) error { - // TODO - return nil -} - // Password sets the password of target account. var Password action.GTSAction = func(ctx context.Context) error { dbConn, err := bundb.NewBunDBService(ctx) diff --git a/cmd/gotosocial/admin.go b/cmd/gotosocial/admin.go index cddc79f40..4bf71d612 100644 --- a/cmd/gotosocial/admin.go +++ b/cmd/gotosocial/admin.go @@ -37,13 +37,13 @@ func adminCommands() *cobra.Command { adminAccountCmd := &cobra.Command{ Use: "account", - Short: "admin commands related to accounts", + Short: "admin commands related to local (this instance) accounts", } config.AddAdminAccount(adminAccountCmd) adminAccountCreateCmd := &cobra.Command{ Use: "create", - Short: "create a new account", + Short: "create a new local account", PreRunE: func(cmd *cobra.Command, args []string) error { return preRun(preRunArgs{cmd: cmd}) }, @@ -56,7 +56,7 @@ func adminCommands() *cobra.Command { adminAccountConfirmCmd := &cobra.Command{ Use: "confirm", - Short: "confirm an existing account manually, thereby skipping email confirmation", + Short: "confirm an existing local account manually, thereby skipping email confirmation", PreRunE: func(cmd *cobra.Command, args []string) error { return preRun(preRunArgs{cmd: cmd}) }, @@ -69,7 +69,7 @@ func adminCommands() *cobra.Command { adminAccountPromoteCmd := &cobra.Command{ Use: "promote", - Short: "promote an account to admin", + Short: "promote a local account to admin", PreRunE: func(cmd *cobra.Command, args []string) error { return preRun(preRunArgs{cmd: cmd}) }, @@ -82,7 +82,7 @@ func adminCommands() *cobra.Command { adminAccountDemoteCmd := &cobra.Command{ Use: "demote", - Short: "demote an account from admin to normal user", + Short: "demote a local account from admin to normal user", PreRunE: func(cmd *cobra.Command, args []string) error { return preRun(preRunArgs{cmd: cmd}) }, @@ -95,7 +95,7 @@ func adminCommands() *cobra.Command { adminAccountDisableCmd := &cobra.Command{ Use: "disable", - Short: "prevent an account from signing in or posting etc, but don't delete anything", + Short: "prevent a local account from signing in or posting etc, but don't delete anything", PreRunE: func(cmd *cobra.Command, args []string) error { return preRun(preRunArgs{cmd: cmd}) }, @@ -106,22 +106,9 @@ func adminCommands() *cobra.Command { config.AddAdminAccount(adminAccountDisableCmd) adminAccountCmd.AddCommand(adminAccountDisableCmd) - adminAccountSuspendCmd := &cobra.Command{ - Use: "suspend", - Short: "completely remove an account and all of its posts, media, etc", - PreRunE: func(cmd *cobra.Command, args []string) error { - return preRun(preRunArgs{cmd: cmd}) - }, - RunE: func(cmd *cobra.Command, args []string) error { - return run(cmd.Context(), account.Suspend) - }, - } - config.AddAdminAccount(adminAccountSuspendCmd) - adminAccountCmd.AddCommand(adminAccountSuspendCmd) - adminAccountPasswordCmd := &cobra.Command{ Use: "password", - Short: "set a new password for the given account", + Short: "set a new password for the given local account", PreRunE: func(cmd *cobra.Command, args []string) error { return preRun(preRunArgs{cmd: cmd}) }, |