PxlLoewe/var-monorepo
1
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Füge E-Mail-Benachrichtigungen für Sperrungen und zeitlich begrenzte Sperrungen hinzu

Browse Source
This commit is contained in:
PxlLoewe
2025-06-28 00:13:55 -07:00
parent 1a1fab3f58
commit 96fcf7e4a5
12 changed files with 445 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

166
apps/hub-server/modules/mail-templates/Bann.tsx Normal file
View File

@@ -0,0 +1,166 @@
import * as React from "react";
import { User } from "@repo/db";
import { Html, render } from "@react-email/components";
import { EmailFooter } from "./EmailFooter";
const styles = `
* {
box-sizing: border-box;
}
body {
margin: 0;
padding: 0;
}
a[x-apple-data-detectors] {
color: inherit !important;
text-decoration: inherit !important;
}
#MessageViewBody a {
color: inherit;
text-decoration: none;
}
p {
line-height: inherit;
}
.desktop_hide,
.desktop_hide table {
mso-hide: all;
display: none;
max-height: 0px;
overflow: hidden;
}
.image_block img + div {
display: none;
}
sup,
sub {
font-size: 75%;
line-height: 0;
}
.menu_block.desktop_hide .menu-links span {
mso-hide: all;
}
@media (max-width: 700px) {
.desktop_hide table.icons-inner {
display: inline-block !important;
}
.icons-inner {
text-align: center;
}
.icons-inner td {
margin: 0 auto;
}
}
`;
const PenaltyNoticeTemplate = ({ user, staffName }: { user: User; staffName: string }) => (
<Html lang="de">
<meta content="text/html; charset=utf-8" httpEquiv="Content-Type" />
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<link
href="https://fonts.googleapis.com/css?family=Montserrat"
rel="stylesheet"
type="text/css"
/>
<style>{styles}</style>
<body style={{ backgroundColor: "#FFFFFF", margin: 0, padding: 0 }}>
<table width="100%">
<tbody>
<tr>
<td>
<table align="center" width="680" style={{ margin: "0 auto", color: "#000000" }}>
<tbody>
<tr>
<td style={{ textAlign: "center", paddingTop: "30px" }}>
<img
src={`${process.env.NEXT_PUBLIC_HUB_URL}/mail/var_logo.png`}
alt="Logo"
width="80"
style={{ display: "block", margin: "0 auto" }}
/>
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "24px",
color: "#011936",
padding: "20px 0",
}}
>
<strong>Deine dauerhafte Sperrung bei Virtual Air Rescue</strong>
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "30px",
color: "#011936",
}}
>
Hallo {user.firstname},
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "18px",
color: "#011936",
padding: "20px",
}}
>
wir möchten dich darüber informieren, dass dein Account dauerhaft von unserer
Plattform Virtual Air Rescue ausgeschlossen wurde.
<br />
Grund hierfür ist ein Verstoß gegen unsere Richtlinien. Eine Rückkehr auf die
Plattform ist leider nicht mehr möglich.
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "16px",
color: "#011936",
padding: "10px 0",
}}
>
Für Fragen oder Einsicht in die Entscheidung kannst du dich direkt an uns
wenden.
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "18px",
color: "#011936",
padding: "20px",
}}
>
Mit freundlichen Grüßen
<br />
<strong>{staffName}</strong>
<br />
Virtual Air Rescue
</td>
</tr>
<tr>
<EmailFooter />
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</body>
</Html>
);
export function renderBannNotice({ user, staffName }: { user: User; staffName: string }) {
return render(<PenaltyNoticeTemplate user={user} staffName={staffName} />);
}

168
apps/hub-server/modules/mail-templates/TimeBann.tsx Normal file
View File

