From 09b305fa67a52fa8337889d7fb5af512eb648463 Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Thu, 25 Aug 2022 01:29:01 +0200
Subject: [PATCH] fixes for alias display + check aliases on initial uid
 generation

---
 MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs  | 2 +-
 .../MareSynchronosServices/Discord/DiscordBot.cs                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
index 1524c7d..4982bcf 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
@@ -113,7 +113,7 @@ namespace MareSynchronosServer.Hubs
                     userToOther.UserUID == userid
                 select new
                 {
-                    otherEntry.OtherUser.Alias,
+                    userToOther.OtherUser.Alias,
                     userToOther.IsPaused,
                     OtherIsPaused = otherEntry != null && otherEntry.IsPaused,
                     userToOther.OtherUserUID,
diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/DiscordBot.cs b/MareSynchronosServer/MareSynchronosServices/Discord/DiscordBot.cs
index 4de2b25..eef290b 100644
--- a/MareSynchronosServer/MareSynchronosServices/Discord/DiscordBot.cs
+++ b/MareSynchronosServer/MareSynchronosServices/Discord/DiscordBot.cs
@@ -166,7 +166,7 @@ public class DiscordBot : IHostedService
                     while (!hasValidUid)
                     {
                         var uid = GenerateRandomString(10);
-                        if (db.Users.Any(u => u.UID == uid)) continue;
+                        if (db.Users.Any(u => u.UID == uid || u.Alias == uid)) continue;
                         user.UID = uid;
                         hasValidUid = true;
                     }