use beer aliases if possible

diff --git a/app/Console/Commands/SyncBeerLeague.php b/app/Console/Commands/SyncBeerLeague.php
index 14ea1dc202165883e767afd4964c084acbaabc12..dfd65e264ab7251a6c318aefb323eaaf13ff3efe 100644 (file)
--- a/app/Console/Commands/SyncBeerLeague.php
+++ b/app/Console/Commands/SyncBeerLeague.php
@@ -62,7 +62,6 @@ class SyncBeerLeague extends Command {
 
                foreach ($events as $event) {
                        try {
-                               $this->line('syncing '.$event->name);
                                $this->syncEvent($event, $schedule);
                        } catch (\Exception $e) {
                                $this->error('error syncing event '.$event->name.': '.$e->getMessage());
@@ -126,7 +125,11 @@ class SyncBeerLeague extends Command {
                }
                $user = $this->getUser($lower_name);
                if ($user) {
-                       $player->name_override = '';
+                       if ($user->username != $lower_name && $user->getName() != $lower_name) {
+                               $player->name_override = ltrim($codename, '@');
+                       } else {
+                               $player->name_override = '';
+                       }
                        $player->user()->associate($user);
                } else {
                        $player->name_override = ltrim($codename, '@');

diff --git a/app/Models/User.php b/app/Models/User.php
index a6b817f5eae31abd37605992df9e71f35a41e27e..b13200f6c6d9fefda74bca7e6126986db91f2bef 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -26,6 +26,9 @@ class User extends Authenticatable
                if (!empty($this->nickname)) {
                        return $this->nickname;
                }
+               if (!empty($this->discord_nickname)) {
+                       return $this->discord_nickname;
+               }
                return $this->username;
        }