Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7321759baf | ||
|
|
383e15f38a | ||
|
|
afe32306d3 | ||
|
|
1b23aede89 | ||
|
|
54e0bc0b12 | ||
|
|
2671571bfb | ||
|
|
b602a5836c | ||
|
|
4eb46cb783 |
@@ -14,6 +14,7 @@ export const sendAlert = async (
|
||||
connectedAircrafts: ConnectedAircraft[];
|
||||
mission: Mission;
|
||||
}> => {
|
||||
try {
|
||||
const mission = await prisma.mission.findUnique({
|
||||
where: { id: id },
|
||||
});
|
||||
@@ -123,4 +124,8 @@ 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");
|
||||
}
|
||||
};
|
||||
|
||||
@@ -50,10 +50,7 @@ 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",
|
||||
@@ -76,9 +73,13 @@ export const sendNtfyMission = async (
|
||||
clientStation: Station,
|
||||
ntfyRoom: string,
|
||||
) => {
|
||||
axios.post(
|
||||
try {
|
||||
await axios.post(
|
||||
`https://ntfy.sh/${ntfyRoom}`,
|
||||
getNtfyData(mission, stations),
|
||||
getNtfyHeader(mission, clientStation),
|
||||
);
|
||||
} catch (error) {
|
||||
console.error("Error sending Ntfy mission:", error);
|
||||
}
|
||||
};
|
||||
|
||||
@@ -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}`,
|
||||
|
||||
@@ -189,7 +189,11 @@ router.post("/:id/send-alert", async (req, res) => {
|
||||
return;
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
res.status(500).json({ error: "Failed to send mission" });
|
||||
res
|
||||
.status(500)
|
||||
.json({
|
||||
error: `Ein Fehler ist aufgetreten. Bitte melde den Fehler als Bug (${(error as Error).message})`,
|
||||
});
|
||||
return;
|
||||
}
|
||||
});
|
||||
|
||||
@@ -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}`,
|
||||
|
||||
@@ -253,7 +253,7 @@ const MissionMarker = ({
|
||||
tab: "home",
|
||||
},
|
||||
],
|
||||
close: openMissionMarker?.map((m) => m.id) || [],
|
||||
close: [],
|
||||
});
|
||||
}
|
||||
};
|
||||
|
||||
@@ -158,7 +158,7 @@ const PopupContent = ({
|
||||
</span>
|
||||
<span>
|
||||
{aircraft.Station.bosCallsign.length > 15
|
||||
? aircraft.Station.locationStateShort
|
||||
? aircraft.Station.bosCallsignShort
|
||||
: aircraft.Station.bosCallsign}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
@@ -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,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ export const handleParticipantFinished = async (
|
||||
participant: Participant,
|
||||
user: User,
|
||||
) => {
|
||||
try {
|
||||
const discordAccount = await prisma.discordAccount.findFirst({
|
||||
where: {
|
||||
userId: user.id,
|
||||
@@ -56,6 +57,9 @@ export const handleParticipantFinished = async (
|
||||
},
|
||||
},
|
||||
});
|
||||
} catch (error) {
|
||||
console.error("Error handling participant finished:", error);
|
||||
}
|
||||
};
|
||||
|
||||
export const handleParticipantEnrolled = async (
|
||||
|
||||
@@ -34,43 +34,61 @@ 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;
|
||||
}
|
||||
sendMail(to, `Kurs ${event.name} erfolgreich abgeschlossen`, emailHtml);
|
||||
await 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) =>
|
||||
|
||||
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 52 KiB |
|
Before Width: | Height: | Size: 22 KiB After Width: | Height: | Size: 71 KiB |
|
Before Width: | Height: | Size: 28 KiB After Width: | Height: | Size: 88 KiB |
|
Before Width: | Height: | Size: 1.7 MiB After Width: | Height: | Size: 39 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 66 KiB |
|
Before Width: | Height: | Size: 23 KiB After Width: | Height: | Size: 100 KiB |
|
Before Width: | Height: | Size: 29 KiB After Width: | Height: | Size: 129 KiB |
|
Before Width: | Height: | Size: 552 KiB After Width: | Height: | Size: 38 KiB |
@@ -22,13 +22,16 @@ 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, // Only take the first letter of each section of the last name
|
||||
fullName: `${user.firstname} ${user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName}`,
|
||||
lastname: user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName.trim(), // Only take the first letter of each section of the last name
|
||||
fullName:
|
||||
`${user.firstname} ${user.settingsHideLastname && !options.ignorePrivacy ? "" : lastName}`.trim(),
|
||||
publicId: user.publicId,
|
||||
badges: user.badges,
|
||||
};
|
||||
|
||||