From 4eb46cb783f7fa565a446789fcdeb1098bbe4560 Mon Sep 17 00:00:00 2001
From: nocnico <nicolas@syntaxdev.de>
Date: Fri, 25 Jul 2025 16:39:21 +0200
Subject: [PATCH 1/3] fixed #100 // fix Marker Cluster naming, fix Marker Popup
 settings not used

---
 apps/dispatch-server/socket-events/connect-dispatch.ts        | 4 ++--
 apps/dispatch/app/_components/map/MissionMarkers.tsx          | 2 +-
 .../app/_components/map/_components/MarkerCluster.tsx         | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/dispatch-server/socket-events/connect-dispatch.ts b/apps/dispatch-server/socket-events/connect-dispatch.ts
index 192fd25f..853e1d7c 100644
--- a/apps/dispatch-server/socket-events/connect-dispatch.ts
+++ b/apps/dispatch-server/socket-events/connect-dispatch.ts
@@ -70,7 +70,7 @@ export const handleConnectDispatch =
 					userId: user.id,
 				},
 			});
-			if (discordAccount?.id) {
+			if (discordAccount?.id && !ghostMode) {
 				await renameMember(
 					discordAccount.discordId.toString(),
 					`${getPublicUser(user).fullName} • ${selectedZone}`,
@@ -99,7 +99,7 @@ export const handleConnectDispatch =
 
 				io.to("dispatchers").emit("dispatchers-update");
 				io.to("pilots").emit("dispatchers-update");
-				if (discordAccount?.id) {
+				if (discordAccount?.id && !ghostMode) {
 					await renameMember(
 						discordAccount.discordId.toString(),
 						`${getPublicUser(user).fullName} - ${user.publicId}`,
diff --git a/apps/dispatch/app/_components/map/MissionMarkers.tsx b/apps/dispatch/app/_components/map/MissionMarkers.tsx
index a748bc69..92a0de35 100644
--- a/apps/dispatch/app/_components/map/MissionMarkers.tsx
+++ b/apps/dispatch/app/_components/map/MissionMarkers.tsx
@@ -253,7 +253,7 @@ const MissionMarker = ({
 							tab: "home",
 						},
 					],
-					close: openMissionMarker?.map((m) => m.id) || [],
+					close: [],
 				});
 			}
 		};
diff --git a/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx b/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
index 8dbcd078..249ff8b5 100644
--- a/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
+++ b/apps/dispatch/app/_components/map/_components/MarkerCluster.tsx
@@ -158,7 +158,7 @@ const PopupContent = ({
 						</span>
 						<span>
 							{aircraft.Station.bosCallsign.length > 15
-								? aircraft.Station.locationStateShort
+								? aircraft.Station.bosCallsignShort
 								: aircraft.Station.bosCallsign}
 						</span>
 					</div>

From b602a5836c45b664ecce82291ba8d31729b1ae50 Mon Sep 17 00:00:00 2001
From: nocnico <nicolas@syntaxdev.de>
Date: Fri, 25 Jul 2025 17:19:58 +0200
Subject: [PATCH 2/3] Ghostmode fix now?

---
 apps/dispatch-server/routes/dispatcher.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/dispatch-server/routes/dispatcher.ts b/apps/dispatch-server/routes/dispatcher.ts
index 7adc9c6d..03cc314b 100644
--- a/apps/dispatch-server/routes/dispatcher.ts
+++ b/apps/dispatch-server/routes/dispatcher.ts
@@ -34,7 +34,7 @@ router.patch("/:id", async (req, res) => {
 		},
 	});
 
-	if (discordAccount?.id) {
+	if (discordAccount?.id && !disaptcherUpdate.ghostMode) {
 		await renameMember(
 			discordAccount.discordId.toString(),
 			`${getPublicUser(newDispatcher.user).fullName} • ${newDispatcher.zone}`,

From 2671571bfbb0032fce069aea1e9cdc68537adee5 Mon Sep 17 00:00:00 2001
From: nocnico <nicolas@syntaxdev.de>
Date: Fri, 25 Jul 2025 17:43:05 +0200
Subject: [PATCH 3/3] maybe ghostmode fix now?

---
 apps/dispatch-server/socket-events/connect-dispatch.ts | 2 +-
 apps/dispatch/app/_store/audioStore.ts                 | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/dispatch-server/socket-events/connect-dispatch.ts b/apps/dispatch-server/socket-events/connect-dispatch.ts
index 853e1d7c..f2acb6c9 100644
--- a/apps/dispatch-server/socket-events/connect-dispatch.ts
+++ b/apps/dispatch-server/socket-events/connect-dispatch.ts
@@ -99,7 +99,7 @@ export const handleConnectDispatch =
 
 				io.to("dispatchers").emit("dispatchers-update");
 				io.to("pilots").emit("dispatchers-update");
-				if (discordAccount?.id && !ghostMode) {
+				if (discordAccount?.id) {
 					await renameMember(
 						discordAccount.discordId.toString(),
 						`${getPublicUser(user).fullName} - ${user.publicId}`,
diff --git a/apps/dispatch/app/_store/audioStore.ts b/apps/dispatch/app/_store/audioStore.ts
index 0fb63b4d..b1b789c0 100644
--- a/apps/dispatch/app/_store/audioStore.ts
+++ b/apps/dispatch/app/_store/audioStore.ts
@@ -177,6 +177,7 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 					if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
 						changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
 							zone: roomName,
+							ghostMode: dispatchState.ghostMode,
 						});
 					}