From 021aa3f15ed0fa7fd5990031276986fb2a73a961 Mon Sep 17 00:00:00 2001 From: Stanley Dimant Date: Sun, 12 Jan 2025 16:24:52 +0100 Subject: [PATCH] fix shared bug maybe --- .../MareSynchronosServer/Hubs/MareHub.CharaData.cs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.CharaData.cs b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.CharaData.cs index 2e530ae..58d293e 100644 --- a/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.CharaData.cs +++ b/MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.CharaData.cs @@ -131,9 +131,13 @@ public partial class MareHub var allPairs = await GetAllPairInfo(UserUID).ConfigureAwait(false); List sharedCharaData = []; - var groups = await DbContext.GroupPairs.Where(u => u.GroupUserUID == UserUID).Select(k => k.GroupGID).ToListAsync() + var groups = await DbContext.GroupPairs + .Where(u => u.GroupUserUID == UserUID) + .Select(k => k.GroupGID) + .ToListAsync() .ConfigureAwait(false); - foreach (var pair in allPairs.Where(p => !p.Value.OwnPermissions.IsPaused && !p.Value.OtherPermissions.IsPaused)) + + foreach (var pair in allPairs.Where(p => (!p.Value.OwnPermissions?.IsPaused ?? false) && (!p.Value.OtherPermissions?.IsPaused ?? false))) { var allSharedDataByPair = await DbContext.CharaData .Include(u => u.Files) @@ -166,7 +170,9 @@ public partial class MareHub .Include(u => u.AllowedIndividiuals) .Include(u => u.Poses) .Include(u => u.Uploader) - .Where(p => p.UploaderUID != UserUID && p.ShareType == CharaDataShare.Shared && (p.AllowedIndividiuals.Any(u => u.AllowedUserUID == UserUID || ownGroups.Contains(u.AllowedGroupGID)))) + .Where(p => p.UploaderUID != UserUID + && p.ShareType == CharaDataShare.Shared + && (p.AllowedIndividiuals.Any(u => u.AllowedUserUID == UserUID || u.AllowedGroupGID != null && ownGroups.Contains(u.AllowedGroupGID)))) .AsSplitQuery() .AsNoTracking() .ToListAsync()