Merge pull request #99 from VAR-Virtual-Air-Rescue/staging

Release v2.0.1

apps/dispatch-server/modules/mission.ts

@@ -14,7 +14,6 @@ export const sendAlert = async (
 	connectedAircrafts: ConnectedAircraft[];
 	mission: Mission;
 }> => {
-	try {
 	const mission = await prisma.mission.findUnique({
 		where: { id: id },
 	});
@@ -124,8 +123,4 @@ export const sendAlert = async (
 		});
 	}
 	return { connectedAircrafts, mission };
-	} catch (error) {
-		console.error("Error sending mission alert:", error);
-		throw new Error("Ein Fehler ist aufgetreten. Bitte melde den Fehler als Bug");
-	}
 };

apps/dispatch-server/modules/ntfy.ts

@@ -50,7 +50,10 @@ const getRthCallsigns = (mission: Mission, stations: Station[]) => {
 	return `🚁 RTH${callsigns.length > 1 ? "s" : ""}: ${callsigns.join(" / ")} `;
 };
 
-const getNtfyHeader = (mission: Mission, clientStation: Station): NtfyHeader => ({
+const getNtfyHeader = (
+	mission: Mission,
+	clientStation: Station,
+): NtfyHeader => ({
 	headers: {
 		Title: `${clientStation.bosCallsignShort} / ${mission.missionKeywordAbbreviation} / ${mission.missionKeywordCategory}`,
 		Tags: "pager",
@@ -73,13 +76,9 @@ export const sendNtfyMission = async (
 	clientStation: Station,
 	ntfyRoom: string,
 ) => {
-	try {
+	axios.post(
-		await axios.post(
 		`https://ntfy.sh/${ntfyRoom}`,
 		getNtfyData(mission, stations),
 		getNtfyHeader(mission, clientStation),
 	);
-	} catch (error) {
-		console.error("Error sending Ntfy mission:", error);
-	}
 };

apps/dispatch-server/routes/dispatcher.ts

@@ -34,7 +34,7 @@ router.patch("/:id", async (req, res) => {
 		},
 	});
 
-	if (discordAccount?.id && !disaptcherUpdate.ghostMode) {
+	if (discordAccount?.id) {
 		await renameMember(
 			discordAccount.discordId.toString(),
 			`${getPublicUser(newDispatcher.user).fullName} • ${newDispatcher.zone}`,

apps/dispatch-server/routes/mission.ts

@@ -189,11 +189,7 @@ router.post("/:id/send-alert", async (req, res) => {
 		return;
 	} catch (error) {
 		console.error(error);
-		res
+		res.status(500).json({ error: "Failed to send mission" });
-			.status(500)
-			.json({
-				error: `Ein Fehler ist aufgetreten. Bitte melde den Fehler als Bug (${(error as Error).message})`,
-			});
 		return;
 	}
 });

apps/dispatch-server/socket-events/connect-dispatch.ts

@@ -70,7 +70,7 @@ export const handleConnectDispatch =
 					userId: user.id,
 				},
 			});
-			if (discordAccount?.id && !ghostMode) {
+			if (discordAccount?.id) {
 				await renameMember(
 					discordAccount.discordId.toString(),
 					`${getPublicUser(user).fullName} • ${selectedZone}`,

apps/dispatch/app/_components/map/MissionMarkers.tsx

@@ -253,7 +253,7 @@ const MissionMarker = ({
 							tab: "home",
 						},
 					],
-					close: [],
+					close: openMissionMarker?.map((m) => m.id) || [],
 				});
 			}
 		};

apps/dispatch/app/_components/map/_components/MarkerCluster.tsx

@@ -158,7 +158,7 @@ const PopupContent = ({
 						</span>
 						<span>
 							{aircraft.Station.bosCallsign.length > 15
-								? aircraft.Station.bosCallsignShort
+								? aircraft.Station.locationStateShort
 								: aircraft.Station.bosCallsign}
 						</span>
 					</div>

apps/dispatch/app/_store/audioStore.ts

@@ -177,7 +177,6 @@ export const useAudioStore = create<TalkState>((set, get) => ({
 					if (dispatchState.status === "connected" && dispatchState.connectedDispatcher?.id) {
 						changeDispatcherAPI(dispatchState.connectedDispatcher?.id, {
 							zone: roomName,
-							ghostMode: dispatchState.ghostMode,
 						});
 					}
 

apps/hub-server/modules/event.ts

@@ -7,7 +7,6 @@ export const handleParticipantFinished = async (
 	participant: Participant,
 	user: User,
 ) => {
-	try {
 	const discordAccount = await prisma.discordAccount.findFirst({
 		where: {
 			userId: user.id,
@@ -57,9 +56,6 @@ export const handleParticipantFinished = async (
 			},
 		},
 	});
-	} catch (error) {
-		console.error("Error handling participant finished:", error);
-	}
 };
 
 export const handleParticipantEnrolled = async (

apps/hub-server/modules/mail.ts

@@ -34,61 +34,43 @@ const initTransporter = () => {
 initTransporter();
 
 export const sendCourseCompletedEmail = async (to: string, user: User, event: Event) => {
-	try {
 	const emailHtml = await renderCourseCompleted({ user, event });
 
 	if (!transporter) {
 		console.error("Transporter is not initialized");
 		return;
 	}
-		await sendMail(to, `Kurs ${event.name} erfolgreich abgeschlossen`, emailHtml);
+	sendMail(to, `Kurs ${event.name} erfolgreich abgeschlossen`, emailHtml);
-	} catch (error) {
-		console.error("Error sending course completed email:", error);
-	}
 };
 
 export const sendPasswordChanged = async (to: string, user: User, password: string) => {
-	try {
 	const emailHtml = await renderPasswordChanged({ user, password });
 
 	await sendMail(to, `Dein Passwort wurde geändert`, emailHtml);
-	} catch (error) {}
 };
 
 export const sendEmailVerification = async (to: string, user: User, code: string) => {
-	try {
 	const emailHtml = await renderVerificationCode({
 		user,
 		code,
 	});
 	await sendMail(to, "Bestätige deine E-Mail-Adresse", emailHtml);
-	} catch (error) {
-		console.error("Error sending email verification:", error);
-	}
 };
 
 export const sendBannEmail = async (to: string, user: User, staffName: string) => {
-	try {
 	const emailHtml = await renderBannNotice({
 		user,
 		staffName,
 	});
 	await sendMail(to, "Deine Sperrung bei Virtual Air Rescue", emailHtml);
-	} catch (error) {
-		console.error("Error sending ban email:", error);
-	}
 };
 
 export const sendTimebannEmail = async (to: string, user: User, staffName: string) => {
-	try {
 	const emailHtml = await renderTimeBanNotice({
 		user,
 		staffName,
 	});
 	await sendMail(to, "Deine vorrübergehende Sperrung bei Virtual Air Rescue", emailHtml);
-	} catch (error) {
-		console.error("Error sending time ban email:", error);
-	}
 };
 
 export const sendMail = async (to: string, subject: string, html: string) =>

packages/database/prisma/json/User.ts

@@ -22,16 +22,13 @@ export const getPublicUser = (
 	},
 ): PublicUser => {
 	const lastName = user.lastname
-		.trim()
 		.split(" ")
-		.map((part) => `${part[0] || ""}.`)
+		.map((part) => `${part[0]}.`)
 		.join(" ");
-
 	return {
 		firstname: user.firstname,
-		lastname: user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName.trim(), // Only take the first letter of each section of the last name
+		lastname: user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName, // Only take the first letter of each section of the last name
-		fullName:
+		fullName: `${user.firstname} ${user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName}`,
-			`${user.firstname} ${user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName}`.trim(),
 		publicId: user.publicId,
 		badges: user.badges,
 	};