diff --git a/app/Http/Controllers/AdminController.php b/app/Http/Controllers/AdminController.php index 5dd15869..c7733b67 100644 --- a/app/Http/Controllers/AdminController.php +++ b/app/Http/Controllers/AdminController.php @@ -365,7 +365,6 @@ class AdminController extends Controller $cache = Option::form('cache', OptionForm::AUTO_DETECT, function ($form) { $form->checkbox('enable_avatar_cache')->label(); $form->checkbox('enable_preview_cache')->label(); - $form->checkbox('enable_notfound_cache', '404')->label(); }) ->type('warning') ->addButton([ diff --git a/app/Listeners/CachePlayerExists.php b/app/Listeners/CachePlayerExists.php deleted file mode 100644 index f50e1fa4..00000000 --- a/app/Listeners/CachePlayerExists.php +++ /dev/null @@ -1,41 +0,0 @@ -listen(Events\CheckPlayerExists::class, [$this, 'remember']); - $events->listen(Events\PlayerWasAdded::class, [$this, 'forget']); - } - - public function remember($event) - { - $key = "notfound-{$event->playerName}"; - - if ($event->playerName && is_null(Cache::get($key))) { - $player = Player::where('name', $event->playerName)->first(); - - if (!$player) { - Cache::forever($key, '1'); - - return false; - } else { - return true; - } - } else { - return false; - } - } - - public function forget($event) - { - Cache::forget("notfound-{$event->player->name}"); - } -} diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index d4fe82ac..8284246b 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -2,9 +2,6 @@ namespace App\Providers; -use App\Events; -use App\Listeners; -use Event; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; class EventServiceProvider extends ServiceProvider @@ -36,18 +33,4 @@ class EventServiceProvider extends ServiceProvider 'App\Listeners\SerializeGlobals', ], ]; - - /** - * Register any other events for your application. - * - * @return void - */ - public function boot() - { - parent::boot(); - - if (option('enable_notfound_cache')) { - Event::subscribe(Listeners\CachePlayerExists::class); - } - } } diff --git a/resources/lang/en/options.yml b/resources/lang/en/options.yml index 0612abcb..64a36c19 100644 --- a/resources/lang/en/options.yml +++ b/resources/lang/en/options.yml @@ -206,5 +206,3 @@ cache: enable_preview_cache: title: Texture Preivew label: Enable caching texture preivew - enable_notfound_cache: - label: Enable caching whether player is existed or not diff --git a/resources/misc/changelogs/en/5.0.0.md b/resources/misc/changelogs/en/5.0.0.md index d24e64f4..7bdf0a03 100644 --- a/resources/misc/changelogs/en/5.0.0.md +++ b/resources/misc/changelogs/en/5.0.0.md @@ -67,6 +67,7 @@ - Removed Universal Skin API from core. (Install plugin if you need it.) - Removed auto update check. - Removed cache for Profile JSON. +- Removed cache for existence of player. ## Internal Changes diff --git a/resources/misc/changelogs/zh_CN/5.0.0.md b/resources/misc/changelogs/zh_CN/5.0.0.md index b4ded061..3a414396 100644 --- a/resources/misc/changelogs/zh_CN/5.0.0.md +++ b/resources/misc/changelogs/zh_CN/5.0.0.md @@ -67,6 +67,7 @@ - 移除 Universal Skin API(如有需要,请安装插件) - 移除自动更新检查 - 移除对 Profile JSON 的缓存 +- 移除对角色存在与否的缓存 ## 内部更改 diff --git a/tests/BrowserKitTests/AdminFormsTest.php b/tests/BrowserKitTests/AdminFormsTest.php index 431f9e1d..382b2ffb 100644 --- a/tests/BrowserKitTests/AdminFormsTest.php +++ b/tests/BrowserKitTests/AdminFormsTest.php @@ -190,11 +190,9 @@ class AdminFormsTest extends BrowserKitTestCase ->see(trans('options.cache.driver', ['driver' => config('cache.default')])) ->check('enable_avatar_cache') ->check('enable_preview_cache') - ->check('enable_notfound_cache') ->press('submit_cache'); $this->assertTrue(option('enable_avatar_cache')); $this->assertTrue(option('enable_preview_cache')); - $this->assertTrue(option('enable_notfound_cache')); Cache::shouldReceive('flush'); $this->visit('/admin/resource') diff --git a/tests/ListenersTest/CachePlayerExistsTest.php b/tests/ListenersTest/CachePlayerExistsTest.php deleted file mode 100644 index 19d4504a..00000000 --- a/tests/ListenersTest/CachePlayerExistsTest.php +++ /dev/null @@ -1,43 +0,0 @@ - true]); - $provider = new \App\Providers\EventServiceProvider(app()); - $provider->boot(); - } - - public function testRemember() - { - $player = factory(Player::class)->create(); - Cache::shouldReceive('get') - ->times(2) - ->andReturn(null) - ->andReturn(null); - Cache::shouldReceive('forever')->once()->with('notfound-nope', '1'); - - event(new Events\CheckPlayerExists(null)); - event(new Events\CheckPlayerExists($player->name)); - event(new Events\CheckPlayerExists('nope')); - } - - public function testForget() - { - $player = factory(Player::class)->create(); - event(new Events\PlayerWasAdded($player)); - Cache::shouldReceive('forget')->with("notfound-{$player->name}"); - } -}