Update LightlessAPI

This reverts commit 9971b14177.

LightlessSyncServer/LightlessSyncServer/Hubs/LightlessHub.Groups.cs

@@ -28,72 +28,25 @@ public partial class LightlessHub
         var (userHasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
         if (!userHasRights) return;
 
-        var targetUid = dto.User.UID?.Trim();
-        if (string.IsNullOrWhiteSpace(targetUid)) return;
+        var (userExists, groupPair) = await TryValidateUserInGroup(dto.Group.GID, dto.User.UID).ConfigureAwait(false);
+        if (!userExists) return;
 
-        if (string.Equals(group.OwnerUID, targetUid, StringComparison.Ordinal))
-            return;
+        if (groupPair.IsModerator || string.Equals(group.OwnerUID, dto.User.UID, StringComparison.Ordinal)) return;
 
-        var groupPair = await DbContext.GroupPairs
-            .Include(p => p.GroupUser)
-            .SingleOrDefaultAsync(p => p.GroupGID == dto.Group.GID && p.GroupUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
-
-        if (groupPair?.IsModerator == true)
-            return;
-
-        var now = DateTime.UtcNow;
-
-        var existingBan = await DbContext.Set<GroupBan>().SingleOrDefaultAsync(b => b.GroupGID == dto.Group.GID && b.BannedUserUID == targetUid, cancellationToken: RequestAbortedToken).ConfigureAwait(false);
-        var userExists = await DbContext.Users.AsNoTracking().AnyAsync(u => u.UID == targetUid || u.Alias == targetUid, RequestAbortedToken).ConfigureAwait(false);
-
-        if (!userExists && existingBan == null)
-            return;
-
-        const string marker = " (Alias at time of ban:";
-        string suffix;
-
-        if (existingBan?.BannedReason is { } existingReason)
-        {
-            var idx = existingReason.IndexOf(marker, StringComparison.Ordinal);
-            suffix = idx >= 0 ? existingReason.Substring(startIndex: idx) : string.Empty;
-        }
-        else
-        {
-            var alias = groupPair?.GroupUser?.Alias;
-            alias = string.IsNullOrWhiteSpace(alias) ? "-" : alias;
-            suffix = $" (Alias at time of ban: {alias})";
-        }
-
-        var baseReason = (reason ?? string.Empty).Trim();
-        var finalReason = string.IsNullOrEmpty(suffix) ? baseReason : (baseReason + suffix);
-
-        if (existingBan != null)
-        {
-            existingBan.BannedByUID = UserUID;
-            existingBan.BannedReason = finalReason;
-
-            DbContext.Update(existingBan);
-        }
-        else
-        {
-            var ban = new GroupBan
+        var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias;
+        var ban = new GroupBan()
         {
             BannedByUID = UserUID,
-                BannedReason = finalReason,
-                BannedOn = now,
-                BannedUserUID = targetUid,
+            BannedReason = $"{reason} (Alias at time of ban: {alias})",
+            BannedOn = DateTime.UtcNow,
+            BannedUserUID = dto.User.UID,
             GroupGID = dto.Group.GID,
         };
 
         DbContext.Add(ban);
-        }
+        await DbContext.SaveChangesAsync().ConfigureAwait(false);
 
-        await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
-
-        if (groupPair != null)
-        {
         await GroupRemoveUser(dto).ConfigureAwait(false);
-        }
 
         _logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
     }
@@ -447,9 +400,9 @@ public partial class LightlessHub
 
         var banEntries = await DbContext.GroupBans.Include(b => b.BannedUser).Where(g => g.GroupGID == dto.Group.GID).AsNoTracking().ToListAsync(cancellationToken: RequestAbortedToken).ConfigureAwait(false);
 
-        List<BannedGroupUserDto> bannedGroupUsers = [.. banEntries.Select(b =>
+        List<BannedGroupUserDto> bannedGroupUsers = banEntries.Select(b =>
             new BannedGroupUserDto(group.ToGroupData(), b.BannedUser.ToUserData(), b.BannedReason, b.BannedOn,
-                b.BannedByUID))];
+                b.BannedByUID)).ToList();
 
         _logger.LogCallInfo(LightlessHubLogger.Args(dto, bannedGroupUsers.Count));