From bd128e832f69e9e401e5c277767a49f9e1853c73 Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Fri, 9 Feb 2024 11:41:57 +0100 Subject: [PATCH] do not allow to prune owner --- .../MareSynchronosServer/Hubs/MareHub.Groups.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs index 3cf05fd..3620098 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs @@ -512,10 +512,12 @@ public partial class MareHub var (hasRights, group) = await TryValidateGroupModeratorOrOwner(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).Include(p => p.Group) .Where(g => g.GroupGID == dto.Group.GID) .ToListAsync().ConfigureAwait(false); - 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.Group.OwnerUID != p.GroupUserUID && p.GroupUser.LastLoggedIn.AddDays(days) < DateTime.UtcNow); if (!execute) return usersToPrune.Count();