From 8d31b592551e21a28f9241aed9f24eac81e62f78 Mon Sep 17 00:00:00 2001
From: Paul Makles <me@insrt.uk>
Date: Tue, 25 Jul 2023 12:51:10 +0100
Subject: [PATCH] feat: show related reports for content

---
 app/panel/reports/[id]/page.tsx         | 47 +++++++++++++++++--------
 app/panel/reports/page.tsx              | 26 ++------------
 app/panel/sparkle/page.tsx              |  3 +-
 components/cards/MessageContextCard.tsx |  9 +++--
 components/cards/ReportCard.tsx         | 25 +++++++++++++
 5 files changed, 67 insertions(+), 43 deletions(-)
 create mode 100644 components/cards/ReportCard.tsx

diff --git a/app/panel/reports/[id]/page.tsx b/app/panel/reports/[id]/page.tsx
index 33e3ea0..f7cd304 100644
--- a/app/panel/reports/[id]/page.tsx
+++ b/app/panel/reports/[id]/page.tsx
@@ -1,37 +1,47 @@
 import { MessageContextCard } from "@/components/cards/MessageContextCard";
+import { ReportCard } from "@/components/cards/ReportCard";
 import { UserCard } from "@/components/cards/UserCard";
-import { Avatar, AvatarImage, AvatarFallback } from "@/components/ui/avatar";
 import { Badge } from "@/components/ui/badge";
-import { Button, buttonVariants } from "@/components/ui/button";
+import { buttonVariants } from "@/components/ui/button";
 import {
   Card,
-  CardContent,
   CardDescription,
   CardHeader,
   CardTitle,
 } from "@/components/ui/card";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
 import { Separator } from "@/components/ui/separator";
 import {
   fetchReportById,
+  fetchReports,
   fetchSnapshotsByReport,
   fetchUserById,
 } from "@/lib/db";
 import { ArrowLeft } from "lucide-react";
 import Link from "next/link";
