Refactor error handling

toneflix · Sep 5, 2024 · fca93df · fca93df
1 parent 8d76858
commit fca93df
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 11 deletions.
diff --git a/src/Apis/CuttlyRegular.php b/src/Apis/CuttlyRegular.php
@@ -206,11 +206,7 @@ public function send(): ShortenResponse|BaseResponse|StatsResponse
         } catch (\GuzzleHttp\Exception\ClientException $e) {
             $body = (string)$e->getResponse()->getBody();
 
-            return match (true) {
-                isset($this->query['edit']) => Thrower::editing($body),
-                isset($this->query['stats']) => Thrower::stats($body),
-                default => Thrower::shortener($body),
-            };
+            return $this->buildError($body);
         }
 
         $body = (string)$response->getBody();
@@ -219,6 +215,7 @@ public function send(): ShortenResponse|BaseResponse|StatsResponse
             $data = json_decode($body);
 
             return match (true) {
+                is_string($data) => $this->buildError($body),
                 isset($this->query['edit']) => new BaseResponse($data),
                 isset($this->query['stats']) => new StatsResponse($data->stats),
                 default => new ShortenResponse($data->url),
@@ -228,4 +225,13 @@ public function send(): ShortenResponse|BaseResponse|StatsResponse
         $blank = (object)["error" => "No Data Available"];
         return new BaseResponse($blank);
     }
-}
+
+    private function buildError(string $body)
+    {
+        return match (true) {
+            isset($this->query['edit']) => Thrower::editing($body),
+            isset($this->query['stats']) => Thrower::stats($body),
+            default => Thrower::shortener($body),
+        };
+    }
+}
diff --git a/src/Apis/CuttlyTeam.php b/src/Apis/CuttlyTeam.php
@@ -220,11 +220,7 @@ public function send(): ShortenResponse|BaseResponse|StatsResponse
         } catch (\GuzzleHttp\Exception\ClientException $e) {
             $body = (string)$e->getResponse()->getBody();
 
-            return match (true) {
-                $this->query['action'] === 'edit' => Thrower::editing($body),
-                $this->query['action'] === 'stats' => Thrower::stats($body),
-                default => Thrower::shortener($body),
-            };
+            return $this->buildError($body);
         }
 
         $body = (string)$response->getBody();
@@ -233,6 +229,7 @@ public function send(): ShortenResponse|BaseResponse|StatsResponse
             $data = json_decode($body);
 
             return match (true) {
+                is_string($data) => $this->buildError($body),
                 $this->query['action'] === 'edit' => new BaseResponse($data),
                 $this->query['action'] === 'stats' => new StatsResponse($data->stats),
                 default => new ShortenResponse($data),
@@ -242,4 +239,13 @@ public function send(): ShortenResponse|BaseResponse|StatsResponse
         $blank = (object)["error" => "No Data Available"];
         return new BaseResponse($blank);
     }
+
+    private function buildError(string $body)
+    {
+        return match (true) {
+            $this->query['action'] === 'edit' => Thrower::editing($body),
+            $this->query['action'] === 'stats' => Thrower::stats($body),
+            default => Thrower::shortener($body),
+        };
+    }
 }