From: Daniel Karbach Date: Tue, 8 Jul 2025 12:41:58 +0000 (+0200) Subject: refine enemizer usear association X-Git-Url: http://git.localhorst.tv/?a=commitdiff_plain;h=33c8a19ffdfdaba966d90dbc7c7a9f38a6375cc1;p=alttp.git refine enemizer usear association --- diff --git a/app/Console/Commands/SyncEnemizer.php b/app/Console/Commands/SyncEnemizer.php index 0777d6c..553ac11 100644 --- 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; }