From c40b4f5cfd4f2285fb0261922e4d7fdf922f42f8 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sat, 24 Nov 2018 23:35:21 -0700 Subject: [PATCH] Update AccountController --- app/Http/Controllers/AccountController.php | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php index a06bb9ff6..ce4f6a5ef 100644 --- a/app/Http/Controllers/AccountController.php +++ b/app/Http/Controllers/AccountController.php @@ -205,12 +205,10 @@ class AccountController extends Controller $pid = $user->id; Cache::remember("user:filter:list:$pid", 1440, function() use($pid) { - $private = Profile::whereIsPrivate(true)->where('id', '!=', $pid)->pluck('id'); - $filters = UserFilter::whereUserId($pid) + return UserFilter::whereUserId($pid) ->whereFilterableType('App\Profile') ->whereIn('filter_type', ['mute', 'block']) ->pluck('filterable_id')->toArray(); - return array_merge($private->toArray(), $filters); }); return redirect()->back(); @@ -259,12 +257,10 @@ class AccountController extends Controller $pid = $user->id; Cache::remember("user:filter:list:$pid", 1440, function() use($pid) { - $private = Profile::whereIsPrivate(true)->where('id', '!=', $pid)->pluck('id'); - $filters = UserFilter::whereUserId($pid) + return UserFilter::whereUserId($pid) ->whereFilterableType('App\Profile') ->whereIn('filter_type', ['mute', 'block']) ->pluck('filterable_id')->toArray(); - return array_merge($private->toArray(), $filters); }); return redirect()->back(); }