diff --git a/app/Http/Controllers/SkinlibController.php b/app/Http/Controllers/SkinlibController.php index 38d6ac04..c5017d9f 100644 --- a/app/Http/Controllers/SkinlibController.php +++ b/app/Http/Controllers/SkinlibController.php @@ -77,21 +77,16 @@ class SkinlibController extends Controller ->paginate(20); } - public function show(Filter $filter, $tid) + public function show(Filter $filter, Texture $texture) { - $texture = Texture::find($tid); /** @var User */ $user = Auth::user(); /** @var FilesystemAdapter */ $disk = Storage::disk('textures'); - if (!$texture || $texture && $disk->missing($texture->hash)) { + if ($disk->missing($texture->hash)) { if (option('auto_del_invalid_texture')) { - if ($texture) { - $texture->delete(); - } - - abort(404, trans('skinlib.show.deleted')); + $texture->delete(); } abort(404, trans('skinlib.show.deleted')); } diff --git a/routes/web.php b/routes/web.php index de1e69f8..4d4be08d 100644 --- a/routes/web.php +++ b/routes/web.php @@ -103,7 +103,7 @@ Route::prefix('texture')->name('texture.')->group(function () { Route::prefix('skinlib')->name('skinlib.')->group(function () { Route::view('', 'skinlib.index')->name('home'); Route::get('info/{texture}', 'SkinlibController@info')->name('info'); - Route::get('show/{tid}', 'SkinlibController@show')->name('show'); + Route::get('show/{texture}', 'SkinlibController@show')->name('show'); Route::get('list', 'SkinlibController@library')->name('list'); Route::middleware(['authorize', 'verified'])->group(function () { diff --git a/tests/HttpTest/ControllersTest/SkinlibControllerTest.php b/tests/HttpTest/ControllersTest/SkinlibControllerTest.php index 525f2dc8..5e5af665 100644 --- a/tests/HttpTest/ControllersTest/SkinlibControllerTest.php +++ b/tests/HttpTest/ControllersTest/SkinlibControllerTest.php @@ -136,10 +136,6 @@ class SkinlibControllerTest extends TestCase Storage::fake('textures'); $filter = Fakes\Filter::fake(); - // Cannot find texture - $this->get('/skinlib/show/1') - ->assertSee(trans('skinlib.show.deleted')); - // Invalid texture option(['auto_del_invalid_texture' => false]); $texture = factory(Texture::class)->create();