From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Sat, 10 Jan 2026 00:52:41 +0000 (+0100)
Subject: use beer aliases if possible
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=552f4153f6bd09c2a36b608886a55d240cc0fc3a;p=alttp.git

use beer aliases if possible
---

diff --git a/app/Console/Commands/SyncBeerLeague.php b/app/Console/Commands/SyncBeerLeague.php
index 14ea1dc..dfd65e2 100644
--- 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 a6b817f..b13200f 100644
--- 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;
 	}