diff --git a/app/Console/Commands/AddUserDomainBlock.php b/app/Console/Commands/AddUserDomainBlock.php index 33f441cdc..7128879e1 100644 --- a/app/Console/Commands/AddUserDomainBlock.php +++ b/app/Console/Commands/AddUserDomainBlock.php @@ -4,6 +4,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; use App\User; +use App\Models\DefaultDomainBlock; use App\Models\UserDomainBlock; use function Laravel\Prompts\text; use function Laravel\Prompts\confirm; @@ -31,6 +32,7 @@ class AddUserDomainBlock extends Command public function handle() { $domain = text('Enter domain you want to block'); + $domain = strtolower($domain); $domain = $this->validateDomain($domain); $this->processBlocks($domain); return; @@ -74,6 +76,9 @@ class AddUserDomainBlock extends Command protected function processBlocks($domain) { + DefaultDomainBlock::updateOrCreate([ + 'domain' => $domain + ]); progress( label: 'Updating user domain blocks...', steps: User::lazyById(500), diff --git a/app/Console/Commands/DeleteUserDomainBlock.php b/app/Console/Commands/DeleteUserDomainBlock.php index 80c139f2b..9cc1c1ded 100644 --- a/app/Console/Commands/DeleteUserDomainBlock.php +++ b/app/Console/Commands/DeleteUserDomainBlock.php @@ -4,6 +4,7 @@ namespace App\Console\Commands; use Illuminate\Console\Command; use App\User; +use App\Models\DefaultDomainBlock; use App\Models\UserDomainBlock; use function Laravel\Prompts\text; use function Laravel\Prompts\confirm; @@ -31,6 +32,7 @@ class DeleteUserDomainBlock extends Command public function handle() { $domain = text('Enter domain you want to unblock'); + $domain = strtolower($domain); $domain = $this->validateDomain($domain); $this->processUnblocks($domain); return; @@ -74,6 +76,7 @@ class DeleteUserDomainBlock extends Command protected function processUnblocks($domain) { + DefaultDomainBlock::whereDomain($domain)->delete(); progress( label: 'Updating user domain blocks...', steps: UserDomainBlock::whereDomain($domain)->lazyById(500),