From a9dc8bfb16879e5ded50a2a506bf2ed420003208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Wed, 12 Jun 2024 11:34:18 +0200 Subject: [PATCH] fix: byobu discussions open up while using this extension --- src/Seeders/CommentSeeder.php | 10 ++++++++-- src/Seeders/DiscussionSeeder.php | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/Seeders/CommentSeeder.php b/src/Seeders/CommentSeeder.php index 55e50b4..f8092e7 100644 --- a/src/Seeders/CommentSeeder.php +++ b/src/Seeders/CommentSeeder.php @@ -87,8 +87,14 @@ class CommentSeeder extends Seeder } 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 index 8558c50..9e921ee 100644 --- a/src/Seeders/DiscussionSeeder.php +++ b/src/Seeders/DiscussionSeeder.php @@ -88,8 +88,14 @@ class DiscussionSeeder extends Seeder } 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')) {