@@ -0,0 +1,168 @@
import * as React from "react";
import { User } from "@repo/db";
import { Html, render } from "@react-email/components";
import { EmailFooter } from "./EmailFooter";
const styles = `
* {
box-sizing: border-box;
}
body {
margin: 0;
padding: 0;
}
a[x-apple-data-detectors] {
color: inherit !important;
text-decoration: inherit !important;
}
#MessageViewBody a {
color: inherit;
text-decoration: none;
}
p {
line-height: inherit;
}
.desktop_hide,
.desktop_hide table {
mso-hide: all;
display: none;
max-height: 0px;
overflow: hidden;
}
.image_block img + div {
display: none;
}
sup,
sub {
font-size: 75%;
line-height: 0;
}
.menu_block.desktop_hide .menu-links span {
mso-hide: all;
}
@media (max-width: 700px) {
.desktop_hide table.icons-inner {
display: inline-block !important;
}
.icons-inner {
text-align: center;
}
.icons-inner td {
margin: 0 auto;
}
}
`;
const TimeBanTemplate = ({ user, staffName }: { user: User; staffName: string }) => (
<Html lang="de">
<meta content="text/html; charset=utf-8" httpEquiv="Content-Type" />
<meta content="width=device-width, initial-scale=1.0" name="viewport" />
<link
href="https://fonts.googleapis.com/css?family=Montserrat"
rel="stylesheet"
type="text/css"
/>
<style>{styles}</style>
<body style={{ backgroundColor: "#FFFFFF", margin: 0, padding: 0 }}>
<table width="100%">
<tbody>
<tr>
<td>
<table align="center" width="680" style={{ margin: "0 auto", color: "#000000" }}>
<tbody>
<tr>
<td style={{ textAlign: "center", paddingTop: "30px" }}>
<img
src={`${process.env.NEXT_PUBLIC_HUB_URL}/mail/var_logo.png`}
alt="Logo"
width="80"
style={{ display: "block", margin: "0 auto" }}
/>
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "24px",
color: "#011936",
padding: "20px 0",
}}
>
<strong>
Zeitlich begrenzte Sperrung deines Accounts bei Virtual Air Rescue
</strong>
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "30px",
color: "#011936",
}}
>
Hallo {user.firstname},
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "18px",
color: "#011936",
padding: "20px",
}}
>
Aufgrund eines Regelverstoßes wurde dein Account bei Virtual Air Rescue
zeitlich begrenzt gesperrt.
<br />
Die Sperre bleibt bis zum Ablauf der definierten Frist aktiv. Danach kannst du
die Plattform wie gewohnt weiter nutzen.
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "16px",
color: "#011936",
padding: "10px 0",
}}
>
Wir empfehlen dir, unsere Verhaltensrichtlinien noch einmal durchzulesen, um
zukünftige Sperren zu vermeiden.
</td>
</tr>
<tr>
<td
style={{
textAlign: "center",
fontSize: "18px",
color: "#011936",
padding: "20px",
}}
>
Mit freundlichen Grüßen
<br />
<strong>{staffName}</strong>
<br />
Virtual Air Rescue
</td>
</tr>
<tr>
<EmailFooter />
</tr>
</tbody>
</table>
</td>
</tr>
</tbody>
</table>
</body>
</Html>
);
export function renderTimeBanNotice({ user, staffName }: { user: User; staffName: string }) {
return render(<TimeBanTemplate user={user} staffName={staffName} />);
}

18
apps/hub-server/modules/mail.ts
View File

