Merge remote-tracking branch 'upstream/develop' into item-view

[friendica.git] / src / Console / User.php

diff --git a/src/Console/User.php b/src/Console/User.php
index d9766203825bd2203db348589a7908f0cd682894..a9378a61e957e1ed043b2999c965cdd2981d76c4 100644 (file)
--- a/src/Console/User.php
+++ b/src/Console/User.php
@@ -59,7 +59,7 @@ console user - Modify user settings per console commands.
 Usage
        bin/console user password <nickname> [<password>] [-h|--help|-?] [-v]
        bin/console user add [<name> [<nickname> [<email> [<language>]]]] [-h|--help|-?] [-v]
-       bin/console user delete [<nickname>] [-q] [-h|--help|-?] [-v]
+       bin/console user delete [<nickname>] [-y] [-h|--help|-?] [-v]
        bin/console user allow [<nickname>] [-h|--help|-?] [-v]
        bin/console user deny [<nickname>] [-h|--help|-?] [-v]
        bin/console user block [<nickname>] [-h|--help|-?] [-v]
@@ -78,8 +78,8 @@ Description
 
 Options
     -h|--help|-? Show help information
-    -v           Show more debug information.
-    -q           Quiet mode (don't ask for a command).
+    -v           Show more debug information
+    -y           Non-interactive mode, assume "yes" as answer to the user deletion prompt
 HELP;
                return $help;
        }
@@ -304,19 +304,24 @@ HELP;
                        }
                }
 
-               $user = $this->dba->selectFirst('user', ['uid'], ['nickname' => $nick]);
+               $user = $this->dba->selectFirst('user', ['uid', 'account_removed'], ['nickname' => $nick]);
                if (empty($user)) {
                        throw new RuntimeException($this->l10n->t('User not found'));
                }
 
-               if (!$this->getOption('q')) {
+               if (!empty($user['account_removed'])) {
+                       $this->out($this->l10n->t('User has already been marked for deletion.'));
+                       return true;
+               }
+
+               if (!$this->getOption('y')) {
                        $this->out($this->l10n->t('Type "yes" to delete %s', $nick));
                        if (CliPrompt::prompt() !== 'yes') {
-                               throw new RuntimeException('Delete abort.');
+                               throw new RuntimeException($this->l10n->t('Deletion aborted.'));
                        }
                }
 
-               return UserModel::remove($user['uid'] ?? -1);
+               return UserModel::remove($user['uid']);
        }
 
        /**
@@ -404,7 +409,7 @@ HELP;
                        case 'guid':
                                $user = UserModel::getByGuid($param, $fields);
                                break;
-                       case 'email':
+                       case 'mail':
                                $user = UserModel::getByEmail($param, $fields);
                                break;
                        case 'nick':