From feed580f51c3b1a08cf0c32769cce70b20651ea4 Mon Sep 17 00:00:00 2001
From: Emelia Smith <ThisIsMissEm@users.noreply.github.com>
Date: Fri, 29 Mar 2024 23:10:38 +0100
Subject: [PATCH] Minor compatibility fixes

---
 .../Api/V1/Admin/DomainBlocksController.php   | 46 ++++++++++++-------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php b/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php
index 56ba584cc..287ba58e2 100644
--- a/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php
+++ b/app/Http/Controllers/Api/V1/Admin/DomainBlocksController.php
@@ -28,10 +28,13 @@ class DomainBlocksController extends ApiController {
   }
 
   public function show(Request $request, $id) {
-    $res = Instance::moderated()
-      ->findOrFail($id);
+    $domain_block = Instance::moderated()->find($id);
 
-    return $this->json(new DomainBlockResource($res));
+    if (!$domain_block) {
+      return $this->json([ 'error' => 'Record not found'], [], 404);
+    }
+
+    return $this->json(new DomainBlockResource($domain_block));
   }
 
   public function create(Request $request) {
@@ -55,12 +58,12 @@ class DomainBlocksController extends ApiController {
 		abort_if(!strpos($domain, '.'), 400, 'Invalid domain');
 		abort_if(!filter_var($domain, FILTER_VALIDATE_DOMAIN), 400, 'Invalid domain');
 
-    $existing = Instance::moderated()->whereDomain($domain)->first();
+    $existing_domain_block = Instance::moderated()->whereDomain($domain)->first();
 
-    if ($existing) {
+    if ($existing_domain_block) {
       return $this->json([
         'error' => 'A domain block already exists for this domain',
-        'existing_domain_block' => new DomainBlockResource($existing)
+        'existing_domain_block' => new DomainBlockResource($existing_domain_block)
       ], [], 422);
     }
 
@@ -90,26 +93,35 @@ class DomainBlocksController extends ApiController {
     $severity = $request->input('severity');
     $private_comment = $request->input('private_comment');
 
-    $instance = Instance::moderated()->findOrFail($id);
+    $domain_block = Instance::moderated()->find($id);
 
-    $instance->banned = $severity === 'suspend';
-    $instance->unlisted = $severity === 'silence';
-    $instance->notes = [$private_comment];
-    $instance->save();
+    if (!$domain_block) {
+      return $this->json([ 'error' => 'Record not found'], [], 404);
+    }
+
+    $domain_block->banned = $severity === 'suspend';
+    $domain_block->unlisted = $severity === 'silence';
+    $domain_block->notes = [$private_comment];
+    $domain_block->save();
 
     InstanceService::refresh();
 
-    return $this->json(new DomainBlockResource($instance));
+    return $this->json(new DomainBlockResource($domain_block));
   }
 
   public function delete(Request $request, $id) {
-    $instance = Instance::moderated()->findOrFail($id);
-    $instance->banned = false;
-    $instance->unlisted = false;
-    $instance->save();
+    $domain_block = Instance::moderated()->find($id);
+
+    if (!$domain_block) {
+      return $this->json([ 'error' => 'Record not found'], [], 404);
+    }
+
+    $domain_block->banned = false;
+    $domain_block->unlisted = false;
+    $domain_block->save();
 
     InstanceService::refresh();
 
-    return $this->json([], [], 200);
+    return $this->json(null, [], 200);
   }
 }