From c2799fbb4998393d1e2ffa7b8c33671d4dc6ceb0 Mon Sep 17 00:00:00 2001
From: PxlLoewe <72106766+PxlLoewe@users.noreply.github.com>
Date: Wed, 21 May 2025 14:52:38 -0700
Subject: [PATCH] added other PTT info

---
 .../socket-events/connect-desktop.ts          |  42 +++++++++---------
 apps/dispatch/app/_store/audioStore.ts        |   9 ++++
 grafana/grafana.db                            | Bin 1122304 -> 1122304 bytes
 3 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/apps/dispatch-server/socket-events/connect-desktop.ts b/apps/dispatch-server/socket-events/connect-desktop.ts
index 5c10e93a..24d30d96 100644
--- a/apps/dispatch-server/socket-events/connect-desktop.ts
+++ b/apps/dispatch-server/socket-events/connect-desktop.ts
@@ -4,31 +4,33 @@ import { Socket, Server } from "socket.io";
 export const handleConnectDesktop = (socket: Socket, io: Server) => () => {
 	const user = socket.data.user as User;
 
-	const connectedAircraft = prisma.connectedAircraft.findFirst({
-		where: {
-			userId: user.id,
-			logoutTime: null,
-		},
-		include: {
-			Station: true,
-		},
-	});
-
-	const conenctedDispatchers = prisma.connectedDispatcher.findFirst({
-		where: {
-			userId: user.id,
-			logoutTime: null,
-		},
-	})
-
 	socket.join(`user:${user.id}`);
 	socket.join(`desktop:${user.id}`);
 
-	socket.on("ptt", (data) => {
+	socket.on("ptt", async (data) => {
 		socket.to(`user:${user.id}`).emit("ptt", data);
+		const connectedAircraft = await prisma.connectedAircraft.findFirst({
+			where: {
+				userId: user.id,
+				logoutTime: null,
+			},
+			include: {
+				Station: true,
+			},
+		});
+
+		const connectedDispatcher = await prisma.connectedDispatcher.findFirst({
+			where: {
+				userId: user.id,
+				logoutTime: null,
+			},
+		});
 		socket.to("pilots").emit("other-ptt", {
 			publicUser: user.publicId,
-			source: 
-		})
+			source:
+				connectedAircraft?.Station.bosCallsignShort || connectedDispatcher
+					? "Leitstelle"
+					: user.publicId,
+		});
 	});
 };
diff --git a/apps/dispatch/app/_store/audioStore.ts b/apps/dispatch/app/_store/audioStore.ts
index 43166e16..0a683d59 100644
--- a/apps/dispatch/app/_store/audioStore.ts
+++ b/apps/dispatch/app/_store/audioStore.ts
@@ -132,5 +132,14 @@ const handlePTT = (data: PTTData) => {
 	}
 };
 
+const handleOtherPTT = (data: PTTData) => {
+	console.log("Other PTT", data);
+	useAudioStore.setState({
+		source: data.source,
+	});
+};
+
 pilotSocket.on("ptt", handlePTT);
+pilotSocket.on("other-ptt", handleOtherPTT);
 dispatchSocket.on("ptt", handlePTT);
+dispatchSocket.on("other-ptt", handleOtherPTT);
diff --git a/grafana/grafana.db b/grafana/grafana.db
index 3ff46f51cf50693a1e4a9958b59ceb93d7aa7abd..5fdd0e7a1a0d8a4c8eb92ff3109ae51ab5126fc8 100644
GIT binary patch
delta 87
zcmZoT;L>owWr8$g#zYxs#*D^<)&$1Z1g6#m=GFw3)&$np1h&=$_N@sVrTVOMGW5I-
hw%^j{0Afxc<^p1FAm#yLULfWJV*c&7^aa#D003amAbS7+

delta 87
zcmZoT;L>owWr8$g`a~IL#`MO7)&$1Z1g6#m=GFw3)&$np1h&=$_N@sVrTVP1GxR(%
g+i&S}05K;Ja{)0o5c2>rFA(zqG5_{k`T}Yn08&*T9smFU