UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-22 06:21:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update ApiV1Controller, apply user domain blocks filtering to hashtag timelines

Browse source
This commit is contained in:
Daniel Supernault 2023-12-21 02:03:15 -07:00
parent fcbcd7ec73
commit 89b8e87477
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/Http/Controllers/Api/ApiV1Controller.php
View file

@ -3285,6 +3285,7 @@ class ApiV1Controller extends Controller
$limit = $request->input('limit', 20); $limit = $request->input('limit', 20);
$onlyMedia = $request->input('only_media', true); $onlyMedia = $request->input('only_media', true);
$pe = $request->has(self::PF_API_ENTITY_KEY); $pe = $request->has(self::PF_API_ENTITY_KEY);
$pid = $request->user()->profile_id;
if($min || $max) { if($min || $max) {
$minMax = SnowflakeService::byDate(now()->subMonths(6)); $minMax = SnowflakeService::byDate(now()->subMonths(6));
@ -3296,7 +3297,8 @@ class ApiV1Controller extends Controller
} }
} }
$filters = UserFilterService::filters($request->user()->profile_id); $filters = UserFilterService::filters($pid);
$domainBlocks = UserFilterService::domainBlocks($pid);
if(!$min && !$max) { if(!$min && !$max) {
$id = 1; $id = 1;
@ -3322,10 +3324,11 @@ class ApiV1Controller extends Controller
if($onlyMedia && !isset($i['media_attachments']) || !count($i['media_attachments'])) { if($onlyMedia && !isset($i['media_attachments']) || !count($i['media_attachments'])) {
return false; return false;
} }
return $i && isset($i['account']); return $i && isset($i['account'], $i['url']);
}) })
->filter(function($i) use($filters) { ->filter(function($i) use($filters, $domainBlocks) {
return !in_array($i['account']['id'], $filters); $domain = strtolower(parse_url($i['url'], PHP_URL_HOST));
return !in_array($i['account']['id'], $filters) && !in_array($domain, $domainBlocks);
}) })
->values() ->values()
->toArray(); ->toArray();