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

Update TimelineController

Browse source
This commit is contained in:
Daniel Supernault 2018-11-19 19:00:21 -07:00
parent c41e6a761d
commit e7c4f084bc
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/Http/Controllers/TimelineController.php
View file

@ -27,14 +27,13 @@ class TimelineController extends Controller
// $timeline = Timeline::build()->local(); // $timeline = Timeline::build()->local();
$pid = Auth::user()->profile->id; $pid = Auth::user()->profile->id;
$filtered = Cache::rememberForever("user:filter:list:$pid", function() use($pid) { $private = Profile::whereIsPrivate(true)->where('id', '!=', $pid)->pluck('id');
return UserFilter::whereUserId($pid) $filters = UserFilter::whereUserId($pid)
->whereFilterableType('App\Profile') ->whereFilterableType('App\Profile')
->whereIn('filter_type', ['mute', 'block']) ->whereIn('filter_type', ['mute', 'block'])
->pluck('filterable_id')->toArray(); ->pluck('filterable_id')->toArray();
}); $filtered = array_merge($private->toArray(), $filters);
$private = Profile::whereIsPrivate(true)->pluck('id');
$filtered = array_merge($private->toArray(), $filtered);
$timeline = Status::whereHas('media') $timeline = Status::whereHas('media')
->whereNotIn('profile_id', $filtered) ->whereNotIn('profile_id', $filtered)
->whereNull('in_reply_to_id') ->whereNull('in_reply_to_id')