From 281443d7fee4a4782e05cbe9bd15639062371acd Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 12 Mar 2022 23:15:47 -0700 Subject: [PATCH] Update SearchApiV2Service, filter banned instances --- app/Services/SearchApiV2Service.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/Services/SearchApiV2Service.php b/app/Services/SearchApiV2Service.php index 41487f175..fdda0da07 100644 --- a/app/Services/SearchApiV2Service.php +++ b/app/Services/SearchApiV2Service.php @@ -85,6 +85,7 @@ class SearchApiV2Service $limit = $this->query->input('limit') ?? 20; $offset = $this->query->input('offset') ?? 0; $query = '%' . $this->query->input('q') . '%'; + $banned = InstanceService::getBannedDomains(); $results = Profile::select('profiles.*', 'followers.profile_id', 'followers.created_at') ->whereNull('status') ->leftJoin('followers', function($join) use($user) { @@ -97,9 +98,16 @@ class SearchApiV2Service ->offset($offset) ->limit($limit) ->get() + ->filter(function($profile) use ($banned) { + return in_array($profile->domain, $banned) == false; + }) ->map(function($res) { return AccountService::get($res['id']); - }); + }) + ->filter(function($account) { + return $account && isset($account['id']); + }) + ->values(); return $results; }