chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update user domain block commands

This commit is contained in:
Daniel Supernault 2023-12-21 05:00:35 -07:00
parent d8f46f47a1
commit 73a0f528ab
No known key found for this signature in database
GPG Key ID: 23740873EE6F76A1
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Console/Commands/AddUserDomainBlock.php
View File

@ -34,6 +34,10 @@ class AddUserDomainBlock extends Command
$domain = text('Enter domain you want to block');
$domain = strtolower($domain);
$domain = $this->validateDomain($domain);
if(!$domain || empty($domain)) {
$this->error('Invalid domain');
return;
}
$this->processBlocks($domain);
return;
}
@ -41,7 +45,6 @@ class AddUserDomainBlock extends Command
protected function validateDomain($domain)
{
if(!strpos($domain, '.')) {
$this->error('Invalid domain');
return;
}
@ -53,14 +56,13 @@ class AddUserDomainBlock extends Command
$domain = str_replace('http://', '', $domain);
}
$domain = strtolower(parse_url('https://' . $domain, PHP_URL_HOST));
$valid = filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME|FILTER_NULL_ON_FAILURE);
if(!$valid) {
$this->error('Invalid domain');
return;
}
$domain = strtolower(parse_url('https://' . $domain, PHP_URL_HOST));
if($domain === config('pixelfed.domain.app')) {
$this->error('Invalid domain');
return;

15
app/Console/Commands/DeleteUserDomainBlock.php
View File

@ -34,6 +34,10 @@ class DeleteUserDomainBlock extends Command
$domain = text('Enter domain you want to unblock');
$domain = strtolower($domain);
$domain = $this->validateDomain($domain);
if(!$domain || empty($domain)) {
$this->error('Invalid domain');
return;
}
$this->processUnblocks($domain);
return;
}
@ -41,7 +45,6 @@ class DeleteUserDomainBlock extends Command
protected function validateDomain($domain)
{
if(!strpos($domain, '.')) {
$this->error('Invalid domain');
return;
}
@ -53,16 +56,14 @@ class DeleteUserDomainBlock extends Command
$domain = str_replace('http://', '', $domain);
}
$domain = strtolower(parse_url('https://' . $domain, PHP_URL_HOST));
$valid = filter_var($domain, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME|FILTER_NULL_ON_FAILURE);
if(!$valid) {
$this->error('Invalid domain');
return;
}
$domain = strtolower(parse_url('https://' . $domain, PHP_URL_HOST));
if($domain === config('pixelfed.domain.app')) {
$this->error('Invalid domain');
return;
}
@ -77,6 +78,10 @@ class DeleteUserDomainBlock extends Command
protected function processUnblocks($domain)
{
DefaultDomainBlock::whereDomain($domain)->delete();
if(!UserDomainBlock::whereDomain($domain)->count()) {
$this->info('No results found!');
return;
}
progress(
label: 'Updating user domain blocks...',
steps: UserDomainBlock::whereDomain($domain)->lazyById(500),