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

Release v2.0.1

apps/dispatch-server/modules/mission.ts

@@ -14,118 +14,113 @@ export const sendAlert = async (
 	connectedAircrafts: ConnectedAircraft[];
 	mission: Mission;
 }> => {
-	try {
+	const mission = await prisma.mission.findUnique({
-		const mission = await prisma.mission.findUnique({
+		where: { id: id },
-			where: { id: id },
+	});
-		});
+	const Stations = await prisma.station.findMany({
-		const Stations = await prisma.station.findMany({
+		where: {
-			where: {
+			id: {
-				id: {
+				in: mission?.missionStationIds,
-					in: mission?.missionStationIds,
-				},
 			},
+		},
+	});
+
+	if (!mission) {
+		throw new Error("Mission not found");
+	}
+
+	// connectedAircrafts the alert is sent to
+	const connectedAircrafts = await prisma.connectedAircraft.findMany({
+		where: {
+			stationId: stationId
+				? stationId
+				: {
+						in: mission.missionStationIds,
+					},
+			logoutTime: null,
+		},
+		include: {
+			Station: true,
+		},
+	});
+
+	for (const aircraft of connectedAircrafts) {
+		io.to(`station:${aircraft.stationId}`).emit("mission-alert", {
+			...mission,
+			Stations,
+		});
+		io.to(`desktop:${aircraft.userId}`).emit("mission-alert", {
+			missionId: mission.id,
 		});
 
-		if (!mission) {
+		const user = await prisma.user.findUnique({
-			throw new Error("Mission not found");
+			where: { id: aircraft.userId },
+		});
+		if (!user) continue;
+		if (user.settingsNtfyRoom) {
+			await sendNtfyMission(mission, Stations, aircraft.Station, user.settingsNtfyRoom);
 		}
-
+		const existingMissionOnStationUser = await prisma.missionOnStationUsers.findFirst({
-		// connectedAircrafts the alert is sent to
-		const connectedAircrafts = await prisma.connectedAircraft.findMany({
 			where: {
-				stationId: stationId
+				missionId: mission.id,
-					? stationId
+				userId: aircraft.userId,
-					: {
+				stationId: aircraft.stationId,
-							in: mission.missionStationIds,
-						},
-				logoutTime: null,
-			},
-			include: {
-				Station: true,
 			},
 		});
 
-		for (const aircraft of connectedAircrafts) {
+		if (!existingMissionOnStationUser)
-			io.to(`station:${aircraft.stationId}`).emit("mission-alert", {
+			await prisma.missionOnStationUsers.create({
-				...mission,
+				data: {
-				Stations,
-			});
-			io.to(`desktop:${aircraft.userId}`).emit("mission-alert", {
-				missionId: mission.id,
-			});
-
-			const user = await prisma.user.findUnique({
-				where: { id: aircraft.userId },
-			});
-			if (!user) continue;
-			if (user.settingsNtfyRoom) {
-				await sendNtfyMission(mission, Stations, aircraft.Station, user.settingsNtfyRoom);
-			}
-			const existingMissionOnStationUser = await prisma.missionOnStationUsers.findFirst({
-				where: {
 					missionId: mission.id,
 					userId: aircraft.userId,
 					stationId: aircraft.stationId,
 				},
 			});
-
-			if (!existingMissionOnStationUser)
-				await prisma.missionOnStationUsers.create({
-					data: {
-						missionId: mission.id,
-						userId: aircraft.userId,
-						stationId: aircraft.stationId,
-					},
-				});
-		}
-
-		// for statistics only
-		await prisma.missionsOnStations
-			.createMany({
-				data: mission.missionStationIds.map((stationId) => ({
-					missionId: mission.id,
-					stationId,
-				})),
-			})
-			.catch((err) => {
-				// Ignore if the entry already exists
-			});
-		if (user === "HPG") {
-			await prisma.mission.update({
-				where: { id: Number(id) },
-				data: {
-					state: "running",
-					missionLog: {
-						push: {
-							type: "alert-log",
-							auto: true,
-							timeStamp: new Date().toISOString(),
-						} as any,
-					},
-				},
-			});
-		} else {
-			await prisma.mission.update({
-				where: { id: Number(id) },
-				data: {
-					state: "running",
-					missionLog: {
-						push: {
-							type: "alert-log",
-							auto: false,
-							timeStamp: new Date().toISOString(),
-							data: {
-								stationId: stationId,
-								user: getPublicUser(user, { ignorePrivacy: true }),
-							},
-						} as any,
-					},
-				},
-			});
-		}
-		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");
 	}
+
+	// for statistics only
+	await prisma.missionsOnStations
+		.createMany({
+			data: mission.missionStationIds.map((stationId) => ({
+				missionId: mission.id,
+				stationId,
+			})),
+		})
+		.catch((err) => {
+			// Ignore if the entry already exists
+		});
+	if (user === "HPG") {
+		await prisma.mission.update({
+			where: { id: Number(id) },
+			data: {
+				state: "running",
+				missionLog: {
+					push: {
+						type: "alert-log",
+						auto: true,
+						timeStamp: new Date().toISOString(),
+					} as any,
+				},
+			},
+		});
+	} else {
+		await prisma.mission.update({
+			where: { id: Number(id) },
+			data: {
+				state: "running",
+				missionLog: {
+					push: {
+						type: "alert-log",
+						auto: false,
+						timeStamp: new Date().toISOString(),
+						data: {
+							stationId: stationId,
+							user: getPublicUser(user, { ignorePrivacy: true }),
+						},
+					} as any,
+				},
+			},
+		});
+	}
+	return { connectedAircrafts, mission };
 };

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}`,
-			`https://ntfy.sh/${ntfyRoom}`,
+		getNtfyData(mission, stations),
-			getNtfyData(mission, stations),
+		getNtfyHeader(mission, clientStation),
-			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,59 +7,55 @@ export const handleParticipantFinished = async (
 	participant: Participant,
 	user: User,
 ) => {
-	try {
+	const discordAccount = await prisma.discordAccount.findFirst({
-		const discordAccount = await prisma.discordAccount.findFirst({
+		where: {
-			where: {
+			userId: user.id,
-				userId: user.id,
+		},
-			},
+	});
-		});
 
-		const badgedToAdd = event.finishedBadges.filter((badge) => {
+	const badgedToAdd = event.finishedBadges.filter((badge) => {
-			return !user.badges.includes(badge);
+		return !user.badges.includes(badge);
-		});
+	});
-		const permissionsToAdd = event.finishedPermissions.filter((permission) => {
+	const permissionsToAdd = event.finishedPermissions.filter((permission) => {
-			return !user.permissions.includes(permission);
+		return !user.permissions.includes(permission);
-		});
+	});
 
-		await prisma.user.update({
+	await prisma.user.update({
-			where: {
+		where: {
-				id: user.id,
+			id: user.id,
+		},
+		data: {
+			badges: {
+				push: badgedToAdd,
 			},
-			data: {
+			permissions: {
-				badges: {
+				push: permissionsToAdd,
-					push: badgedToAdd,
-				},
-				permissions: {
-					push: permissionsToAdd,
-				},
 			},
-		});
+		},
+	});
 
-		if (discordAccount) {
+	if (discordAccount) {
-			await setStandardName({
+		await setStandardName({
-				memberId: discordAccount.discordId,
+			memberId: discordAccount.discordId,
-				userId: user.id,
+			userId: user.id,
-			});
-		}
-		await sendCourseCompletedEmail(user.email, user, event);
-
-		await prisma.participant.update({
-			where: {
-				id: participant.id,
-			},
-			data: {
-				statusLog: {
-					push: {
-						event: "Berechtigungen und Badges vergeben",
-						timestamp: new Date(),
-						user: "system",
-					},
-				},
-			},
 		});
-	} catch (error) {
-		console.error("Error handling participant finished:", error);
 	}
+	await sendCourseCompletedEmail(user.email, user, event);
+
+	await prisma.participant.update({
+		where: {
+			id: participant.id,
+		},
+		data: {
+			statusLog: {
+				push: {
+					event: "Berechtigungen und Badges vergeben",
+					timestamp: new Date(),
+					user: "system",
+				},
+			},
+		},
+	});
 };
 
 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 });
-		const emailHtml = await renderCourseCompleted({ user, event });
 
-		if (!transporter) {
+	if (!transporter) {
-			console.error("Transporter is not initialized");
+		console.error("Transporter is not initialized");
-			return;
+		return;
-		}
-		await sendMail(to, `Kurs ${event.name} erfolgreich abgeschlossen`, emailHtml);
-	} catch (error) {
-		console.error("Error sending course completed email:", error);
 	}
+	sendMail(to, `Kurs ${event.name} erfolgreich abgeschlossen`, emailHtml);
 };
 
 export const sendPasswordChanged = async (to: string, user: User, password: string) => {
-	try {
+	const emailHtml = await renderPasswordChanged({ user, password });
-		const emailHtml = await renderPasswordChanged({ user, password });
 
-		await sendMail(to, `Dein Passwort wurde geändert`, emailHtml);
+	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({
-		const emailHtml = await renderVerificationCode({
+		user,
-			user,
+		code,
-			code,
+	});
-		});
+	await sendMail(to, "Bestätige deine E-Mail-Adresse", emailHtml);
-		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({
-		const emailHtml = await renderBannNotice({
+		user,
-			user,
+		staffName,
-			staffName,
+	});
-		});
+	await sendMail(to, "Deine Sperrung bei Virtual Air Rescue", emailHtml);
-		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({
-		const emailHtml = await renderTimeBanNotice({
+		user,
-			user,
+		staffName,
-			staffName,
+	});
-		});
+	await sendMail(to, "Deine vorrübergehende Sperrung bei Virtual Air Rescue", emailHtml);
-		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,
 	};