fix: byobu discussions open up while using this extension

blomstra · Jun 12, 2024 · a9dc8bf · a9dc8bf
1 parent 82e6ec7
commit a9dc8bf
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/src/Seeders/CommentSeeder.php b/src/Seeders/CommentSeeder.php
@@ -87,8 +87,14 @@ public function toDocument(Model $model): Document
         }
 
         if ($this->extensionEnabled('fof-byobu')) {
-            $document['recipient_users'] = $model->discussion->recipientUsers->pluck('id')->toArray();
-            $document['recipient_groups'] = $model->discussion->recipientGroups->pluck('id')->toArray();
+            $document['recipient_users'] = $model->discussion->recipientUsers
+                ->whereNull('removed_at')
+                ->pluck('id')
+                ->toArray();
+            $document['recipient_groups'] = $model->discussion->recipientGroups
+                ->whereNull('removed_at')
+                ->pluck('id')
+                ->toArray();
         }
 
         return $document;

diff --git a/src/Seeders/DiscussionSeeder.php b/src/Seeders/DiscussionSeeder.php
@@ -88,8 +88,14 @@ public function toDocument(Model $model): Document
         }
 
         if ($this->extensionEnabled('fof-byobu')) {
-            $document['recipient_users'] = $model->recipientUsers->pluck('id')->toArray();
-            $document['recipient_groups'] = $model->recipientGroups->pluck('id')->toArray();
+            $document['recipient_users'] = $model->recipientUsers
+                ->whereNull('removed_at')
+                ->pluck('id')
+                ->toArray();
+            $document['recipient_groups'] = $model->recipientGroups
+                ->whereNull('removed_at')
+                ->pluck('id')
+                ->toArray();
         }
 
         if ($this->extensionEnabled('flarum-sticky')) {