From 723158909838b18672dd74e1220ec15d4fe26d4a Mon Sep 17 00:00:00 2001 From: rootdarkarchon Date: Fri, 16 Dec 2022 21:23:15 +0100 Subject: [PATCH] fix removing moderators on clear, allow change invite state for moderators --- .../MareSynchronosServer/Hubs/MareHub.Groups.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs index 47750b8..0d0a18b 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs @@ -123,7 +123,7 @@ public partial class MareHub { _logger.LogCallInfo(MareHubLogger.Args(gid, enabled.ToString())); - var (hasRights, group) = await TryValidateOwner(gid).ConfigureAwait(false); + var (hasRights, group) = await TryValidateGroupModeratorOrOwner(gid).ConfigureAwait(false); if (!hasRights) return; group.InvitesEnabled = enabled; @@ -676,7 +676,7 @@ public partial class MareHub _logger.LogCallInfo(MareHubLogger.Args(gid, "Success")); - var notPinned = groupPairs.Where(g => !g.IsPinned).ToList(); + var notPinned = groupPairs.Where(g => !g.IsPinned && !g.IsModerator).ToList(); _dbContext.GroupPairs.RemoveRange(notPinned); await _dbContext.SaveChangesAsync().ConfigureAwait(false);