refactor: make all exceptions extend BlueskyException

innocenzi · Feb 10, 2024 · 4341d22 · 4341d22
1 parent 6ba12a4
commit 4341d22
Show file tree

Hide file tree

Showing 9 changed files with 36 additions and 29 deletions.
diff --git a/src/Exceptions/BlueskyClientException.php b/src/Exceptions/BlueskyClientException.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace NotificationChannels\Bluesky\Exceptions;
+
+abstract class BlueskyClientException extends BlueskyException
+{
+    public static function create(int $status, ?string $error, ?string $message): static
+    {
+        $suffix = static::createSuffix($status, $error, $message);
+
+        return match ($error) {
+            'AccountTakedown' => new static("Account is suspended ({$suffix})"),
+            'ExpiredToken' => new static("Token is expired ({$suffix})"),
+            'InvalidToken' => new static("Token is invalid ({$suffix})"),
+            default => new static(static::getDefaultMessage() . " ({$suffix})")
+        };
+    }
+
+    abstract protected static function getDefaultMessage(): string;
+
+    protected static function createSuffix(int $status, ?string $error, ?string $message): string
+    {
+        return str($status)
+            ->when($error || $message)
+            ->append(', ' . implode(': ', array_filter([$error, $message])))
+            ->toString();
+    }
+}
diff --git a/src/Exceptions/BlueskyException.php b/src/Exceptions/BlueskyException.php
@@ -4,25 +4,4 @@
 
 abstract class BlueskyException extends \Exception
 {
-    public static function create(int $status, ?string $error, ?string $message): static
-    {
-        $suffix = static::createSuffix($status, $error, $message);
-
-        return match ($error) {
-            'AccountTakedown' => new static("Account is suspended ({$suffix})"),
-            'ExpiredToken' => new static("Token is expired ({$suffix})"),
-            'InvalidToken' => new static("Token is invalid ({$suffix})"),
-            default => new static(static::getDefaultMessage() . " ({$suffix})")
-        };
-    }
-
-    abstract protected static function getDefaultMessage(): string;
-
-    protected static function createSuffix(int $status, ?string $error, ?string $message): string
-    {
-        return str($status)
-            ->when($error || $message)
-            ->append(', ' . implode(': ', array_filter([$error, $message])))
-            ->toString();
-    }
 }
diff --git a/src/Exceptions/CouldNotCreatePost.php b/src/Exceptions/CouldNotCreatePost.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Bluesky\Exceptions;
 
-final class CouldNotCreatePost extends BlueskyException
+final class CouldNotCreatePost extends BlueskyClientException
 {
     protected static function getDefaultMessage(): string
     {

diff --git a/src/Exceptions/CouldNotCreateSession.php b/src/Exceptions/CouldNotCreateSession.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Bluesky\Exceptions;
 
-final class CouldNotCreateSession extends BlueskyException
+final class CouldNotCreateSession extends BlueskyClientException
 {
     protected static function getDefaultMessage(): string
     {

diff --git a/src/Exceptions/CouldNotRefreshSession.php b/src/Exceptions/CouldNotRefreshSession.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Bluesky\Exceptions;
 
-final class CouldNotRefreshSession extends BlueskyException
+final class CouldNotRefreshSession extends BlueskyClientException
 {
     protected static function getDefaultMessage(): string
     {

diff --git a/src/Exceptions/CouldNotResolveHandle.php b/src/Exceptions/CouldNotResolveHandle.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Bluesky\Exceptions;
 
-final class CouldNotResolveHandle extends BlueskyException
+final class CouldNotResolveHandle extends BlueskyClientException
 {
     protected static function getDefaultMessage(): string
     {

diff --git a/src/Exceptions/NoBlueskyChannel.php b/src/Exceptions/NoBlueskyChannel.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Bluesky\Exceptions;
 
-final class NoBlueskyChannel extends \Exception
+final class NoBlueskyChannel extends BlueskyException
 {
     public static function create(string $class): self
     {

diff --git a/src/Exceptions/NoBlueskyIdentityFound.php b/src/Exceptions/NoBlueskyIdentityFound.php
@@ -2,7 +2,7 @@
 
 namespace NotificationChannels\Bluesky\Exceptions;
 
-final class NoBlueskyIdentityFound extends \Exception
+final class NoBlueskyIdentityFound extends BlueskyException
 {
     public static function create(): self
     {

diff --git a/src/RichText/Facets/Facet.php b/src/RichText/Facets/Facet.php
@@ -3,7 +3,7 @@
 namespace NotificationChannels\Bluesky\RichText\Facets;
 
 use NotificationChannels\Bluesky\BlueskyClient;
-use NotificationChannels\Bluesky\Exceptions\BlueskyException;
+use NotificationChannels\Bluesky\Exceptions\BlueskyClientException;
 use NotificationChannels\Bluesky\RichText\Facets\Features\Link;
 use NotificationChannels\Bluesky\RichText\Facets\Features\Mention;
 
@@ -52,7 +52,7 @@ private static function detectMentions(string $text, BlueskyClient $client): arr
 
             try {
                 $did = $client->resolveHandle($handle);
-            } catch (BlueskyException) {
+            } catch (BlueskyClientException) {
                 return null;
             }