浏览代码

Update AccountController

Daniel Supernault 6 年之前
父节点
当前提交
c40b4f5cfd
共有 1 个文件被更改,包括 2 次插入6 次删除
  1. 2 6
      app/Http/Controllers/AccountController.php

+ 2 - 6
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();
     }