+import { notFound } from "next/navigation";
 import { Fragment } from "react";
 
 export default async function Reports({ params }: { params: { id: string } }) {
   const report = await fetchReportById(params.id);
-  if (!report) return <span>404</span>;
+  if (!report) return notFound();
 
   const author = await fetchUserById(report.author_id);
   const snapshots = await fetchSnapshotsByReport(report._id);
 
+  const relatedReports = await Promise.all(
+    snapshots
+      .map((snapshot) => snapshot._id)
+      .map((contentId) =>
+        fetchReports({
+          _id: {
+            $ne: report._id,
+          },
+          status: "Created",
+          "content.id": contentId,
+        })
+      )
+  );
+
   return (
     <div className="flex flex-col gap-2">
       <Link
@@ -57,19 +67,26 @@ export default async function Reports({ params }: { params: { id: string } }) {
       </Card>
       <UserCard user={author!} subtitle="Report Author" />
 
-      {snapshots.map((snapshot) => (
+      {snapshots.map((snapshot, index) => (
         <Fragment key={snapshot._id}>
-          {/*<Separator />*/}
+          <Separator className="my-2" />
           <div className="flex gap-2">
             <div className="flex-[2]">
-              {/*<h2 className="text-md">&nbsp;</h2>*/}
+              {relatedReports[index].length ? (
+                <h2 className="text-md pb-2">&nbsp;</h2>
+              ) : undefined}
               {snapshot._type === "Message" && (
                 <MessageContextCard snapshot={snapshot} />
               )}
             </div>
-            <div className="flex-1">
-              {/*<h2 className="text-md text-center">Related Open Reports</h2>*/}
-            </div>
+            {relatedReports[index].length ? (
+              <div className="flex-1">
+                <h2 className="text-md text-center pb-2">Other Reports</h2>
+                {relatedReports[index].map((relatedReport) => (
+                  <ReportCard key={relatedReport._id} report={relatedReport} />
+                ))}
+              </div>
+            ) : undefined}
           </div>
         </Fragment>
       ))}
diff --git a/app/panel/reports/page.tsx b/app/panel/reports/page.tsx
index 40536c3..f0d1f53 100644
--- a/app/panel/reports/page.tsx
+++ b/app/panel/reports/page.tsx
@@ -1,13 +1,6 @@
-import { Badge } from "@/components/ui/badge";
-import {
-  Card,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/components/ui/card";
+import { ReportCard } from "@/components/cards/ReportCard";
 import { Input } from "@/components/ui/input";
 import { fetchReports } from "@/lib/db";
-import Link from "next/link";
 
 export default async function Reports() {
   const reports = (await fetchReports()).sort((b, _) =>
@@ -18,22 +11,7 @@ export default async function Reports() {
     <div className="flex flex-col gap-2">
       <Input placeholder="Search for reports..." disabled />
       {reports.map((report) => (
-        <Link href={`/panel/reports/${report._id}`} key={report._id as never}>
-          <Card className="transition-all hover:-translate-y-1 hover:shadow-md">
-            <CardHeader>
-              <CardTitle className="overflow-ellipsis whitespace-nowrap overflow-x-clip flex gap-2 items-center">
-                {report.content.report_reason.includes("Illegal") && (
-                  <Badge variant="destructive">Urgent</Badge>
-                )}{" "}
-                {report.additional_context || "No reason specified"}
-              </CardTitle>
-              <CardDescription>
-                {report._id.toString().substring(20, 26)} &middot;{" "}
-                {report.content.report_reason} &middot; {report.content.type}
-              </CardDescription>
-            </CardHeader>
-          </Card>
-        </Link>
+        <ReportCard key={report._id} report={report} />
       ))}
     </div>
   );
diff --git a/app/panel/sparkle/page.tsx b/app/panel/sparkle/page.tsx
index 1fbbbd0..4500dc3 100644
--- a/app/panel/sparkle/page.tsx
+++ b/app/panel/sparkle/page.tsx
@@ -1,6 +1,7 @@
 export default function Sparkle() {
   return (
-    <div className="grid place-items-center">
+    <div>
+      <h1 className="text-xl text-center">Running version v0.0.1</h1>
       <img
         className="absolute right-0 bottom-0"
         src="https://api.gifbox.me/file/posts/MF3oORlDjfHAVJ-DgPyRQSjMdy9WNIxk.webp"
diff --git a/components/cards/MessageContextCard.tsx b/components/cards/MessageContextCard.tsx
index c8a0887..1e1e507 100644
--- a/components/cards/MessageContextCard.tsx
+++ b/components/cards/MessageContextCard.tsx
@@ -34,7 +34,10 @@ function Message({
     <AlertDialog>
       <AlertDialogTrigger className="w-full">
         <div className="flex gap-2">
-          <div className="flex-1 min-w-0 overflow-ellipsis overflow-hidden text-right">
+          <div
+            className="flex-1 min-w-0 overflow-ellipsis overflow-hidden text-right"
+            title={`${user?.username}#${user?.discriminator}`}
+          >
             {user?.avatar && (
               <Avatar className="w-4 h-4 inline-block align-middle mr-1">
                 <AvatarImage
@@ -61,8 +64,8 @@ function Message({
                   src={`https://autumn.revolt.chat/avatars/${user.avatar._id}`}
                 />
               </Avatar>
-            )}
-            {user?.username}
+            )}{" "}
+            {user?.username}#{user?.discriminator}
           </AlertDialogTitle>
           <AlertDialogDescription className="flex flex-col gap-2 max-w-full">
             {message.content && <span>{message.content}</span>}
diff --git a/components/cards/ReportCard.tsx b/components/cards/ReportCard.tsx
new file mode 100644
index 0000000..3481cb8
--- /dev/null
+++ b/components/cards/ReportCard.tsx
@@ -0,0 +1,25 @@
+import Link from "next/link";
+import { Report } from "revolt-api";
+import { Card, CardDescription, CardHeader, CardTitle } from "../ui/card";
+import { Badge } from "../ui/badge";
+
+export function ReportCard({ report }: { report: Report }) {
+  return (
+    <Link href={`/panel/reports/${report._id}`}>
+      <Card className="transition-all hover:-translate-y-1 hover:shadow-md">
+        <CardHeader>
+          <CardTitle className="overflow-ellipsis whitespace-nowrap overflow-x-clip flex gap-2 items-center">
+            {report.content.report_reason.includes("Illegal") && (
+              <Badge variant="destructive">Urgent</Badge>
+            )}{" "}
+            {report.additional_context || "No reason specified"}
+          </CardTitle>
+          <CardDescription>
+            {report._id.toString().substring(20, 26)} &middot;{" "}
+            {report.content.report_reason} &middot; {report.content.type}
+          </CardDescription>
+        </CardHeader>
+      </Card>
+    </Link>
+  );
+}