@@ -3,6 +3,8 @@ import nodemailer from "nodemailer";
import { renderCourseCompleted } from "./mail-templates/CourseCompleted"; import { renderCourseCompleted } from "./mail-templates/CourseCompleted";
import { renderPasswordChanged } from "./mail-templates/PasswordChanged"; import { renderPasswordChanged } from "./mail-templates/PasswordChanged";
import { renderVerificationCode } from "./mail-templates/ConfirmEmail"; import { renderVerificationCode } from "./mail-templates/ConfirmEmail";
import { renderBannNotice } from "modules/mail-templates/Bann";
import { renderTimeBanNotice } from "modules/mail-templates/TimeBann";
let transporter: nodemailer.Transporter | null = null; let transporter: nodemailer.Transporter | null = null;
@@ -55,6 +57,22 @@ export const sendEmailVerification = async (to: string, user: User, code: string
await sendMail(to, "Bestätige deine E-Mail-Adresse", emailHtml); await sendMail(to, "Bestätige deine E-Mail-Adresse", emailHtml);
}; };
export const sendBannEmail = async (to: string, user: User, staffName: string) => {
const emailHtml = await renderBannNotice({
user,
staffName,
});
await sendMail(to, "Deine Sperrung bei Virtual Air Rescue", emailHtml);
};
export const sendTimebannEmail = async (to: string, user: User, staffName: string) => {
const emailHtml = await renderTimeBanNotice({
user,
staffName,
});
await sendMail(to, "Deine vorrübergehende Sperrung bei Virtual Air Rescue", emailHtml);
};
export const sendMail = async (to: string, subject: string, html: string) => export const sendMail = async (to: string, subject: string, html: string) =>
new Promise<void>(async (resolve, reject) => { new Promise<void>(async (resolve, reject) => {
if (!transporter) { if (!transporter) {

17
apps/hub-server/routes/mail.ts
View File

@@ -1,5 +1,5 @@
import { Router } from "express"; import { Router } from "express";
import { sendEmailVerification, sendMail } from "modules/mail"; import { sendBannEmail, sendEmailVerification, sendMail, sendTimebannEmail } from "modules/mail";
import { sendPasswordChanged, sendCourseCompletedEmail } from "modules/mail"; import { sendPasswordChanged, sendCourseCompletedEmail } from "modules/mail";
const router: Router = Router(); const router: Router = Router();
@@ -52,6 +52,21 @@ router.post("/template/:template", async (req, res) => {
return; return;
} }
await sendEmailVerification(to, data.user, data.code); await sendEmailVerification(to, data.user, data.code);
case "ban-notice":
if (!data.user || !data.staffName) {
res.status(400).json({ error: "Missing ban data" });
return;
}
// Implement ban notice email logic here
await sendBannEmail(to, data.user, data.staffName);
break;
case "timeban-notice":
if (!data.user || !data.staffName) {
res.status(400).json({ error: "Missing timeban data" });
return;
}
await sendTimebannEmail(to, data.user, data.staffName);
break;
default: default:
res.status(400).json({ error: "Invalid template" }); res.status(400).json({ error: "Invalid template" });
return; return;

13
apps/hub/app/(app)/admin/user/[id]/_components/forms.tsx
View File

@@ -56,6 +56,7 @@ import { setStandardName } from "../../../../../../helper/discord";
import { penaltyColumns } from "(app)/admin/penalty/columns"; import { penaltyColumns } from "(app)/admin/penalty/columns";
import { addPenalty, editPenaltys } from "(app)/admin/penalty/actions"; import { addPenalty, editPenaltys } from "(app)/admin/penalty/actions";
import { reportColumns } from "(app)/admin/report/columns"; import { reportColumns } from "(app)/admin/report/columns";
import { sendMail, sendMailByTemplate } from "../../../../../../helper/mail";
interface ProfileFormProps { interface ProfileFormProps {
user: User; user: User;
@@ -349,6 +350,12 @@ export const UserPenalties = ({ user }: { user: User }) => {
userId: user.id, userId: user.id,
createdUserId: createdUser.id, createdUserId: createdUser.id,
}); });
if (user.email) {
await sendMailByTemplate(user.email, "timeban-notice", {
user,
staffName: createdUser.firstname + " " + createdUser.lastname,
});
}
penaltyTable.current?.refresh(); penaltyTable.current?.refresh();
toast.success("Time-Ban wurde hinzugefügt!"); toast.success("Time-Ban wurde hinzugefügt!");
}} }}
@@ -370,6 +377,12 @@ export const UserPenalties = ({ user }: { user: User }) => {
userId: user.id, userId: user.id,
createdUserId: createdUser.id, createdUserId: createdUser.id,
}); });
if (user.email) {
await sendMailByTemplate(user.email, "ban-notice", {
user,
staffName: createdUser.firstname + " " + createdUser.lastname,
});
}
await editUser(user.id, { isBanned: true }); await editUser(user.id, { isBanned: true });
penaltyTable.current?.refresh(); penaltyTable.current?.refresh();
toast.success("Ban wurde hinzugefügt!"); toast.success("Ban wurde hinzugefügt!");

36
apps/hub/app/(app)/admin/user/action.ts
View File

