allow moderator to check for inactive user count

This commit is contained in:
rootdarkarchon
2024-02-09 11:07:08 +01:00
parent 1360db0733
commit 801a3212cb

View File

@@ -509,8 +509,9 @@ public partial class MareHub
{ {
_logger.LogCallInfo(MareHubLogger.Args(dto, days, execute)); _logger.LogCallInfo(MareHubLogger.Args(dto, days, execute));
var (isOwner, group) = await TryValidateOwner(dto.Group.GID).ConfigureAwait(false); var (hasRights, group) = await TryValidateGroupModeratorOrOwner(dto.Group.GID).ConfigureAwait(false);
if (!isOwner) return -1; var (isOwner, _) = await TryValidateOwner(dto.Group.GID).ConfigureAwait(false);
if (!hasRights) return -1;
var allGroupUsers = await DbContext.GroupPairs.Include(p => p.GroupUser) var allGroupUsers = await DbContext.GroupPairs.Include(p => p.GroupUser)
.Where(g => g.GroupGID == dto.Group.GID) .Where(g => g.GroupGID == dto.Group.GID)
@@ -518,7 +519,7 @@ public partial class MareHub
var usersToPrune = allGroupUsers.Where(p => !p.IsPinned && !p.IsModerator && p.GroupUserUID != UserUID var usersToPrune = allGroupUsers.Where(p => !p.IsPinned && !p.IsModerator && p.GroupUserUID != UserUID
&& p.GroupUser.LastLoggedIn.AddDays(days) < DateTime.UtcNow); && p.GroupUser.LastLoggedIn.AddDays(days) < DateTime.UtcNow);
if (!execute) return usersToPrune.Count(); if (!execute || !isOwner) return usersToPrune.Count();
DbContext.GroupPairs.RemoveRange(usersToPrune); DbContext.GroupPairs.RemoveRange(usersToPrune);