friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix shared bug maybe

Browse Source
This commit is contained in:
Stanley Dimant
2025-01-12 16:24:52 +01:00
parent 143bd35a88
commit 021aa3f15e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.CharaData.cs
View File

@@ -131,9 +131,13 @@ public partial class MareHub
var allPairs = await GetAllPairInfo(UserUID).ConfigureAwait(false); var allPairs = await GetAllPairInfo(UserUID).ConfigureAwait(false);
List<CharaData> sharedCharaData = []; List<CharaData> 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); .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 var allSharedDataByPair = await DbContext.CharaData
.Include(u => u.Files) .Include(u => u.Files)
@@ -166,7 +170,9 @@ public partial class MareHub
.Include(u => u.AllowedIndividiuals) .Include(u => u.AllowedIndividiuals)
.Include(u => u.Poses) .Include(u => u.Poses)
.Include(u => u.Uploader) .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() .AsSplitQuery()
.AsNoTracking() .AsNoTracking()
.ToListAsync() .ToListAsync()