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

fix permissions on group join

Browse Source
This commit is contained in:
Stanley Dimant
2024-11-24 14:10:30 +01:00
parent 6682e27e4c
commit f292b5b275
1 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
View File

@@ -453,12 +453,12 @@ public partial class MareHub
var otherPermissionToSelf = userinfo?.OtherPermissions ?? null; var otherPermissionToSelf = userinfo?.OtherPermissions ?? null;
if (otherPermissionToSelf == null) if (otherPermissionToSelf == null)
{ {
var existingPermissionsOnDb = await DbContext.Permissions.SingleOrDefaultAsync(p => p.UserUID == pair.GroupUserUID && p.OtherUserUID == UserUID).ConfigureAwait(false); var otherExistingPermsOnDb = await DbContext.Permissions.SingleOrDefaultAsync(p => p.UserUID == pair.GroupUserUID && p.OtherUserUID == UserUID).ConfigureAwait(false);
if (existingPermissionsOnDb == null) if (otherExistingPermsOnDb == null)
{ {
var otherPreferred = await DbContext.GroupPairPreferredPermissions.SingleAsync(u => u.GroupGID == group.GID && u.UserUID == pair.GroupUserUID).ConfigureAwait(false); var otherPreferred = await DbContext.GroupPairPreferredPermissions.SingleAsync(u => u.GroupGID == group.GID && u.UserUID == pair.GroupUserUID).ConfigureAwait(false);
existingPermissionsOnDb = new() otherExistingPermsOnDb = new()
{ {
UserUID = pair.GroupUserUID, UserUID = pair.GroupUserUID,
OtherUserUID = UserUID, OtherUserUID = UserUID,
@@ -469,27 +469,37 @@ public partial class MareHub
Sticky = false Sticky = false
}; };
await DbContext.AddAsync(existingPermissionsOnDb).ConfigureAwait(false); await DbContext.AddAsync(otherExistingPermsOnDb).ConfigureAwait(false);
} }
else if (!allUserPairs.ContainsKey(pair.GroupUserUID)) else if (!otherExistingPermsOnDb.Sticky)
{ {
var otherPreferred = await DbContext.GroupPairPreferredPermissions.SingleAsync(u => u.GroupGID == group.GID && u.UserUID == pair.GroupUserUID).ConfigureAwait(false); var otherPreferred = await DbContext.GroupPairPreferredPermissions.SingleAsync(u => u.GroupGID == group.GID && u.UserUID == pair.GroupUserUID).ConfigureAwait(false);
existingPermissionsOnDb.DisableAnimations = otherPreferred.DisableAnimations; otherExistingPermsOnDb.DisableAnimations = otherPreferred.DisableAnimations;
existingPermissionsOnDb.DisableSounds = otherPreferred.DisableSounds; otherExistingPermsOnDb.DisableSounds = otherPreferred.DisableSounds;
existingPermissionsOnDb.DisableVFX = otherPreferred.DisableVFX; otherExistingPermsOnDb.DisableVFX = otherPreferred.DisableVFX;
existingPermissionsOnDb.IsPaused = otherPreferred.IsPaused; otherExistingPermsOnDb.IsPaused = otherPreferred.IsPaused;
DbContext.Update(existingPermissionsOnDb); DbContext.Update(otherExistingPermsOnDb);
} }
otherPermissionToSelf = existingPermissionsOnDb; otherPermissionToSelf = otherExistingPermsOnDb;
}
else if (!otherPermissionToSelf.Sticky)
{
var otherPreferred = await DbContext.GroupPairPreferredPermissions.SingleAsync(u => u.GroupGID == group.GID && u.UserUID == pair.GroupUserUID).ConfigureAwait(false);
otherPermissionToSelf.DisableAnimations = otherPreferred.DisableAnimations;
otherPermissionToSelf.DisableSounds = otherPreferred.DisableSounds;
otherPermissionToSelf.DisableVFX = otherPreferred.DisableVFX;
otherPermissionToSelf.IsPaused = otherPreferred.IsPaused;
DbContext.Update(otherPermissionToSelf);
} }
await Clients.User(UserUID).Client_GroupPairJoined(new GroupPairFullInfoDto(group.ToGroupData(), await Clients.User(UserUID).Client_GroupPairJoined(new GroupPairFullInfoDto(group.ToGroupData(),
pair.ToUserData(), ownPermissionsToOther.ToUserPermissions(setSticky: ownPermissionsToOther.Sticky), pair.ToUserData(), ownPermissionsToOther.ToUserPermissions(setSticky: ownPermissionsToOther.Sticky),
otherPermissionToSelf.ToUserPermissions(setSticky: false))).ConfigureAwait(false); otherPermissionToSelf.ToUserPermissions(setSticky: false))).ConfigureAwait(false);
await Clients.User(pair.GroupUserUID).Client_GroupPairJoined(new GroupPairFullInfoDto(group.ToGroupData(), await Clients.User(pair.GroupUserUID).Client_GroupPairJoined(new GroupPairFullInfoDto(group.ToGroupData(),
self.ToUserData(), otherPermissionToSelf.ToUserPermissions(setSticky: false), self.ToUserData(), otherPermissionToSelf.ToUserPermissions(setSticky: otherPermissionToSelf.Sticky),
ownPermissionsToOther.ToUserPermissions(setSticky: false))).ConfigureAwait(false); ownPermissionsToOther.ToUserPermissions(setSticky: false))).ConfigureAwait(false);
// if not paired prior and neither has the permissions set to paused, send online // if not paired prior and neither has the permissions set to paused, send online