@@ -58,42 +58,6 @@ export const deleteUser = async (id: string) => {
}); });
}; };
export const checkEmailCode = async (code: string) => {
const users = await prisma.user.findMany({
where: {
emailVerificationToken: code,
},
select: {
id: true,
emailVerificationToken: true,
emailVerificationExpiresAt: true,
},
});
const user = users[0];
if (!user || !user.emailVerificationExpiresAt) {
return { error: "Code ist ungültig" };
}
if (user.emailVerificationExpiresAt < new Date()) {
return { error: "Code ist nicht mehr gültig" };
}
await prisma.user.update({
where: {
id: user.id,
},
data: {
emailVerified: true,
emailVerificationToken: null,
emailVerificationExpiresAt: null,
},
});
return {
message: "Email bestätigt!",
};
};
export const sendVerificationLink = async (userId: string) => { export const sendVerificationLink = async (userId: string) => {
const code = Math.floor(10000 + Math.random() * 90000).toString(); const code = Math.floor(10000 + Math.random() * 90000).toString();

10
apps/hub/app/(app)/settings/_components/forms.tsx
View File

@@ -24,13 +24,16 @@ import { UserOptionalDefaults, UserOptionalDefaultsSchema } from "@repo/db/zod";
import { Bell, CircleAlert, Plane, Trash2 } from "lucide-react"; import { Bell, CircleAlert, Plane, Trash2 } from "lucide-react";
import Link from "next/link"; import Link from "next/link";
import { deleteUser, sendVerificationLink } from "(app)/admin/user/action"; import { deleteUser, sendVerificationLink } from "(app)/admin/user/action";
import { setStandardName } from "../../../../helper/discord";
export const ProfileForm = ({ export const ProfileForm = ({
user, user,
penaltys, penaltys,
discordAccount,
}: { }: {
user: User; user: User;
penaltys: Penalty[]; penaltys: Penalty[];
discordAccount?: DiscordAccount;
}): React.JSX.Element => { }): React.JSX.Element => {
const canEdit = penaltys.length === 0 && !user.isBanned; const canEdit = penaltys.length === 0 && !user.isBanned;
@@ -67,12 +70,19 @@ export const ProfileForm = ({
}, },
resolver: zodResolver(schema), resolver: zodResolver(schema),
}); });
console.log(user);
return ( return (
<form <form
className="card-body" className="card-body"
onSubmit={form.handleSubmit(async (values) => { onSubmit={form.handleSubmit(async (values) => {
setIsLoading(true); setIsLoading(true);
await updateUser(values); await updateUser(values);
if (discordAccount) {
await setStandardName({
memberId: discordAccount.discordId,
userId: user.id,
});
}
form.reset(values); form.reset(values);
if (user.email !== values.email) { if (user.email !== values.email) {
await sendVerificationLink(user.id); await sendVerificationLink(user.id);

2
apps/hub/app/(app)/settings/page.tsx
View File

@@ -40,7 +40,7 @@ export default async function Page() {
</p> </p>
</div> </div>
<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3"> <div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3">
<ProfileForm user={user} penaltys={userPenaltys} /> <ProfileForm user={user} penaltys={userPenaltys} discordAccount={discordAccount} />
</div> </div>
<div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3"> <div className="card bg-base-200 shadow-xl mb-4 col-span-6 xl:col-span-3">
<SocialForm discordAccount={discordAccount} user={user} /> <SocialForm discordAccount={discordAccount} user={user} />

39
apps/hub/app/(auth)/email-verification/action.ts Normal file
View File

@@ -0,0 +1,39 @@
"use server";
import { prisma } from "@repo/db";
export const checkEmailCode = async (code: string) => {
const users = await prisma.user.findMany({
where: {
emailVerificationToken: code,
},
select: {
id: true,
emailVerificationToken: true,
emailVerificationExpiresAt: true,
},
});
const user = users[0];
if (!user || !user.emailVerificationExpiresAt) {
return { error: "Code ist ungültig" };
}
if (user.emailVerificationExpiresAt < new Date()) {
return { error: "Code ist nicht mehr gültig" };
}
await prisma.user.update({
where: {
id: user.id,
},
data: {
emailVerified: true,
emailVerificationToken: null,
emailVerificationExpiresAt: null,
},
});
return {
message: "Email bestätigt!",
};
};

2
apps/hub/app/(auth)/email-verification/page.tsx
View File

@@ -1,5 +1,5 @@
"use client"; "use client";
import { checkEmailCode } from "(app)/admin/user/action"; import { checkEmailCode } from "(auth)/email-verification/action";
import { Check } from "lucide-react"; import { Check } from "lucide-react";
import { useRouter, useSearchParams } from "next/navigation"; import { useRouter, useSearchParams } from "next/navigation";
import { useCallback, useEffect, useState } from "react"; import { useCallback, useEffect, useState } from "react";

10
apps/hub/helper/mail.ts
View File

@@ -13,11 +13,16 @@ export const sendMail = async (email: string, subject: string, html: string) =>
export const sendMailByTemplate = async ( export const sendMailByTemplate = async (
email: string, email: string,
template: "password-change" | "course-completed" | "email-verification", template:
| "password-change"
| "course-completed"
| "email-verification"
| "ban-notice"
| "timeban-notice",
data: any, data: any,
) => { ) => {
try { try {
const res = await fetch(`${process.env.NEXT_PUBLIC_HUB_SERVER_URL}/mail/template/${template}`, { await fetch(`${process.env.NEXT_PUBLIC_HUB_SERVER_URL}/mail/template/${template}`, {
method: "POST", method: "POST",
headers: { "Content-Type": "application/json" }, headers: { "Content-Type": "application/json" },
@@ -26,7 +31,6 @@ export const sendMailByTemplate = async (
data, data,
}), }),
}); });
console.log(res);
} catch (error) { } catch (error) {
console.error("Error sending mail:", error); console.error("Error sending mail:", error);
} }

17
packages/database/prisma/json/User.ts
View File

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