wip

src/Labeler/Labeler.php

@@ -10,6 +10,7 @@
 use InvalidArgumentException;
 use Revolution\Bluesky\Core\CBOR;
 use Revolution\Bluesky\Core\CBOR\AtBytes;
+use Revolution\Bluesky\Core\CBOR\MapKeySort;
 use Revolution\Bluesky\Crypto\K256;
 use Revolution\Bluesky\Crypto\Signature;
 use Revolution\Bluesky\FeedGenerator\ValidateAuth;
@@ -161,4 +162,15 @@ public static function signLabel(UnsignedLabel $unsigned): array
 
         return [$label, $sign];
     }
+
+    public static function formatLabel(array $label): array
+    {
+        return collect($label)
+            ->put('ver', self::VERSION)
+            ->except('id')
+            ->reject(fn ($value) => is_null($value))
+            ->reject(fn ($value, $key) => $key === 'neg' && $value === false)
+            ->sortKeysUsing(new MapKeySort())
+            ->toArray();
+    }
 }

src/Labeler/SavedLabel.php

@@ -55,12 +55,7 @@ public function toArray(): array
 
     public function toEmit(): array
     {
-        return collect($this->toArray())
-            ->except('id')
-            ->reject(fn ($value) => is_null($value))
-            ->reject(fn ($value, $key) => $key === 'neg' && $value === false)
-            ->sortKeysUsing(new CBOR\MapKeySort())
-            ->toArray();
+        return Labeler::formatLabel($this->toArray());
     }
 
     public function toBytes(): string

src/Labeler/SubscribeLabelMessage.php

@@ -18,9 +18,13 @@ public function toBytes(): string
     {
         $header = ['op' => 1, 't' => '#labels'];
 
+        $labels = collect($this->labels)
+            ->map(fn ($label) => Labeler::formatLabel($label))
+            ->toArray();
+
         $body = [
             'seq' => $this->seq,
-            'labels' => $this->labels,
+            'labels' => $labels,
         ];
 
         return CBOR::encode($header).CBOR::encode($body);