Browse Source

Update TimelineController

Daniel Supernault 6 years ago
parent
commit
e7c4f084bc
1 changed files with 7 additions and 8 deletions
  1. 7 8
      app/Http/Controllers/TimelineController.php

+ 7 - 8
app/Http/Controllers/TimelineController.php

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