diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index ae437924..b9303e6b 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -21,7 +21,7 @@ use Illuminate\Support\Collection; class AdminController extends Controller { - public function chartData(User $users) + public function chartData() { $today = Carbon::today()->timestamp; @@ -72,7 +72,7 @@ class AdminController extends Controller ]; } - public function sendNotification(Request $request, User $users) + public function sendNotification(Request $request) { $data = $this->validate($request, [ 'receiver' => 'required|in:all,normal,uid,email', @@ -396,7 +396,7 @@ class AdminController extends Controller ->with('plugins', $enabledPlugins); } - public function getUserData(Request $request, User $users) + public function getUserData(Request $request) { $isSingleUser = $request->has('uid'); @@ -466,7 +466,7 @@ class AdminController extends Controller ]; } - public function userAjaxHandler(Request $request, User $users) + public function userAjaxHandler(Request $request) { $action = $request->input('action'); $user = User::find($request->uid); @@ -545,7 +545,7 @@ class AdminController extends Controller } } - public function playerAjaxHandler(Request $request, User $users) + public function playerAjaxHandler(Request $request) { $action = $request->input('action'); $currentUser = Auth::user(); diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php index b6233352..772bb6b5 100644 --- a/app/Http/Controllers/AuthController.php +++ b/app/Http/Controllers/AuthController.php @@ -18,7 +18,7 @@ use App\Exceptions\PrettyPageException; class AuthController extends Controller { - public function handleLogin(Request $request, Captcha $captcha, User $users) + public function handleLogin(Request $request, Captcha $captcha) { $this->validate($request, [ 'identification' => 'required', @@ -99,7 +99,7 @@ class AuthController extends Controller } } - public function handleRegister(Request $request, Captcha $captcha, User $users) + public function handleRegister(Request $request, Captcha $captcha) { if (! option('user_can_register')) { return json(trans('auth.register.close'), 7); @@ -173,7 +173,7 @@ class AuthController extends Controller } } - public function handleForgot(Request $request, Captcha $captcha, User $users) + public function handleForgot(Request $request, Captcha $captcha) { $this->validate($request, [ 'captcha' => ['required', $captcha], @@ -213,12 +213,12 @@ class AuthController extends Controller return json(trans('auth.forgot.success'), 0); } - public function reset(User $users, $uid) + public function reset($uid) { return view('auth.reset')->with('user', User::find($uid)); } - public function handleReset(Request $request, User $users, $uid) + public function handleReset(Request $request, $uid) { $validated = $this->validate($request, [ 'password' => 'required|min:8|max:32', @@ -250,7 +250,7 @@ class AuthController extends Controller return redirect('/user'); } - public function verify(User $users, $uid) + public function verify($uid) { if (! option('require_verification')) { throw new PrettyPageException(trans('user.verification.disabled'), 1); diff --git a/app/Http/Controllers/ClosetController.php b/app/Http/Controllers/ClosetController.php index acae1969..96b8a818 100644 --- a/app/Http/Controllers/ClosetController.php +++ b/app/Http/Controllers/ClosetController.php @@ -63,7 +63,7 @@ class ClosetController extends Controller ]); } - public function add(Request $request, User $users) + public function add(Request $request) { $this->validate($request, [ 'tid' => 'required|integer', @@ -120,7 +120,7 @@ class ClosetController extends Controller return json(trans('user.closet.rename.success', ['name' => $request->name]), 0); } - public function remove(User $users, $tid) + public function remove($tid) { $user = auth()->user(); diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index f3a2fbbe..c3a9c979 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -47,7 +47,7 @@ class ReportController extends Controller ->get(); } - public function manage(Request $request, User $users) + public function manage(Request $request) { $search = $request->input('search', ''); $sortField = $request->input('sortField', 'report_at'); @@ -63,7 +63,7 @@ class ReportController extends Controller ->limit($perPage) ->get() ->makeHidden(['informer']) - ->map(function ($report) use ($users) { + ->map(function ($report) { $uploader = User::find($report->uploader); if ($uploader) { $report->uploaderName = $uploader->nickname; @@ -81,7 +81,7 @@ class ReportController extends Controller ]; } - public function review(Request $request, User $users) + public function review(Request $request) { $data = $this->validate($request, [ 'id' => 'required|exists:reports', diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php index 85ffa680..f18245b1 100644 --- a/app/Http/Controllers/SkinlibController.php +++ b/app/Http/Controllers/SkinlibController.php @@ -116,7 +116,7 @@ class SkinlibController extends Controller ]); } - public function show(User $users, $tid) + public function show($tid) { $texture = Texture::find($tid); $user = Auth::user(); @@ -264,7 +264,7 @@ class SkinlibController extends Controller return json(trans('skinlib.delete.success'), 0); } - public function privacy(Request $request, User $users) + public function privacy(Request $request) { $t = Texture::find($request->input('tid')); $user = $request->user(); diff --git a/app/Http/Controllers/TextureController.php b/app/Http/Controllers/TextureController.php index 7bcc80b8..d7efa10f 100644 --- a/app/Http/Controllers/TextureController.php +++ b/app/Http/Controllers/TextureController.php @@ -128,7 +128,7 @@ class TextureController extends Controller return $this->avatarByTid($tid, $size); } - public function avatar(User $users, $base64_email, $size = 128) + public function avatar($base64_email, $size = 128) { $user = User::where('email', base64_decode($base64_email))->first(); @@ -139,9 +139,9 @@ class TextureController extends Controller return response()->file(storage_path('static_textures/avatar.png')); } - public function avatarWithSize(User $users, $size, $base64_email) + public function avatarWithSize($size, $base64_email) { - return $this->avatar($users, $base64_email, $size); + return $this->avatar($base64_email, $size); } public function preview($tid, $size = 250)