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

Report anzeige für auto-reports verbessert

Browse Source
This commit is contained in:
PxlLoewe
2026-02-08 21:37:10 +01:00
parent b46ad25bde
commit 5d0a36f967
5 changed files with 107 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/core-server/routes/report.ts
View File

@@ -43,14 +43,20 @@ router.post("/admin-embed", async (req, res) => {
{ name: "angemeldet als", value: report.reportedUserRole, inline: true }, { name: "angemeldet als", value: report.reportedUserRole, inline: true },
{ {
name: "gemeldet von", name: "gemeldet von",
value: `${report.Sender?.firstname} ${report.Sender?.lastname} (${report.Sender?.publicId})`, value: report.Sender
? `${report.Sender?.firstname} ${report.Sender?.lastname} (${report.Sender?.publicId})`
: "System",
}, },
) )
.setFooter({ .setFooter({
text: "Bitte reagiere mit 🫡, wenn du den Report bearbeitet hast, oder mit ✅, wenn er abgeschlossen ist.", text: "Bitte reagiere mit 🫡, wenn du den Report bearbeitet hast, oder mit ✅, wenn er abgeschlossen ist.",
}) })
.setTimestamp(new Date(report.timestamp)) .setTimestamp(new Date(report.timestamp));
.setColor("DarkRed"); if (report.reviewed) {
embed.setColor("DarkGreen");
} else {
embed.setColor("DarkRed");
}
const reportsChannel = await client.channels.fetch(process.env.DISCORD_REPORT_CHANNEL!); const reportsChannel = await client.channels.fetch(process.env.DISCORD_REPORT_CHANNEL!);
if (!reportsChannel || !reportsChannel.isSendable()) { if (!reportsChannel || !reportsChannel.isSendable()) {
@@ -59,7 +65,9 @@ router.post("/admin-embed", async (req, res) => {
} }
const message = await reportsChannel.send({ embeds: [embed] }); const message = await reportsChannel.send({ embeds: [embed] });
message.react("🫡").catch(console.error); message.react("🫡").catch(console.error);
message.react("✅").catch(console.error); if (!report.reviewed) {
message.react("✅").catch(console.error);
}
res.json({ res.json({
message: "Report embed sent to Discord channel", message: "Report embed sent to Discord channel",
}); });

26
apps/hub/app/(app)/admin/report/_components/form.tsx
View File

@@ -4,6 +4,7 @@ import { editReport } from "(app)/admin/report/actions";
import { zodResolver } from "@hookform/resolvers/zod"; import { zodResolver } from "@hookform/resolvers/zod";
import { Report as IReport, Prisma, User } from "@repo/db"; import { Report as IReport, Prisma, User } from "@repo/db";
import { ReportSchema, Report as IReportZod } from "@repo/db/zod"; import { ReportSchema, Report as IReportZod } from "@repo/db/zod";
import { cn } from "@repo/shared-components";
import { PaginatedTable } from "_components/PaginatedTable"; import { PaginatedTable } from "_components/PaginatedTable";
import { Button } from "_components/ui/Button"; import { Button } from "_components/ui/Button";
import { Switch } from "_components/ui/Switch"; import { Switch } from "_components/ui/Switch";
@@ -31,14 +32,23 @@ export const ReportSenderInfo = ({
</Link> </Link>
<span className="text-primary">{report.reportedUserRole}</span> <span className="text-primary">{report.reportedUserRole}</span>
</h2> </h2>
<div className="textarea w-full text-left">{report.text}</div> <div className="textarea w-full whitespace-pre-wrap text-left">{report.text}</div>
<Link {Sender ? (
href={`/admin/user/${Sender?.id}`} <Link
className="link link-hover text-right text-sm text-gray-600" href={`/admin/user/${Sender?.id}`}
> className={cn(
gemeldet von Nutzer {Sender?.firstname} {Sender?.lastname} ({Sender?.publicId}) am{" "} "link link-hover text-right text-sm text-gray-600",
{new Date(report.timestamp).toLocaleString()} !Sender && "text-green-300",
</Link> )}
>
gemeldet von Nutzer {Sender.firstname} {Sender.lastname} ({Sender.publicId}) am{" "}
{new Date(report.timestamp).toLocaleString()}
</Link>
) : (
<p className="text-right text-sm text-green-300">
gemeldet vom System am {new Date(report.timestamp).toLocaleString()}
</p>
)}
</div> </div>
); );
}; };

