Remove the "addr" when webfinger fails

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

diff --git a/src/Console/User.php b/src/Console/User.php
index b12a3a6ad36861785766fb000de88c303ad45d8b..a135e6292de22da10ecf227cb729f459309d2ea2 100644 (file)
--- a/src/Console/User.php
+++ b/src/Console/User.php
@@ -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 (!empty($user['account_removed'])) {
+                       $this->out($this->l10n->t('User has already been marked for deletion.'));
+                       return true;
+               }
+
                if (!$this->getOption('q')) {
                        $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']);
        }
 
        /**
@@ -361,7 +366,7 @@ HELP;
                                                $contact['email'],
                                                Temporal::getRelativeDate($contact['created']),
                                                Temporal::getRelativeDate($contact['login_date']),
-                                               Temporal::getRelativeDate($contact['lastitem_date']),
+                                               Temporal::getRelativeDate($contact['last-item']),
                                        ]);
                                }
                                $this->out($table->getTable());