nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8613 from MrPetovan/bug/8612-console-user-already-deleted

Browse source 
Skip user removal if it's already been removed in Console\User
This commit is contained in:
Michael Vogel 2020-05-09 18:05:31 +02:00 committed by GitHub
parent 5765b6f772 184fa9f980
commit dc39a5f09f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Console/User.php
View file

@ -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)) { if (empty($user)) {
throw new RuntimeException($this->l10n->t('User not found')); 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')) { if (!$this->getOption('q')) {
$this->out($this->l10n->t('Type "yes" to delete %s', $nick)); $this->out($this->l10n->t('Type "yes" to delete %s', $nick));
if (CliPrompt::prompt() !== 'yes') { 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']);
} }
/** /**

2
src/Model/User.php
View file

@ -1162,7 +1162,7 @@ class User
// unique), so it cannot be re-registered in the future. // unique), so it cannot be re-registered in the future.
DBA::insert('userd', ['username' => $user['nickname']]); DBA::insert('userd', ['username' => $user['nickname']]);
// The user and related data will be deleted in "cron_expire_and_remove_users" (cronjobs.php) // The user and related data will be deleted in Friendica\Worker\CronJobs::expireAndRemoveUsers()
DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]); DBA::update('user', ['account_removed' => true, 'account_expires_on' => DateTimeFormat::utc('now + 7 day')], ['uid' => $uid]);
Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid); Worker::add(PRIORITY_HIGH, 'Notifier', Delivery::REMOVAL, $uid);