8
apps/hub/app/(app)/admin/report/columns.tsx
View File

@@ -25,8 +25,12 @@ export const reportColumns: ColumnDef<Report & { Sender?: User; Reported: User }
header: "Sender", header: "Sender",
cell: ({ row }) => { cell: ({ row }) => {
const user = row.original.Sender; const user = row.original.Sender;
if (!user) return "Unbekannt"; if (!user) return <p className="text-green-300">System</p>;
return `${user.firstname} ${user.lastname} (${user.publicId})`; return (
<Link
href={`/admin/user/${user.id}`}
>{`${user.firstname} ${user.lastname} (${user.publicId})`}</Link>
);
}, },
}, },
{ {

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

@@ -47,30 +47,42 @@ export const AccountLog = ({ sameIPLogs, userId }: { sameIPLogs: Log[]; userId:
</div> </div>
} }
getFilter={(searchTerm) => { getFilter={(searchTerm) => {
return { if (onlyImportant) {
AND: [ return {
onlyImportant AND: [
? { { ip: { contains: searchTerm } },
type: { { browser: { contains: searchTerm } },
in: ["REGISTER", "PROFILE_CHANGE"], {
}, id: {
} in: sameIPLogs
: {}, .filter((log) => log.id.toString().includes(searchTerm))
{ .map((log) => log.id),
AND: [
{ ip: { contains: searchTerm } },
{ browser: { contains: searchTerm } },
{
id: {
in: sameIPLogs
.filter((log) => log.id.toString().includes(searchTerm))
.map((log) => log.id),
},
}, },
], },
}, ],
], } as Prisma.LogWhereInput;
} as Prisma.LogWhereInput; } else {
return {
OR: [
{
AND: [
{ ip: { contains: searchTerm } },
{ browser: { contains: searchTerm } },
{
id: {
in: sameIPLogs
.filter((log) => log.id.toString().includes(searchTerm))
.map((log) => log.id),
},
},
],
},
{
userId: userId,
},
],
} as Prisma.LogWhereInput;
}
}} }}
include={{ include={{
User: true, User: true,

45
apps/hub/app/(auth)/login/_components/action.ts
View File

@@ -55,18 +55,45 @@ export const logAction = async (
}, },
}); });
if (existingLogs.length > 0 && user?.user.id) { if (existingLogs.length > 0 && user?.user.id) {
// Möglicherweise ein doppelter Account, Report erstellen const existingReport = await prisma.report.findFirst({
const report = await prisma.report.create({ where: {
data: { reportedUserId: user.user.id,
text: `Möglicher doppelter Account erkannt bei Login-Versuch.\n\nÜbereinstimmende Logs:\n${existingLogs reportedUserRole: {
.map((log) => `- Log ID: ${log.id}, IP: ${log.ip}, Zeitstempel: ${log.timestamp}`) contains: "Doppelter Account Verdacht",
.join("\n")}`, },
reportedUserId: user?.user.id,
reportedUserRole: "LOGIN - Doppelter Account Verdacht",
}, },
}); });
// keine Doppel-Reports für denselben Nutzer erstellen
if (!existingReport) {
// Möglicherweise ein doppelter Account, Report erstellen
const report = await prisma.report.create({
data: {
text: `Möglicher doppelter Account erkannt bei Login-Versuch.\n\nÜbereinstimmende Logs:\n${existingLogs
.map((log) => `- Log ID: ${log.id}, IP: ${log.ip}, Zeitstempel: ${log.timestamp}`)
.join("\n")}`,
reportedUserId: user?.user.id,
reportedUserRole: "LOGIN - Doppelter Account Verdacht",
},
});
await sendReportEmbed(report.id); await sendReportEmbed(report.id);
} else {
// Update report and send it again to Discord
const updatedReport = await prisma.report.update({
where: {
id: existingReport.id,
},
data: {
text: `Möglicher doppelter Account erkannt bei Login-Versuch.\n\nÜbereinstimmende Logs:\n${existingLogs
.map(
(log) =>
`- Log ID: ${log.id}, IP: ${log.ip}, Zeitstempel: ${new Date(log.timestamp).toLocaleString("de-DE")}`,
)
.join("\n")}`,
},
});
await sendReportEmbed(updatedReport.id);
}
} }
} }