Merge branch 'Corona-Studio:main' into main

Author: xingsora

ConnectX.Server/Managers/GroupManager.cs

@@ -684,10 +684,10 @@ private void OnLeaveGroupReceived(MessageContext<LeaveGroup> ctx)
         var group = _groupMappings.Values.First(g => g.Users.Any(u => u.UserId == userId));
         var success = new GroupOpResult(GroupCreationStatus.Succeeded);
 
-        ctx.Dispatcher.SendAsync(ctx.FromSession, success).Forget();
-
         if (group.RoomOwner.UserId == userId)
         {
+            ctx.Dispatcher.SendAsync(ctx.FromSession, success).Forget();
+
             _groupMappings.TryRemove(group.RoomId, out _);
             DeleteGroupNetworkAsync(group).Forget();
             NotifyGroupMembersAsync(group, new GroupUserStateChanged(GroupUserStates.Dismissed, null)).Forget();
@@ -699,6 +699,8 @@ private void OnLeaveGroupReceived(MessageContext<LeaveGroup> ctx)
 
         RemoveUser(groupId, userId, ctx.Dispatcher, ctx.FromSession, GroupUserStates.Left);
 
+        ctx.Dispatcher.SendAsync(ctx.FromSession, success).Forget();
+
         _logger.LogUserLeftGroup(ctx.FromSession.Id, group.RoomName, group.RoomShortId);
     }