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();
+        var (userExists, groupPair) = await TryValidateUserInGroup(dto.Group.GID, dto.User.UID).ConfigureAwait(false);
-        if (string.IsNullOrWhiteSpace(targetUid)) return;
+        if (!userExists) return;
 
-        if (string.Equals(group.OwnerUID, targetUid, StringComparison.Ordinal))
+        if (groupPair.IsModerator || string.Equals(group.OwnerUID, dto.User.UID, StringComparison.Ordinal)) return;
-            return;
 
-        var groupPair = await DbContext.GroupPairs
+        var alias = string.IsNullOrEmpty(groupPair.GroupUser.Alias) ? "-" : groupPair.GroupUser.Alias;
-            .Include(p => p.GroupUser)
+        var ban = new GroupBan()
-            .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);
+            BannedByUID = UserUID,
-            suffix = idx >= 0 ? existingReason.Substring(startIndex: idx) : string.Empty;
+            BannedReason = $"{reason} (Alias at time of ban: {alias})",
-        }
+            BannedOn = DateTime.UtcNow,
-        else
+            BannedUserUID = dto.User.UID,
-        {
+            GroupGID = dto.Group.GID,
-            var alias = groupPair?.GroupUser?.Alias;
+        };
-            alias = string.IsNullOrWhiteSpace(alias) ? "-" : alias;
-            suffix = $" (Alias at time of ban: {alias})";
-        }
 
-        var baseReason = (reason ?? string.Empty).Trim();
+        DbContext.Add(ban);
-        var finalReason = string.IsNullOrEmpty(suffix) ? baseReason : (baseReason + suffix);
+        await DbContext.SaveChangesAsync().ConfigureAwait(false);
 
-        if (existingBan != null)
+        await GroupRemoveUser(dto).ConfigureAwait(false);
-        {
-            existingBan.BannedByUID = UserUID;
-            existingBan.BannedReason = finalReason;
-
-            DbContext.Update(existingBan);
-        }
-        else
-        {
-            var ban = new GroupBan
-            {
-                BannedByUID = UserUID,
-                BannedReason = finalReason,
-                BannedOn = now,
-                BannedUserUID = targetUid,
-                GroupGID = dto.Group.GID,
-            };
-
-            DbContext.Add(ban);
-        }
-
-        await DbContext.SaveChangesAsync(RequestAbortedToken).ConfigureAwait(false);
-
-        if (groupPair != null)
-        {
-            await GroupRemoveUser(dto).ConfigureAwait(false);
-        }
 
         _logger.LogCallInfo(LightlessHubLogger.Args(dto, "Success"));
     }
@@ -373,7 +326,7 @@ public partial class LightlessHub
         await Clients.User(UserUID).Client_GroupSendFullInfo(new GroupFullInfoDto(newGroup.ToGroupData(), self.ToUserData(),
             newGroup.ToEnum(), initialPrefPermissions.ToEnum(), initialPair.ToEnum(), new(StringComparer.Ordinal), 1))
             .ConfigureAwait(false);
-
+        
         _logger.LogCallInfo(LightlessHubLogger.Args(gid));
 
         return new GroupJoinDto(newGroup.ToGroupData(), passwd, initialPrefPermissions.ToEnum());
@@ -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));
 
@@ -878,7 +831,7 @@ public partial class LightlessHub
         }
 
         var data = await DbContext.GroupProfiles
