refine enemizer usear association

diff --git a/app/Console/Commands/SyncEnemizer.php b/app/Console/Commands/SyncEnemizer.php
index 0777d6ca07b18901bd9d44fb7cec5240360f300a..553ac11a7ed538608d00f83d2732bcd5f782b6fe 100644 (file)
--- a/app/Console/Commands/SyncEnemizer.php
+++ b/app/Console/Commands/SyncEnemizer.php
@@ -96,22 +96,26 @@ class SyncEnemizer extends Command {
                        $player->episode()->associate($episode);
                }
                $user = $this->getUser($discord, $twitch);
+               $player->name_override = $discord;
                if ($user) {
                        $player->user()->associate($user);
                } else {
                        $player->user()->disassociate();
-                       $player->name_override = $twitch;
                }
                $player->save();
                return $player;
        }
 
        private function getUser($discord, $twitch) {
-               $user = User::firstWhere('discord_nickname', 'LIKE', $discord);
+               $user = User::firstWhere('username', 'LIKE', $discord);
                if ($user) {
                        return $user;
                }
-               $user = User::firstWhere('username', 'LIKE', $discord);
+               $user = User::firstWhere('global_name', 'LIKE', $discord);
+               if ($user) {
+                       return $user;
+               }
+               $user = User::firstWhere('discord_nickname', 'LIKE', $discord);
                if ($user) {
                        return $user;
                }
@@ -123,6 +127,14 @@ class SyncEnemizer extends Command {
                if ($user) {
                        return $user;
                }
+               $user = User::firstWhere('global_name', 'LIKE', $twitch);
+               if ($user) {
+                       return $user;
+               }
+               $user = User::firstWhere('discord_nickname', 'LIKE', $twitch);
+               if ($user) {
+                       return $user;
+               }
                return null;
        }