FeedGenerator

kawax · Nov 22, 2024 · d276157 · d276157
1 parent e8f96b9
commit d276157
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 15 deletions.
diff --git a/config/bluesky.php b/config/bluesky.php
@@ -62,7 +62,10 @@
         'prefix' => env('BLUESKY_OAUTH_PREFIX', '/bluesky/oauth/'),
     ],
 
-    // Feed Generator
+    /**
+     * Feed Generator.
+     * Optional, as if not set, `did:web:example.com` will be used from the current URL.
+     */
     'generator' => [
         // did:web:example.com
         'service' => env('BLUESKY_GENERATOR_SERVICE'),

diff --git a/src/FeedGenerator/FeedGenerator.php b/src/FeedGenerator/FeedGenerator.php
@@ -3,6 +3,7 @@
 namespace Revolution\Bluesky\FeedGenerator;
 
 use Illuminate\Http\Request;
+use Revolution\Bluesky\Support\DID;
 
 final class FeedGenerator
 {
@@ -43,15 +44,17 @@ public static function getFeedSkeleton(string $name, ?int $limit, ?string $curso
         return call_user_func(self::$algos[$name], $limit, $cursor, $request);
     }
 
-    public static function describeFeedGenerator(?string $publisher, ?string $service): array
+    public static function describeFeedGenerator(): array
     {
+        $pub = config('bluesky.generator.publisher') ?? DID::web();
+
         $feeds = collect(self::$algos)
             ->keys()
-            ->map(fn ($algo) => 'at://'.$publisher.'/app.bsky.feed.generator/'.$algo)
+            ->map(fn ($algo) => 'at://'.$pub.'/app.bsky.feed.generator/'.$algo)
             ->toArray();
 
         return [
-            'did' => $service,
+            'did' => config('bluesky.generator.service') ?? DID::web(),
             'feeds' => $feeds,
         ];
     }

diff --git a/...FeedGenerator/Http/DescribeController.php → ...Generator/Http/DescribeFeedController.php b/...FeedGenerator/Http/DescribeController.php → ...Generator/Http/DescribeFeedController.php
@@ -5,13 +5,10 @@
 use Illuminate\Http\Request;
 use Revolution\Bluesky\FeedGenerator\FeedGenerator;
 
-class DescribeController
+class DescribeFeedController
 {
     public function __invoke(Request $request): array
     {
-        return FeedGenerator::describeFeedGenerator(
-            publisher: config('bluesky.generator.publisher'),
-            service: config('bluesky.generator.service'),
-        );
+        return FeedGenerator::describeFeedGenerator();
     }
 }
diff --git a/src/FeedGenerator/Http/WellKnownDidController.php b/src/FeedGenerator/Http/WellKnownDidController.php
@@ -2,16 +2,16 @@
 
 namespace Revolution\Bluesky\FeedGenerator\Http;
 
-use Illuminate\Http\Request;
 use Illuminate\Support\Str;
+use Revolution\Bluesky\Support\DID;
 
 class WellKnownDidController
 {
-    public function __invoke(Request $request): array
+    public function __invoke(): array
     {
         return [
             '@context' => ['https://www.w3.org/ns/did/v1'],
-            'id' => config('bluesky.generator.service') ?? 'did:web:'.Str::of(url('/'))->rtrim('/')->chopStart(['http://', 'https://'])->toString(),
+            'id' => config('bluesky.generator.service') ?? DID::web(),
             'service' => [
                 [
                     'id' => '#bsky_fg',

diff --git a/src/Providers/BlueskyServiceProvider.php b/src/Providers/BlueskyServiceProvider.php
@@ -18,7 +18,7 @@
 use Revolution\Bluesky\Console\NewPrivateKeyCommand;
 use Revolution\Bluesky\Contracts\Factory;
 use Revolution\Bluesky\Contracts\XrpcClient;
-use Revolution\Bluesky\FeedGenerator\Http\DescribeController;
+use Revolution\Bluesky\FeedGenerator\Http\DescribeFeedController;
 use Revolution\Bluesky\FeedGenerator\Http\FeedSkeletonController;
 use Revolution\Bluesky\FeedGenerator\Http\WellKnownDidController;
 use Revolution\Bluesky\Socalite\BlueskyProvider;
@@ -101,7 +101,7 @@ protected function generator(): void
             ->group(function () {
                 Route::get(Feed::getFeedSkeleton, FeedSkeletonController::class)
                     ->name('bluesky.feed.skeleton');
-                Route::get(Feed::describeFeedGenerator, DescribeController::class)
+                Route::get(Feed::describeFeedGenerator, DescribeFeedController::class)
                     ->name('bluesky.feed.describe');
             });
 

diff --git a/tests/Feature/FeedGenerator/FeedGeneratorTest.php b/tests/Feature/FeedGenerator/FeedGeneratorTest.php
@@ -48,6 +48,13 @@ public function test_feed_describe(): void
         $response = $this->get(route('bluesky.feed.describe'));
 
         $response->assertSuccessful();
-        $response->assertJson(['did' => null, 'feeds' => ['at:///app.bsky.feed.generator/test']]);
+        $response->assertJson(['did' => 'did:web:localhost', 'feeds' => ['at://did:web:localhost/app.bsky.feed.generator/test']]);
+    }
+
+    public function test_feed_did(): void
+    {
+        $response = $this->get('.well-known/did.json');
+
+        $response->assertSuccessful();
     }
 }
diff --git a/tests/Feature/Support/SupportTest.php b/tests/Feature/Support/SupportTest.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Http;
 use Revolution\Bluesky\Facades\Bluesky;
 use Revolution\Bluesky\Support\AtUri;
+use Revolution\Bluesky\Support\DID;
 use Revolution\Bluesky\Support\DidDocument;
 use Tests\TestCase;
 
@@ -89,4 +90,11 @@ public function test_at_uri()
         $this->assertSame('app.bsky.feed.post', $at->collection());
         $this->assertSame('abcde', $at->rkey());
     }
+
+    public function test_did_web()
+    {
+        $web = DID::web();
+
+        $this->assertSame('did:web:localhost', $web);
+    }
 }