fix: not changing recipients visibility when recipients change

blomstra · Jun 13, 2024 · d252a17 · d252a17
1 parent a9dc8bf
commit d252a17
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/src/Seeders/CommentSeeder.php b/src/Seeders/CommentSeeder.php
@@ -15,8 +15,7 @@
 use Blomstra\Search\Save\Document;
 use Flarum\Api\Serializer\PostSerializer;
 use Flarum\Post\CommentPost;
-use Flarum\Post\Event\Deleted;
-use Flarum\Post\Event\Posted;
+use Flarum\Post\Event as Core;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -49,14 +48,18 @@ public function query(): Builder
 
     public static function savingOn(Dispatcher $events, callable $callable)
     {
-        $events->listen(Posted::class, function (Posted $event) use ($callable) {
+        $events->listen([
+            Core\Posted::class,
+        ], function ($event) use ($callable) {
             $callable($event->post);
         });
     }
 
     public static function deletingOn(Dispatcher $events, callable $callable)
     {
-        $events->listen(Deleted::class, function (Deleted $event) use ($callable) {
+        $events->listen([
+            Core\Deleted::class
+        ], function ($event) use ($callable) {
             $callable($event->post);
         });
     }

diff --git a/src/Seeders/DiscussionSeeder.php b/src/Seeders/DiscussionSeeder.php
@@ -15,10 +15,8 @@
 use Blomstra\Search\Save\Document;
 use Flarum\Api\Serializer\DiscussionSerializer;
 use Flarum\Discussion\Discussion;
-use Flarum\Discussion\Event\Deleted;
-use Flarum\Discussion\Event\Hidden;
-use Flarum\Discussion\Event\Restored;
-use Flarum\Discussion\Event\Started;
+use Flarum\Discussion\Event as Core;
+use FoF\Byobu\Events as Byobu;
 use Illuminate\Contracts\Events\Dispatcher;
 use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Model;
@@ -50,14 +48,22 @@ public function query(): Builder
 
     public static function savingOn(Dispatcher $events, callable $callable)
     {
-        $events->listen([Started::class, Restored::class], function ($event) use ($callable) {
+        $events->listen([
+            // flarum/core events
+            Core\Started::class, Core\Restored::class,
+            // fof/byobu discussion recipients events.
+            Byobu\DiscussionMadePublic::class, Byobu\RemovedSelf::class, Byobu\RecipientsChanged::class,
+        ], function ($event) use ($callable) {
             return $callable($event->discussion);
         });
     }
 
     public static function deletingOn(Dispatcher $events, callable $callable)
     {
-        $events->listen([Deleted::class, Hidden::class], function ($event) use ($callable) {
+        $events->listen([
+            // flarum/core events.
+            Core\Deleted::class, Core\Hidden::class
+        ], function ($event) use ($callable) {
             return $callable($event->discussion);
         });
     }