Report anzeige für auto-reports verbessert

apps/core-server/routes/report.ts

@@ -43,14 +43,20 @@ router.post("/admin-embed", async (req, res) => {
 				{ name: "angemeldet als", value: report.reportedUserRole, inline: true },
 				{
 					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({
 				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!);
 		if (!reportsChannel || !reportsChannel.isSendable()) {
@@ -59,7 +65,9 @@ router.post("/admin-embed", async (req, res) => {
 		}
 		const message = await reportsChannel.send({ embeds: [embed] });
 		message.react("🫡").catch(console.error);
+		if (!report.reviewed) {
 			message.react("✅").catch(console.error);
+		}
 		res.json({
 			message: "Report embed sent to Discord channel",
 		});

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

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

apps/hub/app/(app)/admin/report/columns.tsx

@@ -25,8 +25,12 @@ export const reportColumns: ColumnDef<Report & { Sender?: User; Reported: User }
 		header: "Sender",
 		cell: ({ row }) => {
 			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>
+			);
 		},
 	},
 	{

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

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

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

@@ -55,6 +55,16 @@ export const logAction = async (
 			},
 		});
 		if (existingLogs.length > 0 && user?.user.id) {
+			const existingReport = await prisma.report.findFirst({
+				where: {
+					reportedUserId: user.user.id,
+					reportedUserRole: {
+						contains: "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: {
@@ -67,6 +77,23 @@ export const logAction = async (
 				});
 
 				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);
+			}
 		}
 	}