Skip to content

Commit 94503a1

Browse files
committed
Update ApiV1Controller, use admin filter service
1 parent 18382e8 commit 94503a1

File tree

1 file changed

+17
-1
lines changed

1 file changed

+17
-1
lines changed

app/Http/Controllers/Api/ApiV1Controller.php

+17-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
use App\Notification;
3838
use App\Profile;
3939
use App\Services\AccountService;
40+
use App\Services\AdminShadowFilterService;
4041
use App\Services\BookmarkService;
4142
use App\Services\BouncerService;
4243
use App\Services\CollectionService;
@@ -2648,7 +2649,7 @@ public function timelinePublic(Request $request)
26482649
$domainBlocks = UserFilterService::domainBlocks($user->profile_id);
26492650
$hideNsfw = config('instance.hide_nsfw_on_public_feeds');
26502651
$amin = SnowflakeService::byDate(now()->subDays(config('federation.network_timeline_days_falloff')));
2651-
2652+
$asf = AdminShadowFilterService::getHideFromPublicFeedsList();
26522653
if ($local && $remote) {
26532654
$feed = Status::select(
26542655
'id',
@@ -2824,6 +2825,21 @@ public function timelinePublic(Request $request)
28242825

28252826
return ! in_array($domain, $domainBlocks);
28262827
})
2828+
->filter(function ($s) use ($asf, $user) {
2829+
if (! $asf || count($asf) === 0) {
2830+
return true;
2831+
}
2832+
2833+
if (in_array($s['account']['id'], $asf)) {
2834+
if ($user->profile_id == $s['account']['id']) {
2835+
return true;
2836+
}
2837+
2838+
return false;
2839+
}
2840+
2841+
return true;
2842+
})
28272843
->take($limit)
28282844
->values();
28292845

0 commit comments

Comments
 (0)