From f46737c8e36838f5cbf0499a547c6d6e31ceaf31 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Sun, 12 Jan 2020 12:09:58 +0800
Subject: [PATCH] remove "CheckPlayerExists" event in some places

---
 app/Http/Controllers/AuthController.php               | 11 +++++------
 app/Http/Controllers/PlayerController.php             |  3 ---
 .../HttpTest/ControllersTest/PlayerControllerTest.php |  2 --
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index a2f3bb88..18fb9816 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -152,12 +152,11 @@ class AuthController extends Controller
 
         $dispatcher->dispatch('auth.registration.attempt', [$data]);
 
-        if (option('register_with_player_name')) {
-            event(new Events\CheckPlayerExists($request->get('player_name')));
-
-            if (Player::where('name', $request->get('player_name'))->first()) {
-                return json(trans('user.player.add.repeated'), 2);
-            }
+        if (
+            option('register_with_player_name') &&
+            Player::where('name', $request->input('player_name'))->count() > 0
+        ) {
+            return json(trans('user.player.add.repeated'), 2);
         }
 
         // If amount of registered accounts of IP is more than allowed amounts,
diff --git a/app/Http/Controllers/PlayerController.php b/app/Http/Controllers/PlayerController.php
index a89be8a2..ac5f7b0d 100644
--- a/app/Http/Controllers/PlayerController.php
+++ b/app/Http/Controllers/PlayerController.php
@@ -2,7 +2,6 @@
 
 namespace App\Http\Controllers;
 
-use App\Events\CheckPlayerExists;
 use App\Events\PlayerWasAdded;
 use App\Events\PlayerWasDeleted;
 use App\Events\PlayerWillBeAdded;
@@ -88,7 +87,6 @@ class PlayerController extends Controller
         ])['name'];
 
         $dispatcher->dispatch('player.add.attempt', [$name, $user]);
-        event(new CheckPlayerExists($name));
 
         if (!Player::where('name', $name)->get()->isEmpty()) {
             return json(trans('user.player.add.repeated'), 6);
@@ -243,7 +241,6 @@ class PlayerController extends Controller
         ])['player'];
         $user = Auth::user();
 
-        event(new CheckPlayerExists($name));
         $player = Player::where('name', $name)->first();
         if (!$player) {
             $dispatcher->dispatch('player.adding', [$name, $user]);
diff --git a/tests/HttpTest/ControllersTest/PlayerControllerTest.php b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
index 9e1585a2..9c2d616c 100644
--- a/tests/HttpTest/ControllersTest/PlayerControllerTest.php
+++ b/tests/HttpTest/ControllersTest/PlayerControllerTest.php
@@ -81,7 +81,6 @@ class PlayerControllerTest extends TestCase
 
             return true;
         });
-        Event::assertDispatched(Events\CheckPlayerExists::class);
         Event::assertNotDispatched('player.adding');
         Event::assertNotDispatched('player.added');
 
@@ -408,7 +407,6 @@ class PlayerControllerTest extends TestCase
                 'code' => 0,
                 'message' => trans('user.player.bind.success'),
             ]);
-        Event::assertDispatched(Events\CheckPlayerExists::class);
         Event::assertDispatched('player.adding', function ($event, $payload) use ($user) {
             $this->assertEquals('abc', $payload[0]);
             $this->assertEquals($user->uid, $payload[1]->uid);