Merge branch 'feature/validate-group-association' into feature/validate-group-association-debug

This commit is contained in:
bcmmbaga
2024-10-21 15:35:56 +03:00
4 changed files with 4 additions and 30 deletions

View File

@@ -829,7 +829,7 @@ func (am *DefaultAccountManager) SaveOrAddUsers(ctx context.Context, accountID,
return nil, err
}
if areUsersLinkedToPeers(account, userIDs) && account.Settings.GroupsPropagationEnabled {
if account.Settings.GroupsPropagationEnabled && areUsersLinkedToPeers(account, userIDs) {
am.updateAccountPeers(ctx, account)
} else {
log.WithContext(ctx).Tracef("Skipping account peers update for user: %v", userIDs)
@@ -1217,7 +1217,7 @@ func (am *DefaultAccountManager) DeleteRegularUsers(ctx context.Context, account
continue
}
if hadPeers && !updateAccountPeers {
if hadPeers {
updateAccountPeers = true
}