From c6d5b6a66992cc3e4cb7c75003dcf8cdf86655f6 Mon Sep 17 00:00:00 2001
From: streamer45 <cstcld91@gmail.com>
Date: Wed, 19 Feb 2025 16:35:45 -0600
Subject: [PATCH] Fix self join sound in case of multi sessions

---
 webapp/src/websocket_handlers.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/webapp/src/websocket_handlers.ts b/webapp/src/websocket_handlers.ts
index ad722708c..eaa743eec 100644
--- a/webapp/src/websocket_handlers.ts
+++ b/webapp/src/websocket_handlers.ts
@@ -87,6 +87,7 @@ import {Store} from './types/mattermost-webapp';
 import {
     followThread,
     getCallsClient,
+    getCallsClientSessionID,
     getUserDisplayName,
     notificationsStopRinging,
     playSound,
@@ -179,9 +180,9 @@ export function handleUserJoined(store: Store, ev: WebSocketMessage<UserJoinedDa
     const sessionID = ev.data.session_id;
 
     if (window.callsClient?.channelID === channelID) {
-        if (userID === currentUserID) {
+        if (sessionID === getCallsClientSessionID()) {
             playSound('join_self');
-        } else if (shouldPlayJoinUserSound(store.getState())) {
+        } else if (userID !== currentUserID && shouldPlayJoinUserSound(store.getState())) {
             playSound('join_user');
         }
     }