Change return type to Response

kawax · Mar 11, 2024 · 1cd564d · 1cd564d
1 parent c49be90
commit 1cd564d
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 33 deletions.
diff --git a/docs/bluesky-client.md b/docs/bluesky-client.md
@@ -9,30 +9,31 @@ Only my posts and reposts.
 ```php
 use Revolution\Bluesky\Facades\Bluesky;
 
-/** @var \Illuminate\Support\Collection $response */
+/** @var \Illuminate\Http\Client\Response $response */
 $response = Bluesky::login(identifier: config('bluesky.identifier'), password: config('bluesky.password'))
        ->feed();
 
-dump($response);
+dump($response->json());
 ```
 
 ## Viewing my timeline
 ```php
 use Revolution\Bluesky\Facades\Bluesky;
 
-/** @var \Illuminate\Support\Collection $response */
+/** @var \Illuminate\Http\Client\Response $response */
 $response = Bluesky::login(identifier: config('bluesky.identifier'), password: config('bluesky.password'))
-       ->timeline();
+       ->timeline()
+       ->throw();
 
-dump($response);
+dump($response->collect());
 ```
 
 ## Creating a post
 
 ```php
 use Revolution\Bluesky\Facades\Bluesky;
 
-/** @var \Illuminate\Support\Collection $response */
+/** @var \Illuminate\Http\Client\Response $response */
 Bluesky::login(identifier: config('bluesky.identifier'), password: config('bluesky.password'))
        ->post('test');
 

diff --git a/src/BlueskyClient.php b/src/BlueskyClient.php
@@ -5,10 +5,12 @@
 namespace Revolution\Bluesky;
 
 use Illuminate\Http\Client\RequestException;
+use Illuminate\Http\Client\Response;
 use Illuminate\Support\Collection;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Traits\Macroable;
 use Revolution\Bluesky\Contracts\Factory;
+use Revolution\Bluesky\Enums\AtProto;
 
 class BlueskyClient implements Factory
 {
@@ -51,41 +53,33 @@ public function login(string $identifier, string $password): static
 
     /**
      * My feed.
-     *
-     * @throws RequestException
      */
-    public function feed(string $filter = 'posts_with_replies'): Collection
+    public function feed(string $filter = 'posts_with_replies'): Response
     {
         return Http::baseUrl($this->baseUrl())
             ->withToken($this->session('accessJwt'))
             ->get(AtProto::getAuthorFeed->value, [
                 'actor' => $this->session('did'),
                 'filter' => $filter,
-            ])
-            ->throw()
-            ->collect();
+            ]);
     }
 
     /**
      * My timeline.
-     *
-     * @throws RequestException
-     */
-    public function timeline(string $cursor = ''): Collection
+    */
+    public function timeline(string $cursor = ''): Response
     {
         return Http::baseUrl($this->baseUrl())
             ->withToken($this->session('accessJwt'))
             ->get(AtProto::getTimeline->value, [
                 'cursor' => $cursor,
-            ])
-            ->throw()
-            ->collect();
+            ]);
     }
 
     /**
-     * @throws RequestException
+     * Create new post.
      */
-    public function post(string $text): Collection
+    public function post(string $text): Response
     {
         return Http::baseUrl($this->baseUrl())
             ->withToken($this->session('accessJwt'))
@@ -96,9 +90,7 @@ public function post(string $text): Collection
                     'text' => $text,
                     'createdAt' => now()->toISOString(),
                 ]
-            ])
-            ->throw()
-            ->collect();
+            ]);
     }
 
     private function baseUrl(): string

diff --git a/src/AtProto.php → src/Enums/AtProto.php b/src/AtProto.php → src/Enums/AtProto.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Revolution\Bluesky;
+namespace Revolution\Bluesky\Enums;
 
 enum AtProto: string
 {

diff --git a/src/Facades/Bluesky.php b/src/Facades/Bluesky.php
@@ -4,17 +4,17 @@
 
 namespace Revolution\Bluesky\Facades;
 
-use Illuminate\Support\Collection;
+use Illuminate\Http\Client\Response;
 use Illuminate\Support\Facades\Facade;
 use Revolution\Bluesky\Contracts\Factory;
 
 /**
  * @method static static service(string $service)
  * @method static mixed session(string $key)
  * @method static static login(string $identifier, string $password)
- * @method static Collection feed(string $filter = 'posts_with_replies')
- * @method static Collection timeline(string $cursor = '')
- * @method static Collection post(string $text)
+ * @method static Response feed(string $filter = 'posts_with_replies')
+ * @method static Response timeline(string $cursor = '')
+ * @method static Response post(string $text)
  */
 class Bluesky extends Facade
 {

diff --git a/src/Notifications/BlueskyChannel.php b/src/Notifications/BlueskyChannel.php
@@ -4,11 +4,15 @@
 
 namespace Revolution\Bluesky\Notifications;
 
+use Illuminate\Http\Client\RequestException;
 use Illuminate\Notifications\Notification;
 use Revolution\Bluesky\Facades\Bluesky;
 
 class BlueskyChannel
 {
+    /**
+     * @throws RequestException
+     */
     public function send(mixed $notifiable, Notification $notification): void
     {
         /** @var BlueskyMessage $message */
@@ -27,6 +31,7 @@ public function send(mixed $notifiable, Notification $notification): void
 
         Bluesky::service($route->service)
             ->login($route->identifier, $route->password)
-            ->post($message->text);
+            ->post($message->text)
+            ->throw();
     }
 }
diff --git a/tests/Feature/Client/ClientTest.php b/tests/Feature/Client/ClientTest.php
@@ -50,7 +50,7 @@ public function test_feed()
         $response = Bluesky::login(identifier: 'identifier', password: 'password')
             ->feed(filter: 'posts_with_replies');
 
-        $this->assertTrue($response->has('feed'));
+        $this->assertTrue($response->collect()->has('feed'));
     }
 
     public function test_timeline()
@@ -62,7 +62,7 @@ public function test_timeline()
         $response = Bluesky::login(identifier: 'identifier', password: 'password')
             ->timeline(cursor: '1');
 
-        $this->assertTrue($response->has('feed'));
+        $this->assertTrue($response->collect()->has('feed'));
     }
 
     public function test_post()
@@ -74,6 +74,6 @@ public function test_post()
         $response = Bluesky::login(identifier: 'identifier', password: 'password')
             ->post(text: 'test');
 
-        $this->assertTrue($response->has('uri'));
+        $this->assertTrue($response->collect()->has('uri'));
     }
 }