Fix private calls

toju-app/src/app/features/room/rooms-side-panel/rooms-side-panel.component.ts

@@ -47,6 +47,7 @@ import {
 } from '../../../domains/voice-connection';
 import { VoiceSessionFacade, VoiceWorkspaceService } from '../../../domains/voice-session';
 import { DirectMessageService } from '../../../domains/direct-message';
+import { DirectCallService } from '../../../domains/direct-call';
 import { VoicePlaybackService } from '../../../domains/voice-connection';
 import { formatGameActivityElapsed } from '../../../domains/game-activity';
 import { ExternalLinkService } from '../../../core/platform/external-link.service';
@@ -122,6 +123,7 @@ export class RoomsSidePanelComponent implements OnDestroy {
   private voiceSessionService = inject(VoiceSessionFacade);
   private voiceWorkspace = inject(VoiceWorkspaceService);
   private voicePlayback = inject(VoicePlaybackService);
+  private directCalls = inject(DirectCallService);
   private profileCard = inject(ProfileCardService);
   private directMessages = inject(DirectMessageService);
   private readonly externalLinks = inject(ExternalLinkService);
@@ -623,31 +625,12 @@ export class RoomsSidePanelComponent implements OnDestroy {
     return !current || resolveRoomPermission(room, current, 'joinVoice', roomId);
   }
 
-  private prepareCrossServerVoiceJoin(room: Room, current: User | null): boolean {
+  private prepareVoiceJoin(room: Room, current: User | null): void {
     if (!current?.voiceState?.isConnected || current.voiceState.serverId === room.id) {
-      return true;
+      return;
     }
 
-    if (this.voiceConnection.isVoiceConnected()) {
-      return false;
-    }
-
-    if (current.id) {
-      this.store.dispatch(
-        UsersActions.updateVoiceState({
-          userId: current.id,
-          voiceState: {
-            isConnected: false,
-            isMuted: false,
-            isDeafened: false,
-            roomId: undefined,
-            serverId: undefined
-          }
-        })
-      );
-    }
-
-    return true;
+    this.disconnectCurrentVoiceTarget(current);
   }
 
   private enableVoiceForJoin(room: Room, current: User | null, roomId: string): Promise<void> {
@@ -675,10 +658,8 @@ export class RoomsSidePanelComponent implements OnDestroy {
       return;
     }
 
-    if (!this.prepareCrossServerVoiceJoin(room, current ?? null)) {
-      this.voiceConnection.reportConnectionError('Disconnect from the current voice server before joining a different server.');
-      return;
-    }
+    this.directCalls.leaveCurrentJoinedCall();
+    this.prepareVoiceJoin(room, current ?? null);
 
     this.enableVoiceForJoin(room, current ?? null, roomId)
       .then(() => this.onVoiceJoinSucceeded(roomId, room, current ?? null))
@@ -775,10 +756,14 @@ export class RoomsSidePanelComponent implements OnDestroy {
     if (!(current?.voiceState?.isConnected && current.voiceState.roomId === roomId))
       return;
 
+    this.disconnectCurrentVoiceTarget(current);
+  }
+
+  private disconnectCurrentVoiceTarget(current: User | null): void {
+    const previousVoiceState = current?.voiceState;
+
     this.voiceConnection.stopVoiceHeartbeat();
-
     this.untrackCurrentUserMic();
-
     this.voiceConnection.disableVoice();
 
     if (current?.id) {
@@ -811,8 +796,8 @@ export class RoomsSidePanelComponent implements OnDestroy {
         isConnected: false,
         isMuted: false,
         isDeafened: false,
-        roomId: undefined,
-        serverId: undefined
+        roomId: previousVoiceState?.roomId,
+        serverId: previousVoiceState?.serverId
       }
     });