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

Update HomeTimelineService, add domain blocks filtering to warmCache method

Browse source
This commit is contained in:
Daniel Supernault 2023-12-21 00:21:33 -07:00
parent 29aa87c282
commit b3148b788e
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/Services/HomeTimelineService.php
View file

@ -6,6 +6,7 @@ use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Redis; use Illuminate\Support\Facades\Redis;
use App\Follower; use App\Follower;
use App\Status; use App\Status;
use App\Models\UserDomainBlock;
class HomeTimelineService class HomeTimelineService
{ {
@ -81,6 +82,8 @@ class HomeTimelineService
$following = array_diff($following, $filters); $following = array_diff($following, $filters);
} }
$domainBlocks = UserDomainBlock::whereProfileId($id)->pluck('domain')->toArray();
$ids = Status::where('id', '>', $minId) $ids = Status::where('id', '>', $minId)
->whereIn('profile_id', $following) ->whereIn('profile_id', $following)
->whereNull(['in_reply_to_id', 'reblog_of_id']) ->whereNull(['in_reply_to_id', 'reblog_of_id'])
@ -91,6 +94,16 @@ class HomeTimelineService
->pluck('id'); ->pluck('id');
foreach($ids as $pid) { foreach($ids as $pid) {
$status = StatusService::get($pid, false);
if(!$status || !isset($status['account'], $status['url'])) {
continue;
}
if($domainBlocks && count($domainBlocks)) {
$domain = strtolower(parse_url($status['url'], PHP_URL_HOST));
if(in_array($domain, $domainBlocks)) {
continue;
}
}
self::add($id, $pid); self::add($id, $pid);
} }