clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10195 from mexon/mat/user-console-command-refactor 

Fix console user config set command
This commit is contained in:
Philipp 2021-05-02 20:12:35 +02:00 committed by GitHub
parent af5fa6ce00 023fb38a75
commit edac249945
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/Console/User.php
View File

@ -26,7 +26,6 @@ use Friendica\App;
use Friendica\Content\Pager; use Friendica\Content\Pager;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Core\PConfig\IPConfig; use Friendica\Core\PConfig\IPConfig;
use Friendica\Database\Database;
use Friendica\Model\Register; use Friendica\Model\Register;
use Friendica\Model\User as UserModel; use Friendica\Model\User as UserModel;
use Friendica\Util\Temporal; use Friendica\Util\Temporal;
@ -48,10 +47,6 @@ class User extends \Asika\SimpleConsole\Console
* @var L10n * @var L10n
*/ */
private $l10n; private $l10n;
/**
* @var Database
*/
private $dba;
/** /**
* @var IPConfig * @var IPConfig
*/ */
@ -93,13 +88,12 @@ HELP;
return $help; return $help;
} }
public function __construct(App\Mode $appMode, L10n $l10n, Database $dba, IPConfig $pConfig, array $argv = null) public function __construct(App\Mode $appMode, L10n $l10n, IPConfig $pConfig, array $argv = null)
{ {
parent::__construct($argv); parent::__construct($argv);
$this->appMode = $appMode; $this->appMode = $appMode;
$this->l10n = $l10n; $this->l10n = $l10n;
$this->dba = $dba;
$this->pConfig = $pConfig; $this->pConfig = $pConfig;
} }
@ -176,15 +170,15 @@ HELP;
* *
* @param int $arg_index Index of the nick argument in the arguments list * @param int $arg_index Index of the nick argument in the arguments list
* *
* @return mixed user data or dba failure result * @return array|boolean User record with uid field, or false if user is not found
* @throws \Friendica\Network\HTTPException\InternalServerErrorException * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/ */
private function getUserByNick($arg_index) private function getUserByNick($arg_index)
{ {
$nick = $this->getNick($arg_index); $nick = $this->getNick($arg_index);
$user = $this->dba->selectFirst('user', ['uid'], ['nickname' => $nick]); $user = UserModel::getByNickname($nick, ['uid']);
if (!$this->dba->isResult($user)) { if (empty($user)) {
throw new RuntimeException($this->l10n->t('User not found')); throw new RuntimeException($this->l10n->t('User not found'));
} }
@ -212,7 +206,7 @@ HELP;
try { try {
$result = UserModel::updatePassword($user['uid'], $password); $result = UserModel::updatePassword($user['uid'], $password);
if (!$this->dba->isResult($result)) { if (empty($result)) {
throw new \Exception($this->l10n->t('Password update failed. Please try again.')); throw new \Exception($this->l10n->t('Password update failed. Please try again.'));
} }
@ -431,7 +425,9 @@ HELP;
return false; return false;
} }
$table->addRow($user); if (!empty($user)) {
$table->addRow($user);
}
$this->out($table->getTable()); $this->out($table->getTable());
return true; return true;
@ -489,7 +485,7 @@ HELP;
throw new RuntimeException('Key does not exist'); throw new RuntimeException('Key does not exist');
} }
$this->out($pconfig->get($user['uid'], $category, $key)); $this->out($this->pConfig->get($user['uid'], $category, $key));
break; break;
case 'set': case 'set':
$value = $this->getArgument(5); $value = $this->getArgument(5);
@ -508,7 +504,7 @@ HELP;
throw new RuntimeException('Value not changed'); throw new RuntimeException('Value not changed');
} }
$pconfig->set($user['uid'], $category, $key, $value); $this->pConfig->set($user['uid'], $category, $key, $value);
break; break;
case 'delete': case 'delete':
if (!array_key_exists($category, $values)) { if (!array_key_exists($category, $values)) {
@ -518,7 +514,7 @@ HELP;
throw new RuntimeException('Key does not exist'); throw new RuntimeException('Key does not exist');
} }
$pconfig->delete($user['uid'], $category, $key); $this->pConfig->delete($user['uid'], $category, $key);
break; break;
default: default:
$this->out($this->getHelp()); $this->out($this->getHelp());