From 2810b952ddd60650b685530bae0cdc9bb48e5158 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Thu, 30 Aug 2018 21:47:25 -0600 Subject: [PATCH] Update SiteController, add mutes and blocks to personal timeline --- app/Http/Controllers/SiteController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/SiteController.php b/app/Http/Controllers/SiteController.php index ec4b00d72..de6e0c874 100644 --- a/app/Http/Controllers/SiteController.php +++ b/app/Http/Controllers/SiteController.php @@ -7,6 +7,7 @@ use App\Follower; use App\Profile; use App\Status; use App\User; +use App\UserFilter; use App\Util\Lexer\PrettyNumber; use Auth; use Cache; @@ -30,10 +31,16 @@ class SiteController extends Controller public function homeTimeline() { + $pid = Auth::user()->profile->id; // TODO: Use redis for timelines $following = Follower::whereProfileId(Auth::user()->profile->id)->pluck('following_id'); $following->push(Auth::user()->profile->id); + $filtered = UserFilter::whereUserId($pid) + ->whereFilterableType('App\Profile') + ->whereIn('filter_type', ['mute', 'block']) + ->pluck('filterable_id'); $timeline = Status::whereIn('profile_id', $following) + ->whereNotIn('profile_id', $filtered) ->whereHas('media') ->orderBy('id', 'desc') ->withCount(['comments', 'likes', 'shares'])