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

fix joining syncshells

Browse Source
This commit is contained in:
rootdarkarchon
2023-10-19 14:55:11 +02:00
parent f67893134b
commit 4e88c6e68f
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -473,7 +473,8 @@ public partial class MareHub
var self = _dbContext.Users.Single(u => u.UID == UserUID); var self = _dbContext.Users.Single(u => u.UID == UserUID);
var groupPairs = await _dbContext.GroupPairs.Include(p => p.GroupUser).Where(p => p.GroupGID == group.GID && p.GroupUserUID != UserUID).ToListAsync().ConfigureAwait(false); var groupPairs = await _dbContext.GroupPairs.Include(p => p.GroupUser)
.Where(p => p.GroupGID == group.GID && p.GroupUserUID != UserUID).ToListAsync().ConfigureAwait(false);
var userPairsAfterJoin = await GetAllPairInfo(UserUID).ConfigureAwait(false); var userPairsAfterJoin = await GetAllPairInfo(UserUID).ConfigureAwait(false);
@@ -537,7 +538,7 @@ public partial class MareHub
if (existingPermissionsOnDb == null) 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() existingPermissionsOnDb = new()
{ {
UserUID = pair.GroupUserUID, UserUID = pair.GroupUserUID,
OtherUserUID = UserUID, OtherUserUID = UserUID,
@@ -548,7 +549,7 @@ public partial class MareHub
Sticky = false Sticky = false
}; };
await _dbContext.AddAsync(otherPermissionToSelf).ConfigureAwait(false); await _dbContext.AddAsync(existingPermissionsOnDb).ConfigureAwait(false);
} }
otherPermissionToSelf = existingPermissionsOnDb; otherPermissionToSelf = existingPermissionsOnDb;
@@ -562,15 +563,17 @@ public partial class MareHub
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
if ((!allUserPairs.ContainsKey(pair.GroupUserUID) || (allUserPairs.ContainsKey(pair.GroupUserUID) && !allUserPairs[pair.GroupUserUID].IsSynced)) if ((!allUserPairs.ContainsKey(pair.GroupUserUID) || (allUserPairs.TryGetValue(pair.GroupUserUID, out var info) && !info.IsSynced))
&& !otherPermissionToSelf.IsPaused && !ownPermissionsToOther.IsPaused) && !otherPermissionToSelf.IsPaused && !ownPermissionsToOther.IsPaused)
{ {
var groupUserIdent = await GetUserIdent(pair.GroupUserUID).ConfigureAwait(false); var groupUserIdent = await GetUserIdent(pair.GroupUserUID).ConfigureAwait(false);
if (!string.IsNullOrEmpty(groupUserIdent))
{
await Clients.User(UserUID).Client_UserSendOnline(new(pair.ToUserData(), groupUserIdent)).ConfigureAwait(false); await Clients.User(UserUID).Client_UserSendOnline(new(pair.ToUserData(), groupUserIdent)).ConfigureAwait(false);
await Clients.User(pair.GroupUserUID).Client_UserSendOnline(new(self.ToUserData(), UserCharaIdent)).ConfigureAwait(false); await Clients.User(pair.GroupUserUID).Client_UserSendOnline(new(self.ToUserData(), UserCharaIdent)).ConfigureAwait(false);
} }
} }
}
await _dbContext.SaveChangesAsync().ConfigureAwait(false); await _dbContext.SaveChangesAsync().ConfigureAwait(false);