From 5468eaeb56b1452e7f17b36b6352d2e13cf6b052 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Mon, 31 Aug 2026 07:08:21 -0600 Subject: [PATCH] Update ASF --- .../Controllers/AdminShadowFilterController.php | 14 ++++++-------- app/Models/AdminShadowFilter.php | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/app/Http/Controllers/AdminShadowFilterController.php b/app/Http/Controllers/AdminShadowFilterController.php index 37f24eac6..5e2ae3ab8 100644 --- a/app/Http/Controllers/AdminShadowFilterController.php +++ b/app/Http/Controllers/AdminShadowFilterController.php @@ -6,8 +6,6 @@ use App\Models\AdminShadowFilter; use App\Models\Profile; use App\Services\AccountService; use App\Services\AdminShadowFilterService; -use Illuminate\Contracts\View\View; -use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; class AdminShadowFilterController extends Controller @@ -17,7 +15,7 @@ class AdminShadowFilterController extends Controller $this->middleware(['auth', 'admin']); } - public function home(Request $request): View + public function home(Request $request) { $filter = $request->input('filter'); $searchQuery = $request->input('q'); @@ -39,7 +37,7 @@ class AdminShadowFilterController extends Controller ->pluck('id') ->toArray(); - return $q->where('item_type', Profile::class)->whereIn('item_id', $ids); + return $q->whereIn('item_type', ['App\Profile', 'App\Models\Profile'])->whereIn('item_id', $ids); }) ->latest() ->paginate(10) @@ -48,12 +46,12 @@ class AdminShadowFilterController extends Controller return view('admin.asf.home', compact('filters')); } - public function create(Request $request): View + public function create(Request $request) { return view('admin.asf.create'); } - public function edit(Request $request, $id): View + public function edit(Request $request, $id) { $filter = AdminShadowFilter::findOrFail($id); $profile = AccountService::get($filter->item_id); @@ -61,7 +59,7 @@ class AdminShadowFilterController extends Controller return view('admin.asf.edit', compact('filter', 'profile')); } - public function store(Request $request): RedirectResponse + public function store(Request $request) { $this->validate($request, [ 'username' => 'required', @@ -98,7 +96,7 @@ class AdminShadowFilterController extends Controller return redirect('/i/admin/asf/home'); } - public function storeEdit(Request $request, $id): RedirectResponse + public function storeEdit(Request $request, $id) { $this->validate($request, [ 'active' => 'sometimes', diff --git a/app/Models/AdminShadowFilter.php b/app/Models/AdminShadowFilter.php index c99627410..d5b9f81cf 100644 --- a/app/Models/AdminShadowFilter.php +++ b/app/Models/AdminShadowFilter.php @@ -22,10 +22,9 @@ class AdminShadowFilter extends Model public function account() { - if ($this->item_type === Profile::class) { + if (in_array($this->item_type, ['App\Profile', 'App\Models\Profile'])) { return AccountService::get($this->item_id, true); } - } public function profile(): BelongsTo