ToxicMushroom/mare.server
1
0
Fork 0
mirror of https://github.com/Caraxi/mare.server.git synced 2026-01-01 07:53:38 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

potentially fix group join

Browse source
This commit is contained in:
rootdarkarchon 2023-10-18 16:44:18 +02:00
parent 209a33d6f9
commit 272f1afd9e
1 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
View file

@ -541,6 +541,10 @@ public partial class MareHub
// get others permissionset to self and eventually update it // get others permissionset to self and eventually update it
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);
if (existingPermissionsOnDb == 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);
otherPermissionToSelf = new() otherPermissionToSelf = new()
@ -557,6 +561,9 @@ public partial class MareHub
await _dbContext.AddAsync(otherPermissionToSelf).ConfigureAwait(false); await _dbContext.AddAsync(otherPermissionToSelf).ConfigureAwait(false);
} }
otherPermissionToSelf = existingPermissionsOnDb;
}
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);