Resolve alias if used
This commit is contained in:
@@ -44,7 +44,7 @@ public partial class LightlessHub
|
||||
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, 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;
|
||||
@@ -447,9 +447,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)).ToList();
|
||||
b.BannedByUID))];
|
||||
|
||||
_logger.LogCallInfo(LightlessHubLogger.Args(dto, bannedGroupUsers.Count));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user