-            .Include(gp => gp.Group)
+            .Include(gp => gp.Group) 
             .FirstOrDefaultAsync(
                 g => g.Group.GID == dto.Group.GID || g.Group.Alias == dto.Group.AliasOrGID,
                 cancellationToken
@@ -909,85 +862,85 @@ public partial class LightlessHub
     [Authorize(Policy = "Identified")]
     public async Task GroupSetProfile(GroupProfileDto dto)
     {
-        _logger.LogCallInfo(LightlessHubLogger.Args(dto));
+            _logger.LogCallInfo(LightlessHubLogger.Args(dto));
 
-        var cancellationToken = RequestAbortedToken;
+            var cancellationToken = RequestAbortedToken;
 
-        if (dto.Group == null) return;
+            if (dto.Group == null) return;
 
-        var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
+            var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
-        if (!hasRights) return;
+            if (!hasRights) return;
 
-        var groupProfileDb = await DbContext.GroupProfiles
+            var groupProfileDb = await DbContext.GroupProfiles
-            .Include(g => g.Group)
+                .Include(g => g.Group)
-            .FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
+                .FirstOrDefaultAsync(g => g.GroupGID == dto.Group.GID, cancellationToken)
-            .ConfigureAwait(false);
-
-        ImageCheckService.ImageLoadResult profileResult = new();
-        ImageCheckService.ImageLoadResult bannerResult = new();
-
-        //Avatar image validation
-        if (!string.IsNullOrEmpty(dto.PictureBase64))
-        {
-            profileResult = await ImageCheckService.ValidateImageAsync(dto.PictureBase64, banner: false, RequestAbortedToken).ConfigureAwait(false);
-
-            if (!profileResult.Success)
-            {
-                await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, profileResult.ErrorMessage).ConfigureAwait(false);
-                return;
-            }
-        }
-
-        //Banner image validation
-        if (!string.IsNullOrEmpty(dto.BannerBase64))
-        {
-            bannerResult = await ImageCheckService.ValidateImageAsync(dto.BannerBase64, banner: true, RequestAbortedToken).ConfigureAwait(false);
-
-            if (!bannerResult.Success)
-            {
-                await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, bannerResult.ErrorMessage).ConfigureAwait(false);
-                return;
-            }
-        }
-
-        var sanitizedProfileImage = profileResult?.Base64Image;
-        var sanitizedBannerImage = bannerResult?.Base64Image;
-
-        if (groupProfileDb == null)
-        {
-            groupProfileDb = new GroupProfile
-            {
-                GroupGID = dto.Group.GID,
-                Group = group,
-                ProfileDisabled = dto.IsDisabled ?? false,
-                IsNSFW = dto.IsNsfw ?? false,
-
-            };
-
-            groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
-            await DbContext.GroupProfiles.AddAsync(groupProfileDb, cancellationToken).ConfigureAwait(false);
-        }
-        else
-        {
-            groupProfileDb.Group ??= group;
-
-            groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
-        }
-
-        var userIds = await DbContext.GroupPairs
-            .Where(p => p.GroupGID == groupProfileDb.GroupGID)
-            .Select(p => p.GroupUserUID)
-            .ToListAsync(cancellationToken)
-            .ConfigureAwait(false);
-
-        if (userIds.Count > 0)
-        {
-            var profileDto = groupProfileDb.ToDTO();
-            await Clients.Users(userIds).Client_GroupSendProfile(profileDto)
                 .ConfigureAwait(false);
-        }
 
-        await DbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
+            ImageCheckService.ImageLoadResult profileResult = new();
+            ImageCheckService.ImageLoadResult bannerResult = new();
+
+            //Avatar image validation
+            if (!string.IsNullOrEmpty(dto.PictureBase64))
+            {
+                profileResult = await ImageCheckService.ValidateImageAsync(dto.PictureBase64, banner: false, RequestAbortedToken).ConfigureAwait(false);
+
+                if (!profileResult.Success)
+                {
+                    await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, profileResult.ErrorMessage).ConfigureAwait(false);
+                    return;
+                }
+            }
+
+            //Banner image validation
+            if (!string.IsNullOrEmpty(dto.BannerBase64))
+            {
+                bannerResult = await ImageCheckService.ValidateImageAsync(dto.BannerBase64, banner: true, RequestAbortedToken).ConfigureAwait(false);
+
+                if (!bannerResult.Success)
+                {
+                    await Clients.Caller.Client_ReceiveServerMessage(MessageSeverity.Error, bannerResult.ErrorMessage).ConfigureAwait(false);
+                    return;
+                }
+            }
+
+            var sanitizedProfileImage = profileResult?.Base64Image;
+            var sanitizedBannerImage = bannerResult?.Base64Image;
+
+            if (groupProfileDb == null)
+            {
+                groupProfileDb = new GroupProfile
+                {
+                    GroupGID = dto.Group.GID,
+                    Group = group,
+                    ProfileDisabled = dto.IsDisabled ?? false,
+                    IsNSFW = dto.IsNsfw ?? false,
+                    
+                };
+
+                groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
+                await DbContext.GroupProfiles.AddAsync(groupProfileDb, cancellationToken).ConfigureAwait(false);
+            }
+            else
+            {
+                groupProfileDb.Group ??= group;
+
+                groupProfileDb.UpdateProfileFromDto(dto, sanitizedProfileImage, sanitizedBannerImage);
+            }
+
+            var userIds = await DbContext.GroupPairs
+                .Where(p => p.GroupGID == groupProfileDb.GroupGID)
+                .Select(p => p.GroupUserUID)
+                .ToListAsync(cancellationToken)
+                .ConfigureAwait(false);
+
+            if (userIds.Count > 0)
+            {
+                var profileDto = groupProfileDb.ToDTO();
+                await Clients.Users(userIds).Client_GroupSendProfile(profileDto)
+                    .ConfigureAwait(false);
+            }
+
+            await DbContext.SaveChangesAsync(cancellationToken).ConfigureAwait(false);
     }
 
     [Authorize(Policy = "Identified")]