fediport/pixelfed
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Update User artisan commands to match UserDelete

Browse source
This commit is contained in:
idanoo 2023-01-08 11:34:10 +13:00
parent 71cc016e0b
commit 52d65538cd
No known key found for this signature in database
GPG key ID: 387387CDBC02F132
4 changed files with 20 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/Console/Commands/UserAdmin.php
View file

@ -39,7 +39,11 @@ class UserAdmin extends Command
public function handle() public function handle()
{ {
$id = $this->argument('id'); $id = $this->argument('id');
$user = User::whereUsername($id)->orWhere('id', $id)->first(); if(ctype_digit($id) == true) {
$user = User::find($id);
} else {
$user = User::whereUsername($id)->first();
}
if(!$user) { if(!$user) {
$this->error('Could not find any user with that username or id.'); $this->error('Could not find any user with that username or id.');
exit; exit;

6
app/Console/Commands/UserShow.php
View file

@ -39,7 +39,11 @@ class UserShow extends Command
public function handle() public function handle()
{ {
$id = $this->argument('id'); $id = $this->argument('id');
$user = User::whereUsername($id)->orWhere('id', $id)->first(); if(ctype_digit($id) == true) {
$user = User::find($id);
} else {
$user = User::whereUsername($id)->first();
}
if(!$user) { if(!$user) {
$this->error('Could not find any user with that username or id.'); $this->error('Could not find any user with that username or id.');
exit; exit;

6
app/Console/Commands/UserSuspend.php
View file

@ -39,7 +39,11 @@ class UserSuspend extends Command
public function handle() public function handle()
{ {
$id = $this->argument('id'); $id = $this->argument('id');
$user = User::whereUsername($id)->orWhere('id', $id)->first(); if(ctype_digit($id) == true) {
$user = User::find($id);
} else {
$user = User::whereUsername($id)->first();
}
if(!$user) { if(!$user) {
$this->error('Could not find any user with that username or id.'); $this->error('Could not find any user with that username or id.');
exit; exit;

6
app/Console/Commands/UserUnsuspend.php
View file

@ -39,7 +39,11 @@ class UserUnsuspend extends Command
public function handle() public function handle()
{ {
$id = $this->argument('id'); $id = $this->argument('id');
$user = User::whereUsername($id)->orWhere('id', $id)->first(); if(ctype_digit($id) == true) {
$user = User::find($id);
} else {
$user = User::whereUsername($id)->first();
}
if(!$user) { if(!$user) {
$this->error('Could not find any user with that username or id.'); $this->error('Could not find any user with that username or id.');
exit; exit;