From d656513f47bbb42b73a37fa6ea9239e725d1be4b Mon Sep 17 00:00:00 2001
From: Stanley Dimant <root.darkarchon@outlook.com>
Date: Thu, 25 Aug 2022 01:05:31 +0200
Subject: [PATCH] check for alias on addition

---
 .../MareSynchronosServer/Hubs/MareHub.User.cs          | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
index 735d4cc..1524c7d 100644
--- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
+++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.User.cs
@@ -177,11 +177,11 @@ namespace MareSynchronosServer.Hubs
             var user = await _dbContext.Users.SingleAsync(u => u.UID == AuthenticatedUserId).ConfigureAwait(false);
 
             var otherUser = await _dbContext.Users
-                .SingleOrDefaultAsync(u => u.UID == uid).ConfigureAwait(false);
+                .SingleOrDefaultAsync(u => u.UID == uid || u.Alias == uid).ConfigureAwait(false);
             var existingEntry =
                 await _dbContext.ClientPairs.AsNoTracking()
                     .FirstOrDefaultAsync(p =>
-                        p.User.UID == AuthenticatedUserId && p.OtherUser.UID == uid).ConfigureAwait(false);
+                        p.User.UID == AuthenticatedUserId && p.OtherUser.UID == otherUser.UID).ConfigureAwait(false);
             if (otherUser == null || existingEntry != null) return;
             _logger.LogInformation("User {AuthenticatedUserId} adding {uid} to whitelist", AuthenticatedUserId, uid);
             ClientPair wl = new ClientPair()
@@ -192,10 +192,11 @@ namespace MareSynchronosServer.Hubs
             };
             await _dbContext.ClientPairs.AddAsync(wl).ConfigureAwait(false);
             await _dbContext.SaveChangesAsync().ConfigureAwait(false);
-            var otherEntry = OppositeEntry(uid);
+            var otherEntry = OppositeEntry(otherUser.UID);
             await Clients.User(user.UID)
                 .SendAsync(Api.OnUserUpdateClientPairs, new ClientPairDto()
                 {
+                    VanityUID = otherUser.Alias,
                     OtherUID = otherUser.UID,
                     IsPaused = false,
                     IsPausedFromOthers = otherEntry?.IsPaused ?? false,
@@ -203,9 +204,10 @@ namespace MareSynchronosServer.Hubs
                 }, string.Empty).ConfigureAwait(false);
             if (otherEntry != null)
             {
-                await Clients.User(uid).SendAsync(Api.OnUserUpdateClientPairs,
+                await Clients.User(otherUser.UID).SendAsync(Api.OnUserUpdateClientPairs,
                     new ClientPairDto()
                     {
+                        VanityUID = user.Alias,
                         OtherUID = user.UID,
                         IsPaused = otherEntry.IsPaused,
                         IsPausedFromOthers = false,