diff --git a/plugins/TagBasedFiltering/TagBasedFiltering.php b/plugins/TagBasedFiltering/TagBasedFiltering.php index f8788cb09b..7d0c8d1ea3 100644 --- a/plugins/TagBasedFiltering/TagBasedFiltering.php +++ b/plugins/TagBasedFiltering/TagBasedFiltering.php @@ -76,7 +76,7 @@ class TagBasedFiltering extends Plugin ]; } - public function onFilterNoteList(Actor $actor, array $notes, ?array &$notes_out) + public function onFilterNoteList(Actor $actor, array &$notes) { $blocked_note_tags = Cache::get( self::cacheKeys($actor)['note'], @@ -87,7 +87,7 @@ class TagBasedFiltering extends Plugin fn () => DB::dql('select atb from actor_tag_block atb where atb.blocker = :blocker', ['blocker' => $actor->getId()]), ); - $notes_out = F\reject( + $notes = F\reject( $notes, fn (Note $n) => ( $n->getActor()->getId() != $actor->getId() diff --git a/src/Core/Controller/FeedController.php b/src/Core/Controller/FeedController.php index b0b192b616..c936feaab0 100644 --- a/src/Core/Controller/FeedController.php +++ b/src/Core/Controller/FeedController.php @@ -45,9 +45,7 @@ abstract class FeedController extends Controller if (\array_key_exists('notes', $result)) { $notes = $result['notes']; if (!\is_null($actor)) { - $notes_out = null; - Event::handle('FilterNoteList', [$actor, $notes, &$notes_out]); - $notes = $notes_out; + Event::handle('FilterNoteList', [$actor, &$notes]); } $notes_out = null;