From 626c87a420cf7ce0853bb5c3aa510120287ad3fb Mon Sep 17 00:00:00 2001 From: Emelia Smith Date: Sat, 30 Mar 2024 00:54:55 +0100 Subject: [PATCH] Fix default severity for domain blocks --- .../Api/V1/Admin/DomainBlocksController.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php b/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php index 955891d12..95e399720 100644 --- a/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php +++ b/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php @@ -56,16 +56,17 @@ class DomainBlocksController extends ApiController { 'public_comment' => 'sometimes|string|min:1|max:1000', 'obfuscate' => 'sometimes|required|boolean' ]); - + $domain = $request->input('domain'); - $severity = $request->input('severity'); + $severity = $request->input('severity', 'silence'); $private_comment = $request->input('private_comment'); - abort_if(!strpos($domain, '.'), 400, 'Invalid domain'); - abort_if(!filter_var($domain, FILTER_VALIDATE_DOMAIN), 400, 'Invalid domain'); + abort_if(!strpos($domain, '.'), 400, 'Invalid domain'); + abort_if(!filter_var($domain, FILTER_VALIDATE_DOMAIN), 400, 'Invalid domain'); + // This is because Pixelfed can't currently support wildcard domain blocks + // We have to find something that could plausibly be an instance $parts = explode('.', $domain); - if ($parts[0] == '*') { // If we only have two parts, e.g., "*", "example", then we want to fail: abort_if(count($parts) <= 2, 400, 'Invalid domain: This API does not support wildcard domain blocks yet'); @@ -108,8 +109,8 @@ class DomainBlocksController extends ApiController { 'public_comment' => 'sometimes|string|min:1|max:1000', 'obfuscate' => 'sometimes|required|boolean' ]); - - $severity = $request->input('severity'); + + $severity = $request->input('severity', 'silence'); $private_comment = $request->input('private_comment'); $domain_block = Instance::moderated()->find($id);