From a073dccab6bd2028950a6bcc1966590a4e0af1a0 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 13 Sep 2024 18:20:29 +0100
Subject: [PATCH 01/43] add schemas for moderation and reports

---
 .../frontpage/app/(app)/moderation/page.tsx   |  0
 packages/frontpage/lib/schema.ts              | 31 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 packages/frontpage/app/(app)/moderation/page.tsx

diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
new file mode 100644
index 00000000..e69de29b
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index fbede435..17b0060a 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -127,3 +127,34 @@ export const BetaUser = sqliteTable("beta_users", {
 export const ConsumedOffset = sqliteTable("consumed_offsets", {
   offset: integer("offset").primaryKey(),
 });
+
+export const ModerationEvent = sqliteTable("moderation_events", {
+  subjectUri: text("subject_uri").notNull(),
+  subjectDid: text("subject_did").notNull(),
+  subjectCollection: text("subject_collection"),
+  subjectRkey: text("subject_rkey"),
+  subjectCid: text("subject_cid").notNull(),
+  createdBy: text("created_by").notNull(),
+  createdAt: dateIsoText("created_at").notNull(),
+  labelsAdded: text("labels_added"),
+  labelsRemoved: text("labels_removed"),
+});
+
+export const LabelledProfile = sqliteTable("labelled_profiles", {
+  did: text("did").notNull().unique(),
+  labels: text("labels"),
+});
+
+export const Report = sqliteTable("reports", {
+  actionedAt: dateIsoText("actioned_at"),
+  actionedBy: text("actioned_by"),
+  subjectUri: text("subject_uri").notNull(),
+  subjectDid: text("subject_did").notNull(),
+  subjectCollection: text("subject_collection"),
+  subjectRkey: text("subject_rkey"),
+  subjectCid: text("subject_cid").notNull(),
+  createdBy: text("created_by").notNull(),
+  createdAt: dateIsoText("created_at").notNull(),
+  creatorComment: text("creator_comment"),
+  labelsAdded: text("labels_added"),
+});

From 4b9750f92d2dde651cd9c60aa210005ed3dcd85d Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 20 Sep 2024 01:32:06 +0100
Subject: [PATCH 02/43] add moderation page

---
 .../frontpage/app/(app)/moderation/page.tsx   | 229 ++++++++++++++++++
 packages/frontpage/lib/components/ui/card.tsx |  76 ++++++
 .../lib/components/ui/scroll-area.tsx         |  48 ++++
 packages/frontpage/package.json               |   2 +
 pnpm-lock.yaml                                | 180 ++++++--------
 5 files changed, 429 insertions(+), 106 deletions(-)
 create mode 100644 packages/frontpage/lib/components/ui/card.tsx
 create mode 100644 packages/frontpage/lib/components/ui/scroll-area.tsx

diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index e69de29b..3ffa341f 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -0,0 +1,229 @@
+import { CheckCircle, ExternalLink, Flag, Shield, XCircle } from "lucide-react";
+import { Button } from "@/lib/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/lib/components/ui/card";
+import { ScrollArea } from "@/lib/components/ui/scroll-area";
+import {
+  Tooltip,
+  TooltipContent,
+  TooltipProvider,
+  TooltipTrigger,
+} from "@/lib/components/ui/tooltip";
+
+type Report = {
+  id: string;
+  type: "post" | "comment";
+  content: string;
+  reason: string;
+  status: "pending" | "approved" | "rejected";
+  did: string;
+  cid: string;
+  rkey: string;
+  uri: string;
+  community: string;
+};
+
+type Community = {
+  name: string;
+  icon: string;
+};
+
+export default function Component() {
+  const reports = [
+    {
+      id: "1",
+      type: "post",
+      content: "This is a reported post",
+      reason: "Inappropriate content",
+      status: "pending",
+      did: "did:plc:abcdefghijklmnop",
+      cid: "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
+      rkey: "abcdef123456",
+      uri: "at://did:plc:abcdefghijklmnop/app.bsky.feed.post/abcdef123456",
+      community: "General",
+    },
+    {
+      id: "2",
+      type: "comment",
+      content: "This is a reported comment",
+      reason: "Spam",
+      status: "pending",
+      did: "did:plc:qrstuvwxyz123456",
+      cid: "bafybeihbgxvydgnxlfapxnzb7zyqbbs6tkvhflemvwogzb5zzp7ufuz7ky",
+      rkey: "ghijkl789012",
+      uri: "at://did:plc:qrstuvwxyz123456/app.bsky.feed.post/ghijkl789012",
+      community: "Tech",
+    },
+    {
+      id: "3",
+      type: "post",
+      content: "Another reported post",
+      reason: "Misinformation",
+      status: "pending",
+      did: "did:plc:123456abcdefghij",
+      cid: "bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xccnlnmzhe5h6y7afcvqpqom",
+      rkey: "mnopqr456789",
+      uri: "at://did:plc:123456abcdefghij/app.bsky.feed.post/mnopqr456789",
+      community: "Science",
+    },
+  ];
+
+  // const handleAction = (id: string, action: "approve" | "reject") => {
+  //   setReports(
+  //     reports.map((report) =>
+  //       report.id === id ? { ...report, status: action } : report,
+  //     ),
+  //   );
+  // };
+
+  const stats = {
+    total: reports.length,
+    pending: reports.filter((r) => r.status === "pending").length,
+    approved: reports.filter((r) => r.status === "approved").length,
+    rejected: reports.filter((r) => r.status === "rejected").length,
+  };
+
+  return (
+    <div className="min-h-screen bg-gray-900 text-gray-100 p-8">
+      <Card className="bg-gray-800 border-gray-700 mb-6">
+        <CardHeader>
+          <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
+            <Shield className="h-6 w-6" />
+            Moderation Dashboard
+          </CardTitle>
+          <CardDescription className="text-gray-300">
+            Review and take action on reported content
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Total Reports
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-blue-300">
+                  {stats.total}
+                </div>
+              </CardContent>
+            </Card>
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Pending
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-yellow-300">
+                  {stats.pending}
+                </div>
+              </CardContent>
+            </Card>
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Approved
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-green-300">
+                  {stats.approved}
+                </div>
+              </CardContent>
+            </Card>
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Rejected
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-red-300">
+                  {stats.rejected}
+                </div>
+              </CardContent>
+            </Card>
+          </div>
+          <div className="space-y-6">
+            {reports.map((report) => (
+              <Card key={report.id} className="bg-gray-700 border-gray-600">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+                    <span>
+                      Reported {report.type} in {report.community}
+                    </span>
+                    <span
+                      className={`px-2 py-1 rounded-full text-xs ${
+                        report.status === "pending"
+                          ? "bg-yellow-500 text-yellow-900"
+                          : report.status === "approved"
+                            ? "bg-green-500 text-green-900"
+                            : "bg-red-500 text-red-900"
+                      }`}
+                    >
+                      {report.status.charAt(0).toUpperCase() +
+                        report.status.slice(1)}
+                    </span>
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <p className="text-gray-100 mb-2">{report.content}</p>
+                  <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                    <div>
+                      <strong>DID:</strong> {report.did}
+                    </div>
+                    <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
+                      <strong>CID:</strong> {report.cid}
+                    </div>
+                    <div>
+                      <strong>Record Key:</strong> {report.rkey}
+                    </div>
+                    <div>
+                      <strong>URI:</strong>
+                      <a
+                        href={report.uri}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                      >
+                        {report.uri.substring(0, 30)}...
+                        <ExternalLink className="h-3 w-3 ml-1" />
+                      </a>
+                    </div>
+                  </div>
+                  <div className="flex items-center text-sm text-gray-300 mb-4">
+                    <Flag className="mr-2 h-4 w-4 text-red-400" />
+                    <span>Reason: {report.reason}</span>
+                  </div>
+                  <div className="flex space-x-2">
+                    <Button
+                      variant="destructive"
+                      className="bg-green-600 hover:bg-green-700 text-white"
+                    >
+                      <CheckCircle className="mr-2 h-4 w-4" />
+                      Approve
+                    </Button>
+                    <Button
+                      variant="destructive"
+                      className="bg-red-600 hover:bg-red-700 text-white"
+                    >
+                      <XCircle className="mr-2 h-4 w-4" />
+                      Reject
+                    </Button>
+                  </div>
+                </CardContent>
+              </Card>
+            ))}
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/frontpage/lib/components/ui/card.tsx b/packages/frontpage/lib/components/ui/card.tsx
new file mode 100644
index 00000000..77e9fb78
--- /dev/null
+++ b/packages/frontpage/lib/components/ui/card.tsx
@@ -0,0 +1,76 @@
+import * as React from "react"
+
+import { cn } from "@/lib/utils"
+
+const Card = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn(
+      "rounded-xl border bg-card text-card-foreground shadow",
+      className
+    )}
+    {...props}
+  />
+))
+Card.displayName = "Card"
+
+const CardHeader = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn("flex flex-col space-y-1.5 p-6", className)}
+    {...props}
+  />
+))
+CardHeader.displayName = "CardHeader"
+
+const CardTitle = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLHeadingElement>
+>(({ className, ...props }, ref) => (
+  <h3
+    ref={ref}
+    className={cn("font-semibold leading-none tracking-tight", className)}
+    {...props}
+  />
+))
+CardTitle.displayName = "CardTitle"
+
+const CardDescription = React.forwardRef<
+  HTMLParagraphElement,
+  React.HTMLAttributes<HTMLParagraphElement>
+>(({ className, ...props }, ref) => (
+  <p
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+CardDescription.displayName = "CardDescription"
+
+const CardContent = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
+))
+CardContent.displayName = "CardContent"
+
+const CardFooter = React.forwardRef<
+  HTMLDivElement,
+  React.HTMLAttributes<HTMLDivElement>
+>(({ className, ...props }, ref) => (
+  <div
+    ref={ref}
+    className={cn("flex items-center p-6 pt-0", className)}
+    {...props}
+  />
+))
+CardFooter.displayName = "CardFooter"
+
+export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
diff --git a/packages/frontpage/lib/components/ui/scroll-area.tsx b/packages/frontpage/lib/components/ui/scroll-area.tsx
new file mode 100644
index 00000000..0b4a48d8
--- /dev/null
+++ b/packages/frontpage/lib/components/ui/scroll-area.tsx
@@ -0,0 +1,48 @@
+"use client"
+
+import * as React from "react"
+import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
+
+import { cn } from "@/lib/utils"
+
+const ScrollArea = React.forwardRef<
+  React.ElementRef<typeof ScrollAreaPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
+>(({ className, children, ...props }, ref) => (
+  <ScrollAreaPrimitive.Root
+    ref={ref}
+    className={cn("relative overflow-hidden", className)}
+    {...props}
+  >
+    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
+      {children}
+    </ScrollAreaPrimitive.Viewport>
+    <ScrollBar />
+    <ScrollAreaPrimitive.Corner />
+  </ScrollAreaPrimitive.Root>
+))
+ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName
+
+const ScrollBar = React.forwardRef<
+  React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
+  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
+>(({ className, orientation = "vertical", ...props }, ref) => (
+  <ScrollAreaPrimitive.ScrollAreaScrollbar
+    ref={ref}
+    orientation={orientation}
+    className={cn(
+      "flex touch-none select-none transition-colors",
+      orientation === "vertical" &&
+        "h-full w-2.5 border-l border-l-transparent p-[1px]",
+      orientation === "horizontal" &&
+        "h-2.5 flex-col border-t border-t-transparent p-[1px]",
+      className
+    )}
+    {...props}
+  >
+    <ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
+  </ScrollAreaPrimitive.ScrollAreaScrollbar>
+))
+ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName
+
+export { ScrollArea, ScrollBar }
diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index f521737c..bf6725dd 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -22,6 +22,7 @@
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
+    "@radix-ui/react-scroll-area": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-toast": "^1.2.1",
@@ -33,6 +34,7 @@
     "date-fns": "^3.6.0",
     "drizzle-orm": "^0.31.2",
     "jose": "^5.4.0",
+    "lucide-react": "^0.441.0",
     "next": "15.0.0-rc.0",
     "next-auth": "5.0.0-beta.19",
     "next-themes": "^0.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7d03d987..49688589 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -138,6 +138,9 @@ importers:
       '@radix-ui/react-popover':
         specifier: ^1.1.1
         version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-scroll-area':
+        specifier: ^1.1.0
+        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-slot':
         specifier: ^1.1.0
         version: 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
@@ -171,6 +174,9 @@ importers:
       jose:
         specifier: ^5.4.0
         version: 5.4.0
+      lucide-react:
+        specifier: ^0.441.0
+        version: 0.441.0(react@19.0.0-rc-f994737d14-20240522)
       next:
         specifier: 15.0.0-rc.0
         version: 15.0.0-rc.0(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
@@ -1597,6 +1603,9 @@ packages:
     resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==}
     engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
 
+  '@radix-ui/number@1.1.0':
+    resolution: {integrity: sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==}
+
   '@radix-ui/primitive@1.1.0':
     resolution: {integrity: sha512-4Z8dn6Upk0qk4P74xBhZ6Hd/w0mPEzOOLxy4xiPXOXqjF7jZS0VAKk7/x/H6FyY2zCkYJqePf1G5KmkmNJ4RBA==}
 
@@ -1871,6 +1880,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-scroll-area@1.1.0':
+    resolution: {integrity: sha512-9ArIZ9HWhsrfqS765h+GZuLoxaRHD/j0ZWOWilsCvYTpYJp8XwCqNG7Dt9Nu/TItKOdgLGkOPCodQvDc+UMwYg==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-slot@1.1.0':
     resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
     peerDependencies:
@@ -4261,6 +4283,11 @@ packages:
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
+  lucide-react@0.441.0:
+    resolution: {integrity: sha512-0vfExYtvSDhkC2lqg0zYVW1Uu9GsI4knuV9GP9by5z0Xhc4Zi5RejTxfz9LsjRmCyWVzHCJvxGKZWcRyvQCWVg==}
+    peerDependencies:
+      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc
+
   lz-string@1.5.0:
     resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
@@ -6087,8 +6114,8 @@ snapshots:
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sso-oidc': 3.588.0
-      '@aws-sdk/client-sts': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)
+      '@aws-sdk/client-sso-oidc': 3.588.0(@aws-sdk/client-sts@3.588.0)
+      '@aws-sdk/client-sts': 3.588.0
       '@aws-sdk/core': 3.588.0
       '@aws-sdk/credential-provider-node': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/middleware-host-header': 3.577.0
@@ -6136,8 +6163,8 @@ snapshots:
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sso-oidc': 3.588.0
-      '@aws-sdk/client-sts': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)
+      '@aws-sdk/client-sso-oidc': 3.588.0(@aws-sdk/client-sts@3.588.0)
+      '@aws-sdk/client-sts': 3.588.0
       '@aws-sdk/core': 3.588.0
       '@aws-sdk/credential-provider-node': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/middleware-host-header': 3.577.0
@@ -6183,8 +6210,8 @@ snapshots:
       '@aws-crypto/sha1-browser': 3.0.0
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sso-oidc': 3.588.0
-      '@aws-sdk/client-sts': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)
+      '@aws-sdk/client-sso-oidc': 3.588.0(@aws-sdk/client-sts@3.588.0)
+      '@aws-sdk/client-sts': 3.588.0
       '@aws-sdk/core': 3.588.0
       '@aws-sdk/credential-provider-node': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/middleware-bucket-endpoint': 3.587.0
@@ -6241,11 +6268,11 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sso-oidc@3.588.0':
+  '@aws-sdk/client-sso-oidc@3.588.0(@aws-sdk/client-sts@3.588.0)':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sts': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)
+      '@aws-sdk/client-sts': 3.588.0
       '@aws-sdk/core': 3.588.0
       '@aws-sdk/credential-provider-node': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/middleware-host-header': 3.577.0
@@ -6284,6 +6311,7 @@ snapshots:
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
+      - '@aws-sdk/client-sts'
       - aws-crt
 
   '@aws-sdk/client-sso@3.588.0':
@@ -6329,11 +6357,11 @@ snapshots:
     transitivePeerDependencies:
       - aws-crt
 
-  '@aws-sdk/client-sts@3.588.0(@aws-sdk/client-sso-oidc@3.588.0)':
+  '@aws-sdk/client-sts@3.588.0':
     dependencies:
       '@aws-crypto/sha256-browser': 3.0.0
       '@aws-crypto/sha256-js': 3.0.0
-      '@aws-sdk/client-sso-oidc': 3.588.0
+      '@aws-sdk/client-sso-oidc': 3.588.0(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/core': 3.588.0
       '@aws-sdk/credential-provider-node': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/middleware-host-header': 3.577.0
@@ -6372,7 +6400,6 @@ snapshots:
       '@smithy/util-utf8': 3.0.0
       tslib: 2.6.2
     transitivePeerDependencies:
-      - '@aws-sdk/client-sso-oidc'
       - aws-crt
 
   '@aws-sdk/core@3.588.0':
@@ -6406,7 +6433,7 @@ snapshots:
 
   '@aws-sdk/credential-provider-ini@3.588.0(@aws-sdk/client-sso-oidc@3.588.0)(@aws-sdk/client-sts@3.588.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)
+      '@aws-sdk/client-sts': 3.588.0
       '@aws-sdk/credential-provider-env': 3.587.0
       '@aws-sdk/credential-provider-http': 3.587.0
       '@aws-sdk/credential-provider-process': 3.587.0
@@ -6464,7 +6491,7 @@ snapshots:
 
   '@aws-sdk/credential-provider-web-identity@3.587.0(@aws-sdk/client-sts@3.588.0)':
     dependencies:
-      '@aws-sdk/client-sts': 3.588.0(@aws-sdk/client-sso-oidc@3.588.0)
+      '@aws-sdk/client-sts': 3.588.0
       '@aws-sdk/types': 3.577.0
       '@smithy/property-provider': 3.1.0
       '@smithy/types': 3.0.0
@@ -6591,7 +6618,7 @@ snapshots:
 
   '@aws-sdk/token-providers@3.587.0(@aws-sdk/client-sso-oidc@3.588.0)':
     dependencies:
-      '@aws-sdk/client-sso-oidc': 3.588.0
+      '@aws-sdk/client-sso-oidc': 3.588.0(@aws-sdk/client-sts@3.588.0)
       '@aws-sdk/types': 3.577.0
       '@smithy/property-provider': 3.1.0
       '@smithy/shared-ini-file-loader': 3.1.0
@@ -7450,6 +7477,8 @@ snapshots:
 
   '@pkgr/core@0.1.1': {}
 
+  '@radix-ui/number@1.1.0': {}
+
   '@radix-ui/primitive@1.1.0': {}
 
   '@radix-ui/react-alert-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
@@ -7734,6 +7763,23 @@ snapshots:
       '@types/react': 18.3.3
       '@types/react-dom': 18.3.0
 
+  '@radix-ui/react-scroll-area@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+    dependencies:
+      '@radix-ui/number': 1.1.0
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      react: 19.0.0-rc-f994737d14-20240522
+      react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
+    optionalDependencies:
+      '@types/react': 18.3.3
+      '@types/react-dom': 18.3.0
+
   '@radix-ui/react-slot@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
@@ -9501,8 +9547,8 @@ snapshots:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.5)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0)
       eslint-plugin-react: 7.34.2(eslint@8.57.0)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
@@ -9537,8 +9583,8 @@ snapshots:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.2)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       eslint-plugin-jsx-a11y: 6.8.0(eslint@8.57.0)
       eslint-plugin-react: 7.34.2(eslint@8.57.0)
       eslint-plugin-react-hooks: 4.6.2(eslint@8.57.0)
@@ -9586,23 +9632,6 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0):
-    dependencies:
-      debug: 4.3.5
-      enhanced-resolve: 5.16.1
-      eslint: 8.57.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
-      fast-glob: 3.3.2
-      get-tsconfig: 4.7.5
-      is-core-module: 2.13.1
-      is-glob: 4.0.3
-    transitivePeerDependencies:
-      - '@typescript-eslint/parser'
-      - eslint-import-resolver-node
-      - eslint-import-resolver-webpack
-      - supports-color
-
   eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0):
     dependencies:
       debug: 4.3.5
@@ -9620,13 +9649,13 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0):
+  eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0):
     dependencies:
       debug: 4.3.5
       enhanced-resolve: 5.16.1
       eslint: 8.57.0
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
-      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-plugin-import: 2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0)
       fast-glob: 3.3.2
       get-tsconfig: 4.7.5
       is-core-module: 2.13.1
@@ -9648,17 +9677,6 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
-    dependencies:
-      debug: 3.2.7
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.5)
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0)
-    transitivePeerDependencies:
-      - supports-color
-
   eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
@@ -9670,14 +9688,14 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
+  eslint-module-utils@2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0):
     dependencies:
       debug: 3.2.7
     optionalDependencies:
       '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.2)
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0)
+      eslint-import-resolver-typescript: 3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0)
     transitivePeerDependencies:
       - supports-color
 
@@ -9714,33 +9732,6 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
-    dependencies:
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
-      hasown: 2.0.2
-      is-core-module: 2.13.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.0
-      semver: 6.3.1
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.4.5)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
   eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-typescript@3.6.1)(eslint@8.57.0):
     dependencies:
       array-includes: 3.1.8
@@ -9751,7 +9742,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -9768,33 +9759,6 @@ snapshots:
       - eslint-import-resolver-webpack
       - supports-color
 
-  eslint-plugin-import@2.29.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0):
-    dependencies:
-      array-includes: 3.1.8
-      array.prototype.findlastindex: 1.2.5
-      array.prototype.flat: 1.3.2
-      array.prototype.flatmap: 1.3.2
-      debug: 3.2.7
-      doctrine: 2.1.0
-      eslint: 8.57.0
-      eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1(eslint@8.57.0))(eslint@8.57.0))(eslint@8.57.0)
-      hasown: 2.0.2
-      is-core-module: 2.13.1
-      is-glob: 4.0.3
-      minimatch: 3.1.2
-      object.fromentries: 2.0.8
-      object.groupby: 1.0.3
-      object.values: 1.2.0
-      semver: 6.3.1
-      tsconfig-paths: 3.15.0
-    optionalDependencies:
-      '@typescript-eslint/parser': 7.2.0(eslint@8.57.0)(typescript@5.5.2)
-    transitivePeerDependencies:
-      - eslint-import-resolver-typescript
-      - eslint-import-resolver-webpack
-      - supports-color
-
   eslint-plugin-jest@27.9.0(@typescript-eslint/eslint-plugin@7.14.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2))(eslint@8.57.0)(typescript@5.5.2):
     dependencies:
       '@typescript-eslint/utils': 5.62.0(eslint@8.57.0)(typescript@5.5.2)
@@ -10769,6 +10733,10 @@ snapshots:
     dependencies:
       yallist: 3.1.1
 
+  lucide-react@0.441.0(react@19.0.0-rc-f994737d14-20240522):
+    dependencies:
+      react: 19.0.0-rc-f994737d14-20240522
+
   lz-string@1.5.0: {}
 
   magic-string@0.30.10:

From dbca7abfd3057e62d37c91e08e8c767de348f623 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 20 Sep 2024 01:48:09 +0100
Subject: [PATCH 03/43] no unused imports

---
 .../frontpage/app/(app)/moderation/page.tsx   | 22 +------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 3ffa341f..3336073a 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -7,13 +7,6 @@ import {
   CardHeader,
   CardTitle,
 } from "@/lib/components/ui/card";
-import { ScrollArea } from "@/lib/components/ui/scroll-area";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "@/lib/components/ui/tooltip";
 
 type Report = {
   id: string;
@@ -28,13 +21,8 @@ type Report = {
   community: string;
 };
 
-type Community = {
-  name: string;
-  icon: string;
-};
-
 export default function Component() {
-  const reports = [
+  const reports: Report[] = [
     {
       id: "1",
       type: "post",
@@ -73,14 +61,6 @@ export default function Component() {
     },
   ];
 
-  // const handleAction = (id: string, action: "approve" | "reject") => {
-  //   setReports(
-  //     reports.map((report) =>
-  //       report.id === id ? { ...report, status: action } : report,
-  //     ),
-  //   );
-  // };
-
   const stats = {
     total: reports.length,
     pending: reports.filter((r) => r.status === "pending").length,

From e3f38eed0b1e7fdbf2d09a1994a31b81971594fe Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 20 Sep 2024 02:12:41 +0100
Subject: [PATCH 04/43] update card to use children, we're allys here

---
 packages/frontpage/lib/components/ui/card.tsx | 45 +++++++++++--------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/packages/frontpage/lib/components/ui/card.tsx b/packages/frontpage/lib/components/ui/card.tsx
index 77e9fb78..f7693328 100644
--- a/packages/frontpage/lib/components/ui/card.tsx
+++ b/packages/frontpage/lib/components/ui/card.tsx
@@ -1,6 +1,6 @@
-import * as React from "react"
+import * as React from "react";
 
-import { cn } from "@/lib/utils"
+import { cn } from "@/lib/utils";
 
 const Card = React.forwardRef<
   HTMLDivElement,
@@ -10,12 +10,12 @@ const Card = React.forwardRef<
     ref={ref}
     className={cn(
       "rounded-xl border bg-card text-card-foreground shadow",
-      className
+      className,
     )}
     {...props}
   />
-))
-Card.displayName = "Card"
+));
+Card.displayName = "Card";
 
 const CardHeader = React.forwardRef<
   HTMLDivElement,
@@ -26,20 +26,22 @@ const CardHeader = React.forwardRef<
     className={cn("flex flex-col space-y-1.5 p-6", className)}
     {...props}
   />
-))
-CardHeader.displayName = "CardHeader"
+));
+CardHeader.displayName = "CardHeader";
 
 const CardTitle = React.forwardRef<
   HTMLParagraphElement,
   React.HTMLAttributes<HTMLHeadingElement>
->(({ className, ...props }, ref) => (
+>(({ className, children, ...props }, ref) => (
   <h3
     ref={ref}
     className={cn("font-semibold leading-none tracking-tight", className)}
     {...props}
-  />
-))
-CardTitle.displayName = "CardTitle"
+  >
+    {children}
+  </h3>
+));
+CardTitle.displayName = "CardTitle";
 
 const CardDescription = React.forwardRef<
   HTMLParagraphElement,
@@ -50,16 +52,16 @@ const CardDescription = React.forwardRef<
     className={cn("text-sm text-muted-foreground", className)}
     {...props}
   />
-))
-CardDescription.displayName = "CardDescription"
+));
+CardDescription.displayName = "CardDescription";
 
 const CardContent = React.forwardRef<
   HTMLDivElement,
   React.HTMLAttributes<HTMLDivElement>
 >(({ className, ...props }, ref) => (
   <div ref={ref} className={cn("p-6 pt-0", className)} {...props} />
-))
-CardContent.displayName = "CardContent"
+));
+CardContent.displayName = "CardContent";
 
 const CardFooter = React.forwardRef<
   HTMLDivElement,
@@ -70,7 +72,14 @@ const CardFooter = React.forwardRef<
     className={cn("flex items-center p-6 pt-0", className)}
     {...props}
   />
-))
-CardFooter.displayName = "CardFooter"
+));
+CardFooter.displayName = "CardFooter";
 
-export { Card, CardHeader, CardFooter, CardTitle, CardDescription, CardContent }
+export {
+  Card,
+  CardHeader,
+  CardFooter,
+  CardTitle,
+  CardDescription,
+  CardContent,
+};

From b75666dad5432860223b4019e2c1df26d5a5dbb0 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sat, 21 Sep 2024 02:18:59 +0100
Subject: [PATCH 05/43] add client component, start adding actions and checks
 for roles

---
 .../app/(app)/moderation/_client.tsx          | 158 +++++
 .../app/(app)/moderation/actions.tsx          |   3 +
 .../frontpage/app/(app)/moderation/page.tsx   | 255 ++-----
 .../drizzle/0001_glamorous_starfox.sql        |  32 +
 .../frontpage/drizzle/meta/0001_snapshot.json | 636 ++++++++++++++++++
 packages/frontpage/drizzle/meta/_journal.json |   7 +
 packages/frontpage/lib/data/user.ts           |  14 +
 packages/frontpage/lib/schema.ts              |   9 +-
 8 files changed, 918 insertions(+), 196 deletions(-)
 create mode 100644 packages/frontpage/app/(app)/moderation/_client.tsx
 create mode 100644 packages/frontpage/app/(app)/moderation/actions.tsx
 create mode 100644 packages/frontpage/drizzle/0001_glamorous_starfox.sql
 create mode 100644 packages/frontpage/drizzle/meta/0001_snapshot.json

diff --git a/packages/frontpage/app/(app)/moderation/_client.tsx b/packages/frontpage/app/(app)/moderation/_client.tsx
new file mode 100644
index 00000000..2cd90c8d
--- /dev/null
+++ b/packages/frontpage/app/(app)/moderation/_client.tsx
@@ -0,0 +1,158 @@
+"use client";
+import { CheckCircle, ExternalLink, Flag, Shield, XCircle } from "lucide-react";
+import { Button } from "@/lib/components/ui/button";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/lib/components/ui/card";
+import { Report } from "./page";
+
+export default function ModerationPage({
+  reports,
+  stats,
+}: {
+  reports: Report[];
+  stats: { total: number; pending: number; approved: number; rejected: number };
+}) {
+  return (
+    <div className="min-h-screen bg-gray-900 text-gray-100 p-8">
+      <Card className="bg-gray-800 border-gray-700 mb-6">
+        <CardHeader>
+          <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
+            <Shield className="h-6 w-6" />
+            Moderation Dashboard
+          </CardTitle>
+          <CardDescription className="text-gray-300">
+            Review and take action on reported content
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Total Reports
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-blue-300">
+                  {stats.total}
+                </div>
+              </CardContent>
+            </Card>
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Pending
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-yellow-300">
+                  {stats.pending}
+                </div>
+              </CardContent>
+            </Card>
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Approved
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-green-300">
+                  {stats.approved}
+                </div>
+              </CardContent>
+            </Card>
+            <Card className="bg-gray-700 border-gray-600">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Rejected
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-red-300">
+                  {stats.rejected}
+                </div>
+              </CardContent>
+            </Card>
+          </div>
+          <div className="space-y-6">
+            {reports.map((report) => (
+              <Card key={report.id} className="bg-gray-700 border-gray-600">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+                    <span>
+                      Reported {report.type} in {report.community}
+                    </span>
+                    <span
+                      className={`px-2 py-1 rounded-full text-xs ${
+                        report.status === "pending"
+                          ? "bg-yellow-500 text-yellow-900"
+                          : report.status === "approved"
+                            ? "bg-green-500 text-green-900"
+                            : "bg-red-500 text-red-900"
+                      }`}
+                    >
+                      {report.status.charAt(0).toUpperCase() +
+                        report.status.slice(1)}
+                    </span>
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <p className="text-gray-100 mb-2">{report.content}</p>
+                  <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                    <div>
+                      <strong>DID:</strong> {report.did}
+                    </div>
+                    <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
+                      <strong>CID:</strong> {report.cid}
+                    </div>
+                    <div>
+                      <strong>Record Key:</strong> {report.rkey}
+                    </div>
+                    <div>
+                      <strong>URI:</strong>
+                      <a
+                        href={report.uri}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                      >
+                        {report.uri.substring(0, 30)}...
+                        <ExternalLink className="h-3 w-3 ml-1" />
+                      </a>
+                    </div>
+                  </div>
+                  <div className="flex items-center text-sm text-gray-300 mb-4">
+                    <Flag className="mr-2 h-4 w-4 text-red-400" />
+                    <span>Reason: {report.reason}</span>
+                  </div>
+                  <div className="flex space-x-2">
+                    <Button
+                      variant="destructive"
+                      className="bg-green-600 hover:bg-green-700 text-white"
+                    >
+                      <CheckCircle className="mr-2 h-4 w-4" />
+                      Approve
+                    </Button>
+                    <Button
+                      variant="destructive"
+                      className="bg-red-600 hover:bg-red-700 text-white"
+                    >
+                      <XCircle className="mr-2 h-4 w-4" />
+                      Reject
+                    </Button>
+                  </div>
+                </CardContent>
+              </Card>
+            ))}
+          </div>
+        </CardContent>
+      </Card>
+    </div>
+  );
+}
diff --git a/packages/frontpage/app/(app)/moderation/actions.tsx b/packages/frontpage/app/(app)/moderation/actions.tsx
new file mode 100644
index 00000000..d431e6ac
--- /dev/null
+++ b/packages/frontpage/app/(app)/moderation/actions.tsx
@@ -0,0 +1,3 @@
+"use server";
+
+//TODO: add actions for creating, updating, deleting moderation reports
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 3336073a..15235924 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -1,14 +1,10 @@
-import { CheckCircle, ExternalLink, Flag, Shield, XCircle } from "lucide-react";
-import { Button } from "@/lib/components/ui/button";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/lib/components/ui/card";
+"use server";
 
-type Report = {
+import { hasRole } from "@/lib/data/user";
+import { redirect } from "next/navigation";
+import ModerationPage from "./_client";
+
+export type Report = {
   id: string;
   type: "post" | "comment";
   content: string;
@@ -21,189 +17,62 @@ type Report = {
   community: string;
 };
 
-export default function Component() {
-  const reports: Report[] = [
-    {
-      id: "1",
-      type: "post",
-      content: "This is a reported post",
-      reason: "Inappropriate content",
-      status: "pending",
-      did: "did:plc:abcdefghijklmnop",
-      cid: "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
-      rkey: "abcdef123456",
-      uri: "at://did:plc:abcdefghijklmnop/app.bsky.feed.post/abcdef123456",
-      community: "General",
-    },
-    {
-      id: "2",
-      type: "comment",
-      content: "This is a reported comment",
-      reason: "Spam",
-      status: "pending",
-      did: "did:plc:qrstuvwxyz123456",
-      cid: "bafybeihbgxvydgnxlfapxnzb7zyqbbs6tkvhflemvwogzb5zzp7ufuz7ky",
-      rkey: "ghijkl789012",
-      uri: "at://did:plc:qrstuvwxyz123456/app.bsky.feed.post/ghijkl789012",
-      community: "Tech",
-    },
-    {
-      id: "3",
-      type: "post",
-      content: "Another reported post",
-      reason: "Misinformation",
-      status: "pending",
-      did: "did:plc:123456abcdefghij",
-      cid: "bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xccnlnmzhe5h6y7afcvqpqom",
-      rkey: "mnopqr456789",
-      uri: "at://did:plc:123456abcdefghij/app.bsky.feed.post/mnopqr456789",
-      community: "Science",
-    },
-  ];
+const reports: Report[] = [
+  {
+    id: "1",
+    type: "post",
+    content: "This is a reported post",
+    reason: "Inappropriate content",
+    status: "pending",
+    did: "did:plc:abcdefghijklmnop",
+    cid: "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
+    rkey: "abcdef123456",
+    uri: "at://did:plc:abcdefghijklmnop/app.bsky.feed.post/abcdef123456",
+    community: "General",
+  },
+  {
+    id: "2",
+    type: "comment",
+    content: "This is a reported comment",
+    reason: "Spam",
+    status: "pending",
+    did: "did:plc:qrstuvwxyz123456",
+    cid: "bafybeihbgxvydgnxlfapxnzb7zyqbbs6tkvhflemvwogzb5zzp7ufuz7ky",
+    rkey: "ghijkl789012",
+    uri: "at://did:plc:qrstuvwxyz123456/app.bsky.feed.post/ghijkl789012",
+    community: "Tech",
+  },
+  {
+    id: "3",
+    type: "post",
+    content: "Another reported post",
+    reason: "Misinformation",
+    status: "pending",
+    did: "did:plc:123456abcdefghij",
+    cid: "bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xccnlnmzhe5h6y7afcvqpqom",
+    rkey: "mnopqr456789",
+    uri: "at://did:plc:123456abcdefghij/app.bsky.feed.post/mnopqr456789",
+    community: "Science",
+  },
+];
+
+const stats = {
+  total: reports.length,
+  pending: reports.filter((r) => r.status === "pending").length,
+  approved: reports.filter((r) => r.status === "approved").length,
+  rejected: reports.filter((r) => r.status === "rejected").length,
+};
 
-  const stats = {
-    total: reports.length,
-    pending: reports.filter((r) => r.status === "pending").length,
-    approved: reports.filter((r) => r.status === "approved").length,
-    rejected: reports.filter((r) => r.status === "rejected").length,
-  };
+export default async function Moderation() {
+  //TODO: get moderation reports, get moderator's stats etc.
+  if (await hasRole("moderator")) {
+    // const [reports, stats] = await Promise.all([
+    //     await getReports(),
+    //     await getStats(did),
+    // ]);
 
-  return (
-    <div className="min-h-screen bg-gray-900 text-gray-100 p-8">
-      <Card className="bg-gray-800 border-gray-700 mb-6">
-        <CardHeader>
-          <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
-            <Shield className="h-6 w-6" />
-            Moderation Dashboard
-          </CardTitle>
-          <CardDescription className="text-gray-300">
-            Review and take action on reported content
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Total Reports
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-blue-300">
-                  {stats.total}
-                </div>
-              </CardContent>
-            </Card>
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Pending
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-yellow-300">
-                  {stats.pending}
-                </div>
-              </CardContent>
-            </Card>
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Approved
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-green-300">
-                  {stats.approved}
-                </div>
-              </CardContent>
-            </Card>
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Rejected
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-red-300">
-                  {stats.rejected}
-                </div>
-              </CardContent>
-            </Card>
-          </div>
-          <div className="space-y-6">
-            {reports.map((report) => (
-              <Card key={report.id} className="bg-gray-700 border-gray-600">
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-                    <span>
-                      Reported {report.type} in {report.community}
-                    </span>
-                    <span
-                      className={`px-2 py-1 rounded-full text-xs ${
-                        report.status === "pending"
-                          ? "bg-yellow-500 text-yellow-900"
-                          : report.status === "approved"
-                            ? "bg-green-500 text-green-900"
-                            : "bg-red-500 text-red-900"
-                      }`}
-                    >
-                      {report.status.charAt(0).toUpperCase() +
-                        report.status.slice(1)}
-                    </span>
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <p className="text-gray-100 mb-2">{report.content}</p>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                    <div>
-                      <strong>DID:</strong> {report.did}
-                    </div>
-                    <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
-                      <strong>CID:</strong> {report.cid}
-                    </div>
-                    <div>
-                      <strong>Record Key:</strong> {report.rkey}
-                    </div>
-                    <div>
-                      <strong>URI:</strong>
-                      <a
-                        href={report.uri}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
-                      >
-                        {report.uri.substring(0, 30)}...
-                        <ExternalLink className="h-3 w-3 ml-1" />
-                      </a>
-                    </div>
-                  </div>
-                  <div className="flex items-center text-sm text-gray-300 mb-4">
-                    <Flag className="mr-2 h-4 w-4 text-red-400" />
-                    <span>Reason: {report.reason}</span>
-                  </div>
-                  <div className="flex space-x-2">
-                    <Button
-                      variant="destructive"
-                      className="bg-green-600 hover:bg-green-700 text-white"
-                    >
-                      <CheckCircle className="mr-2 h-4 w-4" />
-                      Approve
-                    </Button>
-                    <Button
-                      variant="destructive"
-                      className="bg-red-600 hover:bg-red-700 text-white"
-                    >
-                      <XCircle className="mr-2 h-4 w-4" />
-                      Reject
-                    </Button>
-                  </div>
-                </CardContent>
-              </Card>
-            ))}
-          </div>
-        </CardContent>
-      </Card>
-    </div>
-  );
+    return <ModerationPage reports={reports} stats={stats} />;
+  } else {
+    redirect("/");
+  }
 }
diff --git a/packages/frontpage/drizzle/0001_glamorous_starfox.sql b/packages/frontpage/drizzle/0001_glamorous_starfox.sql
new file mode 100644
index 00000000..e866378a
--- /dev/null
+++ b/packages/frontpage/drizzle/0001_glamorous_starfox.sql
@@ -0,0 +1,32 @@
+CREATE TABLE `labelled_profiles` (
+	`did` text NOT NULL,
+	`labels` text
+);
+
+CREATE TABLE `moderation_events` (
+	`subject_uri` text NOT NULL,
+	`subject_did` text NOT NULL,
+	`subject_collection` text,
+	`subject_rkey` text,
+	`subject_cid` text,
+	`created_by` text NOT NULL,
+	`created_at` text NOT NULL,
+	`labels_added` text,
+	`report_type` text
+);
+
+CREATE TABLE `reports` (
+	`actioned_at` text,
+	`actioned_by` text,
+	`subject_uri` text NOT NULL,
+	`subject_did` text NOT NULL,
+	`subject_collection` text,
+	`subject_rkey` text,
+	`subject_cid` text,
+	`created_by` text NOT NULL,
+	`created_at` text NOT NULL,
+	`creator_comment` text,
+	`labels_added` text
+);
+
+CREATE UNIQUE INDEX `labelled_profiles_did_unique` ON `labelled_profiles` (`did`);
diff --git a/packages/frontpage/drizzle/meta/0001_snapshot.json b/packages/frontpage/drizzle/meta/0001_snapshot.json
new file mode 100644
index 00000000..7a377d2f
--- /dev/null
+++ b/packages/frontpage/drizzle/meta/0001_snapshot.json
@@ -0,0 +1,636 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "00d0dbbe-737a-4ae8-985f-58fcc4d8d3fc",
+  "prevId": "b13e6740-b488-43a0-a373-49d5657df2bc",
+  "tables": {
+    "beta_users": {
+      "name": "beta_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "beta_users_did_unique": {
+          "name": "beta_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "body": {
+          "name": "body",
+          "type": "text(10000)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        },
+        "parent_comment_id": {
+          "name": "parent_comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comments_cid_unique": {
+          "name": "comments_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comments_author_did_rkey_unique": {
+          "name": "comments_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comments_post_id_posts_id_fk": {
+          "name": "comments_post_id_posts_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "parent_comment_id_fkey": {
+          "name": "parent_comment_id_fkey",
+          "tableFrom": "comments",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "parent_comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comment_votes": {
+      "name": "comment_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_votes_cid_unique": {
+          "name": "comment_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_rkey_unique": {
+          "name": "comment_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_comment_id_unique": {
+          "name": "comment_votes_author_did_comment_id_unique",
+          "columns": [
+            "author_did",
+            "comment_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_votes_comment_id_comments_id_fk": {
+          "name": "comment_votes_comment_id_comments_id_fk",
+          "tableFrom": "comment_votes",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "consumed_offsets": {
+      "name": "consumed_offsets",
+      "columns": {
+        "offset": {
+          "name": "offset",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "labelled_profiles": {
+      "name": "labelled_profiles",
+      "columns": {
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "labelled_profiles_did_unique": {
+          "name": "labelled_profiles_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "moderation_events": {
+      "name": "moderation_events",
+      "columns": {
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labels_added": {
+          "name": "labels_added",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_type": {
+          "name": "report_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "posts": {
+      "name": "posts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text(300)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        }
+      },
+      "indexes": {
+        "posts_cid_unique": {
+          "name": "posts_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "posts_author_did_rkey_unique": {
+          "name": "posts_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "post_votes": {
+      "name": "post_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "post_votes_cid_unique": {
+          "name": "post_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_rkey_unique": {
+          "name": "post_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_post_id_unique": {
+          "name": "post_votes_author_did_post_id_unique",
+          "columns": [
+            "author_did",
+            "post_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "post_votes_post_id_posts_id_fk": {
+          "name": "post_votes_post_id_posts_id_fk",
+          "tableFrom": "post_votes",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "reports": {
+      "name": "reports",
+      "columns": {
+        "actioned_at": {
+          "name": "actioned_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "actioned_by": {
+          "name": "actioned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "creator_comment": {
+          "name": "creator_comment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels_added": {
+          "name": "labels_added",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index e06a2c9b..1307d38e 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -8,6 +8,13 @@
       "when": 1725040407942,
       "tag": "0000_sturdy_rage",
       "breakpoints": true
+    },
+    {
+      "idx": 1,
+      "version": "6",
+      "when": 1726875517497,
+      "tag": "0001_glamorous_starfox",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/frontpage/lib/data/user.ts b/packages/frontpage/lib/data/user.ts
index c8e7e6b7..a0dfe5d5 100644
--- a/packages/frontpage/lib/data/user.ts
+++ b/packages/frontpage/lib/data/user.ts
@@ -81,6 +81,20 @@ export const isBetaUser = cache(async () => {
   );
 });
 
+export const hasRole = cache(async (role: string) => {
+  const user = await getUser();
+  if (!user) {
+    return false;
+  }
+
+  return Boolean(
+    role === "moderator",
+    // await db.query.User.findFirst({
+    // where: and(eq(schema.User.did, user.did), eq(schema.User.role, role)),
+    // }),
+  );
+});
+
 const ProfileResponse = z.object({
   avatar: z.string(),
   handle: z.string(),
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index 17b0060a..ee63fc46 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -128,16 +128,19 @@ export const ConsumedOffset = sqliteTable("consumed_offsets", {
   offset: integer("offset").primaryKey(),
 });
 
+const createColumnReportType = (col: string) =>
+  text(col, { enum: ["post", "comment", "user"] });
+
 export const ModerationEvent = sqliteTable("moderation_events", {
   subjectUri: text("subject_uri").notNull(),
   subjectDid: text("subject_did").notNull(),
   subjectCollection: text("subject_collection"),
   subjectRkey: text("subject_rkey"),
-  subjectCid: text("subject_cid").notNull(),
+  subjectCid: text("subject_cid"),
   createdBy: text("created_by").notNull(),
   createdAt: dateIsoText("created_at").notNull(),
   labelsAdded: text("labels_added"),
-  labelsRemoved: text("labels_removed"),
+  reportType: createColumnReportType("report_type"),
 });
 
 export const LabelledProfile = sqliteTable("labelled_profiles", {
@@ -152,7 +155,7 @@ export const Report = sqliteTable("reports", {
   subjectDid: text("subject_did").notNull(),
   subjectCollection: text("subject_collection"),
   subjectRkey: text("subject_rkey"),
-  subjectCid: text("subject_cid").notNull(),
+  subjectCid: text("subject_cid"),
   createdBy: text("created_by").notNull(),
   createdAt: dateIsoText("created_at").notNull(),
   creatorComment: text("creator_comment"),

From f8606ddf8bc20d4a15caf021f2914ee03bd2a115 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sun, 22 Sep 2024 21:08:57 +0100
Subject: [PATCH 06/43] remove extra div on mod page

---
 .../app/(app)/moderation/_client.tsx          | 252 +++++++++---------
 1 file changed, 125 insertions(+), 127 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/_client.tsx b/packages/frontpage/app/(app)/moderation/_client.tsx
index 2cd90c8d..0da9133b 100644
--- a/packages/frontpage/app/(app)/moderation/_client.tsx
+++ b/packages/frontpage/app/(app)/moderation/_client.tsx
@@ -18,141 +18,139 @@ export default function ModerationPage({
   stats: { total: number; pending: number; approved: number; rejected: number };
 }) {
   return (
-    <div className="min-h-screen bg-gray-900 text-gray-100 p-8">
-      <Card className="bg-gray-800 border-gray-700 mb-6">
-        <CardHeader>
-          <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
-            <Shield className="h-6 w-6" />
-            Moderation Dashboard
-          </CardTitle>
-          <CardDescription className="text-gray-300">
-            Review and take action on reported content
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-            <Card className="bg-gray-700 border-gray-600">
+    <Card className="bg-gray-800 border-gray-700 mb-6">
+      <CardHeader>
+        <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
+          <Shield className="h-6 w-6" />
+          Moderation Dashboard
+        </CardTitle>
+        <CardDescription className="text-gray-300">
+          Review and take action on reported content
+        </CardDescription>
+      </CardHeader>
+      <CardContent>
+        <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+          <Card className="bg-gray-700 border-gray-600">
+            <CardHeader className="pb-2">
+              <CardTitle className="text-sm font-medium text-gray-400">
+                Total Reports
+              </CardTitle>
+            </CardHeader>
+            <CardContent>
+              <div className="text-2xl font-bold text-blue-300">
+                {stats.total}
+              </div>
+            </CardContent>
+          </Card>
+          <Card className="bg-gray-700 border-gray-600">
+            <CardHeader className="pb-2">
+              <CardTitle className="text-sm font-medium text-gray-400">
+                Pending
+              </CardTitle>
+            </CardHeader>
+            <CardContent>
+              <div className="text-2xl font-bold text-yellow-300">
+                {stats.pending}
+              </div>
+            </CardContent>
+          </Card>
+          <Card className="bg-gray-700 border-gray-600">
+            <CardHeader className="pb-2">
+              <CardTitle className="text-sm font-medium text-gray-400">
+                Approved
+              </CardTitle>
+            </CardHeader>
+            <CardContent>
+              <div className="text-2xl font-bold text-green-300">
+                {stats.approved}
+              </div>
+            </CardContent>
+          </Card>
+          <Card className="bg-gray-700 border-gray-600">
+            <CardHeader className="pb-2">
+              <CardTitle className="text-sm font-medium text-gray-400">
+                Rejected
+              </CardTitle>
+            </CardHeader>
+            <CardContent>
+              <div className="text-2xl font-bold text-red-300">
+                {stats.rejected}
+              </div>
+            </CardContent>
+          </Card>
+        </div>
+        <div className="space-y-6">
+          {reports.map((report) => (
+            <Card key={report.id} className="bg-gray-700 border-gray-600">
               <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Total Reports
+                <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+                  <span>
+                    Reported {report.type} in {report.community}
+                  </span>
+                  <span
+                    className={`px-2 py-1 rounded-full text-xs ${
+                      report.status === "pending"
+                        ? "bg-yellow-500 text-yellow-900"
+                        : report.status === "approved"
+                          ? "bg-green-500 text-green-900"
+                          : "bg-red-500 text-red-900"
+                    }`}
+                  >
+                    {report.status.charAt(0).toUpperCase() +
+                      report.status.slice(1)}
+                  </span>
                 </CardTitle>
               </CardHeader>
               <CardContent>
-                <div className="text-2xl font-bold text-blue-300">
-                  {stats.total}
-                </div>
-              </CardContent>
-            </Card>
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Pending
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-yellow-300">
-                  {stats.pending}
+                <p className="text-gray-100 mb-2">{report.content}</p>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                  <div>
+                    <strong>DID:</strong> {report.did}
+                  </div>
+                  <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
+                    <strong>CID:</strong> {report.cid}
+                  </div>
+                  <div>
+                    <strong>Record Key:</strong> {report.rkey}
+                  </div>
+                  <div>
+                    <strong>URI:</strong>
+                    <a
+                      href={report.uri}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                    >
+                      {report.uri.substring(0, 30)}...
+                      <ExternalLink className="h-3 w-3 ml-1" />
+                    </a>
+                  </div>
                 </div>
-              </CardContent>
-            </Card>
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Approved
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-green-300">
-                  {stats.approved}
+                <div className="flex items-center text-sm text-gray-300 mb-4">
+                  <Flag className="mr-2 h-4 w-4 text-red-400" />
+                  <span>Reason: {report.reason}</span>
                 </div>
-              </CardContent>
-            </Card>
-            <Card className="bg-gray-700 border-gray-600">
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Rejected
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-red-300">
-                  {stats.rejected}
+                <div className="flex space-x-2">
+                  <Button
+                    variant="destructive"
+                    className="bg-green-600 hover:bg-green-700 text-white"
+                  >
+                    <CheckCircle className="mr-2 h-4 w-4" />
+                    Approve
+                  </Button>
+                  <Button
+                    variant="destructive"
+                    className="bg-red-600 hover:bg-red-700 text-white"
+                  >
+                    <XCircle className="mr-2 h-4 w-4" />
+                    Reject
+                  </Button>
                 </div>
               </CardContent>
             </Card>
-          </div>
-          <div className="space-y-6">
-            {reports.map((report) => (
-              <Card key={report.id} className="bg-gray-700 border-gray-600">
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-                    <span>
-                      Reported {report.type} in {report.community}
-                    </span>
-                    <span
-                      className={`px-2 py-1 rounded-full text-xs ${
-                        report.status === "pending"
-                          ? "bg-yellow-500 text-yellow-900"
-                          : report.status === "approved"
-                            ? "bg-green-500 text-green-900"
-                            : "bg-red-500 text-red-900"
-                      }`}
-                    >
-                      {report.status.charAt(0).toUpperCase() +
-                        report.status.slice(1)}
-                    </span>
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <p className="text-gray-100 mb-2">{report.content}</p>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                    <div>
-                      <strong>DID:</strong> {report.did}
-                    </div>
-                    <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
-                      <strong>CID:</strong> {report.cid}
-                    </div>
-                    <div>
-                      <strong>Record Key:</strong> {report.rkey}
-                    </div>
-                    <div>
-                      <strong>URI:</strong>
-                      <a
-                        href={report.uri}
-                        target="_blank"
-                        rel="noopener noreferrer"
-                        className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
-                      >
-                        {report.uri.substring(0, 30)}...
-                        <ExternalLink className="h-3 w-3 ml-1" />
-                      </a>
-                    </div>
-                  </div>
-                  <div className="flex items-center text-sm text-gray-300 mb-4">
-                    <Flag className="mr-2 h-4 w-4 text-red-400" />
-                    <span>Reason: {report.reason}</span>
-                  </div>
-                  <div className="flex space-x-2">
-                    <Button
-                      variant="destructive"
-                      className="bg-green-600 hover:bg-green-700 text-white"
-                    >
-                      <CheckCircle className="mr-2 h-4 w-4" />
-                      Approve
-                    </Button>
-                    <Button
-                      variant="destructive"
-                      className="bg-red-600 hover:bg-red-700 text-white"
-                    >
-                      <XCircle className="mr-2 h-4 w-4" />
-                      Reject
-                    </Button>
-                  </div>
-                </CardContent>
-              </Card>
-            ))}
-          </div>
-        </CardContent>
-      </Card>
-    </div>
+          ))}
+        </div>
+      </CardContent>
+    </Card>
   );
 }

From 06f8fb6706dce764b2bc2ee812a8fde27b539579 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Mon, 23 Sep 2024 01:45:25 +0100
Subject: [PATCH 07/43] delete generated migration

---
 .../drizzle/0001_glamorous_starfox.sql        |  32 -
 .../frontpage/drizzle/meta/0001_snapshot.json | 636 ------------------
 packages/frontpage/drizzle/meta/_journal.json |   9 +-
 3 files changed, 1 insertion(+), 676 deletions(-)
 delete mode 100644 packages/frontpage/drizzle/0001_glamorous_starfox.sql
 delete mode 100644 packages/frontpage/drizzle/meta/0001_snapshot.json

diff --git a/packages/frontpage/drizzle/0001_glamorous_starfox.sql b/packages/frontpage/drizzle/0001_glamorous_starfox.sql
deleted file mode 100644
index e866378a..00000000
--- a/packages/frontpage/drizzle/0001_glamorous_starfox.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-CREATE TABLE `labelled_profiles` (
-	`did` text NOT NULL,
-	`labels` text
-);
-
-CREATE TABLE `moderation_events` (
-	`subject_uri` text NOT NULL,
-	`subject_did` text NOT NULL,
-	`subject_collection` text,
-	`subject_rkey` text,
-	`subject_cid` text,
-	`created_by` text NOT NULL,
-	`created_at` text NOT NULL,
-	`labels_added` text,
-	`report_type` text
-);
-
-CREATE TABLE `reports` (
-	`actioned_at` text,
-	`actioned_by` text,
-	`subject_uri` text NOT NULL,
-	`subject_did` text NOT NULL,
-	`subject_collection` text,
-	`subject_rkey` text,
-	`subject_cid` text,
-	`created_by` text NOT NULL,
-	`created_at` text NOT NULL,
-	`creator_comment` text,
-	`labels_added` text
-);
-
-CREATE UNIQUE INDEX `labelled_profiles_did_unique` ON `labelled_profiles` (`did`);
diff --git a/packages/frontpage/drizzle/meta/0001_snapshot.json b/packages/frontpage/drizzle/meta/0001_snapshot.json
deleted file mode 100644
index 7a377d2f..00000000
--- a/packages/frontpage/drizzle/meta/0001_snapshot.json
+++ /dev/null
@@ -1,636 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "00d0dbbe-737a-4ae8-985f-58fcc4d8d3fc",
-  "prevId": "b13e6740-b488-43a0-a373-49d5657df2bc",
-  "tables": {
-    "beta_users": {
-      "name": "beta_users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "beta_users_did_unique": {
-          "name": "beta_users_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comments": {
-      "name": "comments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "body": {
-          "name": "body",
-          "type": "text(10000)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        },
-        "parent_comment_id": {
-          "name": "parent_comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comments_cid_unique": {
-          "name": "comments_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comments_author_did_rkey_unique": {
-          "name": "comments_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comments_post_id_posts_id_fk": {
-          "name": "comments_post_id_posts_id_fk",
-          "tableFrom": "comments",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "parent_comment_id_fkey": {
-          "name": "parent_comment_id_fkey",
-          "tableFrom": "comments",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "parent_comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comment_votes": {
-      "name": "comment_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "comment_id": {
-          "name": "comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comment_votes_cid_unique": {
-          "name": "comment_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_rkey_unique": {
-          "name": "comment_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_comment_id_unique": {
-          "name": "comment_votes_author_did_comment_id_unique",
-          "columns": [
-            "author_did",
-            "comment_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comment_votes_comment_id_comments_id_fk": {
-          "name": "comment_votes_comment_id_comments_id_fk",
-          "tableFrom": "comment_votes",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "consumed_offsets": {
-      "name": "consumed_offsets",
-      "columns": {
-        "offset": {
-          "name": "offset",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "labelled_profiles": {
-      "name": "labelled_profiles",
-      "columns": {
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "labels": {
-          "name": "labels",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "labelled_profiles_did_unique": {
-          "name": "labelled_profiles_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "moderation_events": {
-      "name": "moderation_events",
-      "columns": {
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "labels_added": {
-          "name": "labels_added",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_type": {
-          "name": "report_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "posts": {
-      "name": "posts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text(300)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        }
-      },
-      "indexes": {
-        "posts_cid_unique": {
-          "name": "posts_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "posts_author_did_rkey_unique": {
-          "name": "posts_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "post_votes": {
-      "name": "post_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "post_votes_cid_unique": {
-          "name": "post_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_rkey_unique": {
-          "name": "post_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_post_id_unique": {
-          "name": "post_votes_author_did_post_id_unique",
-          "columns": [
-            "author_did",
-            "post_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "post_votes_post_id_posts_id_fk": {
-          "name": "post_votes_post_id_posts_id_fk",
-          "tableFrom": "post_votes",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "reports": {
-      "name": "reports",
-      "columns": {
-        "actioned_at": {
-          "name": "actioned_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "actioned_by": {
-          "name": "actioned_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "creator_comment": {
-          "name": "creator_comment",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "labels_added": {
-          "name": "labels_added",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index 1307d38e..02e6469e 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -8,13 +8,6 @@
       "when": 1725040407942,
       "tag": "0000_sturdy_rage",
       "breakpoints": true
-    },
-    {
-      "idx": 1,
-      "version": "6",
-      "when": 1726875517497,
-      "tag": "0001_glamorous_starfox",
-      "breakpoints": true
     }
   ]
-}
\ No newline at end of file
+}

From 51a32bb99b007d908c1e388758d1bd5fdd14a00a Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Mon, 23 Sep 2024 04:35:37 +0100
Subject: [PATCH 08/43] update report to reflect schema, start working on
 actual page components

---
 .../app/(app)/moderation/_client.tsx          | 260 +++++++++---------
 .../frontpage/app/(app)/moderation/page.tsx   |  97 ++++---
 2 files changed, 197 insertions(+), 160 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/_client.tsx b/packages/frontpage/app/(app)/moderation/_client.tsx
index 0da9133b..37ac6a39 100644
--- a/packages/frontpage/app/(app)/moderation/_client.tsx
+++ b/packages/frontpage/app/(app)/moderation/_client.tsx
@@ -9,6 +9,13 @@ import {
   CardTitle,
 } from "@/lib/components/ui/card";
 import { Report } from "./page";
+import {
+  Tabs,
+  TabsContent,
+  TabsList,
+  TabsTrigger,
+} from "@/lib/components/ui/tabs";
+import { useState } from "react";
 
 export default function ModerationPage({
   reports,
@@ -17,140 +24,143 @@ export default function ModerationPage({
   reports: Report[];
   stats: { total: number; pending: number; approved: number; rejected: number };
 }) {
+  const [selectedTab, setSelectedTab] = useState("all");
+
   return (
-    <Card className="bg-gray-800 border-gray-700 mb-6">
-      <CardHeader>
-        <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
-          <Shield className="h-6 w-6" />
-          Moderation Dashboard
-        </CardTitle>
-        <CardDescription className="text-gray-300">
-          Review and take action on reported content
-        </CardDescription>
-      </CardHeader>
-      <CardContent>
-        <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-          <Card className="bg-gray-700 border-gray-600">
-            <CardHeader className="pb-2">
-              <CardTitle className="text-sm font-medium text-gray-400">
-                Total Reports
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold text-blue-300">
-                {stats.total}
-              </div>
-            </CardContent>
-          </Card>
-          <Card className="bg-gray-700 border-gray-600">
-            <CardHeader className="pb-2">
-              <CardTitle className="text-sm font-medium text-gray-400">
-                Pending
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold text-yellow-300">
-                {stats.pending}
-              </div>
-            </CardContent>
-          </Card>
-          <Card className="bg-gray-700 border-gray-600">
-            <CardHeader className="pb-2">
-              <CardTitle className="text-sm font-medium text-gray-400">
-                Approved
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold text-green-300">
-                {stats.approved}
-              </div>
-            </CardContent>
-          </Card>
-          <Card className="bg-gray-700 border-gray-600">
-            <CardHeader className="pb-2">
-              <CardTitle className="text-sm font-medium text-gray-400">
-                Rejected
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <div className="text-2xl font-bold text-red-300">
-                {stats.rejected}
-              </div>
-            </CardContent>
-          </Card>
-        </div>
-        <div className="space-y-6">
-          {reports.map((report) => (
-            <Card key={report.id} className="bg-gray-700 border-gray-600">
+    <>
+      <Card className="bg-gray-800 border-gray-700 mb-6">
+        <CardHeader>
+          <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
+            <Shield className="h-6 w-6" />
+            Moderation Dashboard
+          </CardTitle>
+          <CardDescription className="text-gray-300">
+            Review and take action on reported content
+          </CardDescription>
+        </CardHeader>
+        <CardContent>
+          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+            <Card
+              className={`bg-gray-700 border-gray-600 ${selectedTab === "all" ? "ring-2 ring-blue-500" : ""}`}
+              onClick={() => setSelectedTab("all")}
+            >
               <CardHeader className="pb-2">
-                <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-                  <span>
-                    Reported {report.type} in {report.community}
-                  </span>
-                  <span
-                    className={`px-2 py-1 rounded-full text-xs ${
-                      report.status === "pending"
-                        ? "bg-yellow-500 text-yellow-900"
-                        : report.status === "approved"
-                          ? "bg-green-500 text-green-900"
-                          : "bg-red-500 text-red-900"
-                    }`}
-                  >
-                    {report.status.charAt(0).toUpperCase() +
-                      report.status.slice(1)}
-                  </span>
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Total Reports
                 </CardTitle>
               </CardHeader>
               <CardContent>
-                <p className="text-gray-100 mb-2">{report.content}</p>
-                <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                  <div>
-                    <strong>DID:</strong> {report.did}
-                  </div>
-                  <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
-                    <strong>CID:</strong> {report.cid}
-                  </div>
-                  <div>
-                    <strong>Record Key:</strong> {report.rkey}
-                  </div>
-                  <div>
-                    <strong>URI:</strong>
-                    <a
-                      href={report.uri}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
-                    >
-                      {report.uri.substring(0, 30)}...
-                      <ExternalLink className="h-3 w-3 ml-1" />
-                    </a>
-                  </div>
+                <div className="text-2xl font-bold text-blue-300">
+                  {stats.total}
                 </div>
-                <div className="flex items-center text-sm text-gray-300 mb-4">
-                  <Flag className="mr-2 h-4 w-4 text-red-400" />
-                  <span>Reason: {report.reason}</span>
+              </CardContent>
+            </Card>
+            <Card
+              className={`bg-gray-700 border-gray-600 ${selectedTab === "pending" ? "ring-2 ring-blue-500" : ""}`}
+              onClick={() => setSelectedTab("pending")}
+            >
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Pending
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-yellow-300">
+                  {stats.pending}
                 </div>
-                <div className="flex space-x-2">
-                  <Button
-                    variant="destructive"
-                    className="bg-green-600 hover:bg-green-700 text-white"
-                  >
-                    <CheckCircle className="mr-2 h-4 w-4" />
-                    Approve
-                  </Button>
-                  <Button
-                    variant="destructive"
-                    className="bg-red-600 hover:bg-red-700 text-white"
-                  >
-                    <XCircle className="mr-2 h-4 w-4" />
-                    Reject
-                  </Button>
+              </CardContent>
+            </Card>
+            <Card
+              className={`bg-gray-700 border-gray-600 ${selectedTab === "approved" ? "ring-2 ring-blue-500" : ""}`}
+              onClick={() => setSelectedTab("approved")}
+            >
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Approved
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-green-300">
+                  {stats.approved}
+                </div>
+              </CardContent>
+            </Card>
+            <Card
+              className={`bg-gray-700 border-gray-600 ${selectedTab === "rejected" ? "ring-2 ring-blue-500" : ""}`}
+              onClick={() => setSelectedTab("rejected")}
+            >
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Rejected
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-red-300">
+                  {stats.rejected}
                 </div>
               </CardContent>
             </Card>
-          ))}
-        </div>
-      </CardContent>
-    </Card>
+          </div>
+        </CardContent>
+      </Card>
+      {reports
+        .filter(
+          (report) => report.status === selectedTab || selectedTab === "all",
+        )
+        .map((report) => (
+          <Card
+            key={report.subjectCid}
+            className="bg-gray-700 border-gray-600 mb-4"
+          >
+            <CardHeader className="pb-2">
+              <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+                <span>Reported {report.type}</span>
+                <span
+                  className={`px-2 py-1 rounded-full text-xs ${
+                    report.status === "pending"
+                      ? "bg-yellow-500 text-yellow-900"
+                      : report.status === "approved"
+                        ? "bg-green-500 text-green-900"
+                        : "bg-red-500 text-red-900"
+                  }`}
+                >
+                  {report.status.charAt(0).toUpperCase() +
+                    report.status.slice(1)}
+                </span>
+              </CardTitle>
+            </CardHeader>
+            <CardContent>
+              <p className="text-gray-100 mb-2">{report.creatorComment}</p>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                <div>
+                  <strong>DID:</strong> {report.subjectDid}
+                </div>
+                <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
+                  <strong>CID:</strong> {report.subjectCid}
+                </div>
+                <div>
+                  <strong>Record Key:</strong> {report.subjectRkey}
+                </div>
+                <div>
+                  <strong>URI:</strong>
+                  <a
+                    href={report.subjectUri}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                  >
+                    {report.subjectUri.substring(0, 30)}...
+                    <ExternalLink className="h-3 w-3 ml-1" />
+                  </a>
+                </div>
+              </div>
+              <div className="flex items-center text-sm text-gray-300 mb-4">
+                <Flag className="mr-2 h-4 w-4 text-red-400" />
+                <span>Reason: {report.creatorComment}</span>
+              </div>
+            </CardContent>
+          </Card>
+        ))}
+    </>
   );
 }
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 15235924..afbdc6e2 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -5,54 +5,81 @@ import { redirect } from "next/navigation";
 import ModerationPage from "./_client";
 
 export type Report = {
-  id: string;
-  type: "post" | "comment";
-  content: string;
-  reason: string;
-  status: "pending" | "approved" | "rejected";
-  did: string;
-  cid: string;
-  rkey: string;
-  uri: string;
-  community: string;
+  actionedAt?: string; // Optional field
+  actionedBy?: string; // Optional field
+  subjectUri: string;
+  subjectDid: string;
+  subjectCollection?: string; // Optional field
+  subjectRkey?: string; // Optional field
+  subjectCid?: string; // Optional field
+  createdBy: string;
+  createdAt: string;
+  creatorComment?: string; // Optional field
+  labelsAdded?: string; // Optional field
+  //TODO: add a type field to the report schema so you know if it's a post, comment or user report
+  //TODO: add a status field to the report schema so you know if it's pending, approved or rejected
+  type: "post" | "comment" | "user"; // New field to indicate the type of report
+  status: "pending" | "approved" | "rejected"; // New field to indicate the status of the report
 };
 
 const reports: Report[] = [
   {
-    id: "1",
+    actionedAt: "2023-10-01T12:00:00Z",
+    actionedBy: "moderator1",
+    subjectUri: "uri1",
+    subjectDid: "did1",
+    subjectCollection: "collection1",
+    subjectRkey: "rkey1",
+    subjectCid: "cid1",
+    createdBy: "user1",
+    createdAt: "2023-09-30T12:00:00Z",
+    creatorComment: "This is a comment by the creator.",
+    labelsAdded: "label1,label2",
     type: "post",
-    content: "This is a reported post",
-    reason: "Inappropriate content",
-    status: "pending",
-    did: "did:plc:abcdefghijklmnop",
-    cid: "bafybeigdyrzt5sfp7udm7hu76uh7y26nf3efuylqabf3oclgtqy55fbzdi",
-    rkey: "abcdef123456",
-    uri: "at://did:plc:abcdefghijklmnop/app.bsky.feed.post/abcdef123456",
-    community: "General",
+    status: "approved",
   },
   {
-    id: "2",
+    actionedAt: "2023-10-02T12:00:00Z",
+    actionedBy: "moderator2",
+    subjectUri: "uri2",
+    subjectDid: "did2",
+    subjectCollection: "collection2",
+    subjectRkey: "rkey2",
+    subjectCid: "cid2",
+    createdBy: "user2",
+    createdAt: "2023-09-29T12:00:00Z",
+    creatorComment: "This is another comment by the creator.",
+    labelsAdded: "label3,label4",
     type: "comment",
-    content: "This is a reported comment",
-    reason: "Spam",
+    status: "rejected",
+  },
+  {
+    subjectUri: "uri3",
+    subjectDid: "did3",
+    createdBy: "user3",
+    createdAt: "2023-09-28T12:00:00Z",
+    type: "user",
     status: "pending",
-    did: "did:plc:qrstuvwxyz123456",
-    cid: "bafybeihbgxvydgnxlfapxnzb7zyqbbs6tkvhflemvwogzb5zzp7ufuz7ky",
-    rkey: "ghijkl789012",
-    uri: "at://did:plc:qrstuvwxyz123456/app.bsky.feed.post/ghijkl789012",
-    community: "Tech",
   },
   {
-    id: "3",
+    subjectUri: "uri4",
+    subjectDid: "did4",
+    subjectCollection: "collection4",
+    createdBy: "user4",
+    createdAt: "2023-09-27T12:00:00Z",
+    creatorComment: "Yet another comment by the creator.",
     type: "post",
-    content: "Another reported post",
-    reason: "Misinformation",
     status: "pending",
-    did: "did:plc:123456abcdefghij",
-    cid: "bafybeihdwdcefgh4dqkjv67uzcmw7ojee6xccnlnmzhe5h6y7afcvqpqom",
-    rkey: "mnopqr456789",
-    uri: "at://did:plc:123456abcdefghij/app.bsky.feed.post/mnopqr456789",
-    community: "Science",
+  },
+  {
+    subjectUri: "uri5",
+    subjectDid: "did5",
+    subjectRkey: "rkey5",
+    createdBy: "user5",
+    createdAt: "2023-09-26T12:00:00Z",
+    labelsAdded: "label5,label6",
+    type: "comment",
+    status: "approved",
   },
 ];
 

From 4b5c2ef4099eaba7fd6f520e23fbc9668dfecf11 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Mon, 23 Sep 2024 04:35:45 +0100
Subject: [PATCH 09/43] update readme typos

---
 packages/frontpage/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/frontpage/README.md b/packages/frontpage/README.md
index 5812dcc5..6ed84acd 100644
--- a/packages/frontpage/README.md
+++ b/packages/frontpage/README.md
@@ -10,10 +10,10 @@ If you just need to work on the app in a logged-out state, then you just need to
 pnpm run dev
 ```
 
-If you need to login, you need to setup some additional env vars and serve your dev server over the public internet. You can do this with `cloudflared` altho other options are available eg. `ngrok` or `tailscale`:
+If you need to login, you need to setup some additional env vars and serve your dev server over the public internet. You can do this with `cloudflared` although other options are available eg. `ngrok` or `tailscale`:
 
 ```bash
-pnpm exec tsx ./scripts/generate-jwks.mts # Copy this output into .env.local
+pnpm exec tsx ./scripts/generate-jwk.mts # Copy this output into .env.local
 
 # In one terminal, start the dev server
 pnpm run dev

From db46d9243ed2b628062f8b8a91249a5641548221 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Mon, 23 Sep 2024 10:39:27 +0100
Subject: [PATCH 10/43] remove unused imports for build

---
 packages/frontpage/app/(app)/moderation/_client.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/_client.tsx b/packages/frontpage/app/(app)/moderation/_client.tsx
index 37ac6a39..f8bb5f62 100644
--- a/packages/frontpage/app/(app)/moderation/_client.tsx
+++ b/packages/frontpage/app/(app)/moderation/_client.tsx
@@ -1,6 +1,5 @@
 "use client";
-import { CheckCircle, ExternalLink, Flag, Shield, XCircle } from "lucide-react";
-import { Button } from "@/lib/components/ui/button";
+import { ExternalLink, Flag, Shield } from "lucide-react";
 import {
   Card,
   CardContent,
@@ -9,12 +8,6 @@ import {
   CardTitle,
 } from "@/lib/components/ui/card";
 import { Report } from "./page";
-import {
-  Tabs,
-  TabsContent,
-  TabsList,
-  TabsTrigger,
-} from "@/lib/components/ui/tabs";
 import { useState } from "react";
 
 export default function ModerationPage({

From 4bd324f50d8153fb6351ab93b8401462b42fd02c Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 25 Sep 2024 20:50:33 +0100
Subject: [PATCH 11/43] generate schema, migrate

---
 .../app/(app)/moderation/actions.tsx          |  16 +
 .../moderation/{_client.tsx => client.tsx}    |   0
 .../frontpage/app/(app)/moderation/page.tsx   |   8 +-
 .../drizzle/0002_windy_ezekiel_stane.sql      |  37 +
 .../frontpage/drizzle/meta/0002_snapshot.json | 845 ++++++++++++++++++
 packages/frontpage/drizzle/meta/_journal.json |   9 +-
 packages/frontpage/lib/schema.ts              |  12 +-
 7 files changed, 920 insertions(+), 7 deletions(-)
 rename packages/frontpage/app/(app)/moderation/{_client.tsx => client.tsx} (100%)
 create mode 100644 packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql
 create mode 100644 packages/frontpage/drizzle/meta/0002_snapshot.json

diff --git a/packages/frontpage/app/(app)/moderation/actions.tsx b/packages/frontpage/app/(app)/moderation/actions.tsx
index d431e6ac..8912df36 100644
--- a/packages/frontpage/app/(app)/moderation/actions.tsx
+++ b/packages/frontpage/app/(app)/moderation/actions.tsx
@@ -1,3 +1,19 @@
 "use server";
 
 //TODO: add actions for creating, updating, deleting moderation reports
+
+export async function createModerationAction(
+  _prevState: unknown,
+  formData: FormData,
+) {
+  //create the moderation action and update the report as actioned
+  return { error: "Not implemented" };
+}
+
+export async function rejectReportAction(
+  _prevState: unknown,
+  formData: FormData,
+) {
+  //reject the report and update the report as actioned
+  return { error: "Not implemented" };
+}
diff --git a/packages/frontpage/app/(app)/moderation/_client.tsx b/packages/frontpage/app/(app)/moderation/client.tsx
similarity index 100%
rename from packages/frontpage/app/(app)/moderation/_client.tsx
rename to packages/frontpage/app/(app)/moderation/client.tsx
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index afbdc6e2..9fd1ff66 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -2,9 +2,10 @@
 
 import { hasRole } from "@/lib/data/user";
 import { redirect } from "next/navigation";
-import ModerationPage from "./_client";
+import ModerationPage from "./client";
 
 export type Report = {
+  id: number;
   actionedAt?: string; // Optional field
   actionedBy?: string; // Optional field
   subjectUri: string;
@@ -24,6 +25,7 @@ export type Report = {
 
 const reports: Report[] = [
   {
+    id: 1,
     actionedAt: "2023-10-01T12:00:00Z",
     actionedBy: "moderator1",
     subjectUri: "uri1",
@@ -39,6 +41,7 @@ const reports: Report[] = [
     status: "approved",
   },
   {
+    id: 2,
     actionedAt: "2023-10-02T12:00:00Z",
     actionedBy: "moderator2",
     subjectUri: "uri2",
@@ -54,6 +57,7 @@ const reports: Report[] = [
     status: "rejected",
   },
   {
+    id: 3,
     subjectUri: "uri3",
     subjectDid: "did3",
     createdBy: "user3",
@@ -62,6 +66,7 @@ const reports: Report[] = [
     status: "pending",
   },
   {
+    id: 4,
     subjectUri: "uri4",
     subjectDid: "did4",
     subjectCollection: "collection4",
@@ -72,6 +77,7 @@ const reports: Report[] = [
     status: "pending",
   },
   {
+    id: 5,
     subjectUri: "uri5",
     subjectDid: "did5",
     subjectRkey: "rkey5",
diff --git a/packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql b/packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql
new file mode 100644
index 00000000..dba1ce15
--- /dev/null
+++ b/packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql
@@ -0,0 +1,37 @@
+CREATE TABLE `labelled_profiles` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`did` text NOT NULL,
+	`is_hidden` integer DEFAULT false NOT NULL,
+	`labels` text
+);
+--> statement-breakpoint
+CREATE TABLE `moderation_events` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`subject_uri` text NOT NULL,
+	`subject_did` text NOT NULL,
+	`subject_collection` text,
+	`subject_rkey` text,
+	`subject_cid` text,
+	`created_by` text NOT NULL,
+	`created_at` text NOT NULL,
+	`labels_added` text,
+	`labels_removed` text,
+	`report_type` text
+);
+--> statement-breakpoint
+CREATE TABLE `reports` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`actioned_at` text,
+	`actioned_by` text,
+	`subject_uri` text NOT NULL,
+	`subject_did` text NOT NULL,
+	`subject_collection` text,
+	`subject_rkey` text,
+	`subject_cid` text,
+	`created_by` text NOT NULL,
+	`created_at` text NOT NULL,
+	`creator_comment` text,
+	`report_reason` text
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `labelled_profiles_did_unique` ON `labelled_profiles` (`did`);
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/0002_snapshot.json b/packages/frontpage/drizzle/meta/0002_snapshot.json
new file mode 100644
index 00000000..4bd598a0
--- /dev/null
+++ b/packages/frontpage/drizzle/meta/0002_snapshot.json
@@ -0,0 +1,845 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "0374b59d-b2ce-4b76-8dde-835281e84750",
+  "prevId": "dcb0c712-e046-420d-9fc3-bdcc9f58fa45",
+  "tables": {
+    "beta_users": {
+      "name": "beta_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "beta_users_did_unique": {
+          "name": "beta_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "body": {
+          "name": "body",
+          "type": "text(10000)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        },
+        "parent_comment_id": {
+          "name": "parent_comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comments_cid_unique": {
+          "name": "comments_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comments_author_did_rkey_unique": {
+          "name": "comments_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comments_post_id_posts_id_fk": {
+          "name": "comments_post_id_posts_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "parent_comment_id_fkey": {
+          "name": "parent_comment_id_fkey",
+          "tableFrom": "comments",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "parent_comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comment_votes": {
+      "name": "comment_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_votes_cid_unique": {
+          "name": "comment_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_rkey_unique": {
+          "name": "comment_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_comment_id_unique": {
+          "name": "comment_votes_author_did_comment_id_unique",
+          "columns": [
+            "author_did",
+            "comment_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_votes_comment_id_comments_id_fk": {
+          "name": "comment_votes_comment_id_comments_id_fk",
+          "tableFrom": "comment_votes",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "consumed_offsets": {
+      "name": "consumed_offsets",
+      "columns": {
+        "offset": {
+          "name": "offset",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "labelled_profiles": {
+      "name": "labelled_profiles",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_hidden": {
+          "name": "is_hidden",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "labelled_profiles_did_unique": {
+          "name": "labelled_profiles_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "moderation_events": {
+      "name": "moderation_events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labels_added": {
+          "name": "labels_added",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels_removed": {
+          "name": "labels_removed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_type": {
+          "name": "report_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_auth_requests": {
+      "name": "oauth_auth_requests",
+      "columns": {
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "nonce": {
+          "name": "nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pkce_verifier": {
+          "name": "pkce_verifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "oauth_auth_requests_state_unique": {
+          "name": "oauth_auth_requests_state_unique",
+          "columns": [
+            "state"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_sessions": {
+      "name": "oauth_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_nonce": {
+          "name": "dpop_nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "posts": {
+      "name": "posts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text(300)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        }
+      },
+      "indexes": {
+        "posts_cid_unique": {
+          "name": "posts_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "posts_author_did_rkey_unique": {
+          "name": "posts_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "post_votes": {
+      "name": "post_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "post_votes_cid_unique": {
+          "name": "post_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_rkey_unique": {
+          "name": "post_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_post_id_unique": {
+          "name": "post_votes_author_did_post_id_unique",
+          "columns": [
+            "author_did",
+            "post_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "post_votes_post_id_posts_id_fk": {
+          "name": "post_votes_post_id_posts_id_fk",
+          "tableFrom": "post_votes",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "reports": {
+      "name": "reports",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "actioned_at": {
+          "name": "actioned_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "actioned_by": {
+          "name": "actioned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "creator_comment": {
+          "name": "creator_comment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_reason": {
+          "name": "report_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index b1ec7017..b85b060c 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -15,6 +15,13 @@
       "when": 1725476942887,
       "tag": "0001_confused_norrin_radd",
       "breakpoints": true
+    },
+    {
+      "idx": 2,
+      "version": "6",
+      "when": 1727293406638,
+      "tag": "0002_windy_ezekiel_stane",
+      "breakpoints": true
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index 790fde79..8a2bd093 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -155,10 +155,8 @@ export const OauthSession = sqliteTable("oauth_sessions", {
   createdAt: dateIsoText("created_at").notNull(),
 });
 
-const createColumnReportType = (col: string) =>
-  text(col, { enum: ["post", "comment", "user"] });
-
 export const ModerationEvent = sqliteTable("moderation_events", {
+  id: integer("id").primaryKey(),
   subjectUri: text("subject_uri").notNull(),
   subjectDid: text("subject_did").notNull(),
   subjectCollection: text("subject_collection"),
@@ -167,15 +165,19 @@ export const ModerationEvent = sqliteTable("moderation_events", {
   createdBy: text("created_by").notNull(),
   createdAt: dateIsoText("created_at").notNull(),
   labelsAdded: text("labels_added"),
-  reportType: createColumnReportType("report_type"),
+  labelsRemoved: text("labels_removed"),
+  creatorReportReason: text("report_type"),
 });
 
 export const LabelledProfile = sqliteTable("labelled_profiles", {
+  id: integer("id").primaryKey(),
   did: text("did").notNull().unique(),
+  isHidden: integer("is_hidden", { mode: "boolean" }).notNull().default(false),
   labels: text("labels"),
 });
 
 export const Report = sqliteTable("reports", {
+  id: integer("id").primaryKey(),
   actionedAt: dateIsoText("actioned_at"),
   actionedBy: text("actioned_by"),
   subjectUri: text("subject_uri").notNull(),
@@ -186,5 +188,5 @@ export const Report = sqliteTable("reports", {
   createdBy: text("created_by").notNull(),
   createdAt: dateIsoText("created_at").notNull(),
   creatorComment: text("creator_comment"),
-  labelsAdded: text("labels_added"),
+  reportReason: text("report_reason"),
 });

From 3f35e596f1153beebae397a7f804c4130fe30cb1 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Thu, 26 Sep 2024 05:01:11 +0100
Subject: [PATCH 12/43] add status to schema, start chunking out actions, get
 forms and actions in

---
 .../app/(app)/moderation/actions.tsx          |   9 +-
 .../frontpage/app/(app)/moderation/client.tsx | 140 +--
 .../frontpage/app/(app)/moderation/page.tsx   |  49 +-
 .../drizzle/0003_superb_lilandra.sql          |   1 +
 .../frontpage/drizzle/meta/0003_snapshot.json | 853 ++++++++++++++++++
 packages/frontpage/drizzle/meta/_journal.json |   7 +
 packages/frontpage/lib/data/db/report.ts      |  40 +
 packages/frontpage/lib/schema.ts              |   4 +
 8 files changed, 1015 insertions(+), 88 deletions(-)
 create mode 100644 packages/frontpage/drizzle/0003_superb_lilandra.sql
 create mode 100644 packages/frontpage/drizzle/meta/0003_snapshot.json
 create mode 100644 packages/frontpage/lib/data/db/report.ts

diff --git a/packages/frontpage/app/(app)/moderation/actions.tsx b/packages/frontpage/app/(app)/moderation/actions.tsx
index 8912df36..6720af9a 100644
--- a/packages/frontpage/app/(app)/moderation/actions.tsx
+++ b/packages/frontpage/app/(app)/moderation/actions.tsx
@@ -6,14 +6,19 @@ export async function createModerationAction(
   _prevState: unknown,
   formData: FormData,
 ) {
+  const test = !!formData.get("test");
   //create the moderation action and update the report as actioned
-  return { error: "Not implemented" };
+  console.log("Creating moderation action", test);
+  await new Promise((resolve) => setTimeout(resolve, 1000));
+  return { error: "Not implemented", test: test };
 }
 
 export async function rejectReportAction(
   _prevState: unknown,
   formData: FormData,
 ) {
+  const test = !!formData.get("test");
   //reject the report and update the report as actioned
-  return { error: "Not implemented" };
+  console.log("Rejecting report", test);
+  return { error: "Not implemented", test: test };
 }
diff --git a/packages/frontpage/app/(app)/moderation/client.tsx b/packages/frontpage/app/(app)/moderation/client.tsx
index f8bb5f62..bd6d768d 100644
--- a/packages/frontpage/app/(app)/moderation/client.tsx
+++ b/packages/frontpage/app/(app)/moderation/client.tsx
@@ -8,16 +8,18 @@ import {
   CardTitle,
 } from "@/lib/components/ui/card";
 import { Report } from "./page";
-import { useState } from "react";
+import { useActionState, useState } from "react";
+import { createModerationAction } from "./actions";
 
 export default function ModerationPage({
   reports,
   stats,
 }: {
   reports: Report[];
-  stats: { total: number; pending: number; approved: number; rejected: number };
+  stats: { total: number; pending: number; accepted: number; rejected: number };
 }) {
   const [selectedTab, setSelectedTab] = useState("all");
+  const [_, action, isPending] = useActionState(createModerationAction, null);
 
   return (
     <>
@@ -64,17 +66,17 @@ export default function ModerationPage({
               </CardContent>
             </Card>
             <Card
-              className={`bg-gray-700 border-gray-600 ${selectedTab === "approved" ? "ring-2 ring-blue-500" : ""}`}
-              onClick={() => setSelectedTab("approved")}
+              className={`bg-gray-700 border-gray-600 ${selectedTab === "accepted" ? "ring-2 ring-blue-500" : ""}`}
+              onClick={() => setSelectedTab("accepted")}
             >
               <CardHeader className="pb-2">
                 <CardTitle className="text-sm font-medium text-gray-400">
-                  Approved
+                  Accepted
                 </CardTitle>
               </CardHeader>
               <CardContent>
                 <div className="text-2xl font-bold text-green-300">
-                  {stats.approved}
+                  {stats.accepted}
                 </div>
               </CardContent>
             </Card>
@@ -98,61 +100,87 @@ export default function ModerationPage({
       </Card>
       {reports
         .filter(
-          (report) => report.status === selectedTab || selectedTab === "all",
+          (report) => selectedTab === "all" || report.status === selectedTab,
         )
         .map((report) => (
-          <Card
-            key={report.subjectCid}
-            className="bg-gray-700 border-gray-600 mb-4"
-          >
-            <CardHeader className="pb-2">
-              <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-                <span>Reported {report.type}</span>
-                <span
-                  className={`px-2 py-1 rounded-full text-xs ${
-                    report.status === "pending"
-                      ? "bg-yellow-500 text-yellow-900"
-                      : report.status === "approved"
-                        ? "bg-green-500 text-green-900"
-                        : "bg-red-500 text-red-900"
-                  }`}
+          <>
+            <form action={action}>
+              <Card>
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-lg font-medium text-blue-200">
+                    {isPending ?? "Report Actions????"} Report Actions
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                    <div>
+                      <strong>Reported By:</strong> {report.createdBy}
+                    </div>
+                    <div>
+                      <strong>Reported Reason:</strong> {report.creatorComment}
+                    </div>
+                  </div>
+                </CardContent>
+                <button
+                  type="submit"
+                  className="bg-green-500 text-green-900 px-4 py-2 rounded-lg"
                 >
-                  {report.status.charAt(0).toUpperCase() +
-                    report.status.slice(1)}
-                </span>
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <p className="text-gray-100 mb-2">{report.creatorComment}</p>
-              <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                <div>
-                  <strong>DID:</strong> {report.subjectDid}
-                </div>
-                <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
-                  <strong>CID:</strong> {report.subjectCid}
-                </div>
-                <div>
-                  <strong>Record Key:</strong> {report.subjectRkey}
-                </div>
-                <div>
-                  <strong>URI:</strong>
-                  <a
-                    href={report.subjectUri}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                  Approve
+                </button>
+              </Card>
+            </form>
+            <Card
+              key={report.subjectCid}
+              className="bg-gray-700 border-gray-600 mb-4"
+            >
+              <CardHeader className="pb-2">
+                <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+                  <span>Reported Item</span>
+                  <span
+                    className={`px-2 py-1 rounded-full text-xs ${
+                      report.status === "pending"
+                        ? "bg-yellow-500 text-yellow-900"
+                        : report.status === "accepted"
+                          ? "bg-green-500 text-green-900"
+                          : "bg-red-500 text-red-900"
+                    }`}
                   >
-                    {report.subjectUri.substring(0, 30)}...
-                    <ExternalLink className="h-3 w-3 ml-1" />
-                  </a>
+                    {report.status}
+                  </span>
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <p className="text-gray-100 mb-2">{report.creatorComment}</p>
+                <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                  <div>
+                    <strong>DID:</strong> {report.subjectDid}
+                  </div>
+                  <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
+                    <strong>CID:</strong> {report.subjectCid}
+                  </div>
+                  <div>
+                    <strong>Record Key:</strong> {report.subjectRkey}
+                  </div>
+                  <div>
+                    <strong>URI:</strong>
+                    <a
+                      href={report.subjectUri}
+                      target="_blank"
+                      rel="noopener noreferrer"
+                      className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                    >
+                      {report.subjectUri.substring(0, 30)}...
+                      <ExternalLink className="h-3 w-3 ml-1" />
+                    </a>
+                  </div>
                 </div>
-              </div>
-              <div className="flex items-center text-sm text-gray-300 mb-4">
-                <Flag className="mr-2 h-4 w-4 text-red-400" />
-                <span>Reason: {report.creatorComment}</span>
-              </div>
-            </CardContent>
-          </Card>
+                <div className="flex items-center text-sm text-gray-300 mb-4">
+                  <Flag className="mr-2 h-4 w-4 text-red-400" />
+                  <span>Reason: {report.creatorComment}</span>
+                </div>
+              </CardContent>
+            </Card>
+          </>
         ))}
     </>
   );
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 9fd1ff66..bdedd20e 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -6,27 +6,24 @@ import ModerationPage from "./client";
 
 export type Report = {
   id: number;
-  actionedAt?: string; // Optional field
-  actionedBy?: string; // Optional field
+  actionedAt?: Date;
+  actionedBy?: string;
   subjectUri: string;
   subjectDid: string;
-  subjectCollection?: string; // Optional field
-  subjectRkey?: string; // Optional field
-  subjectCid?: string; // Optional field
+  subjectCollection?: string;
+  subjectRkey?: string;
+  subjectCid?: string;
   createdBy: string;
-  createdAt: string;
-  creatorComment?: string; // Optional field
-  labelsAdded?: string; // Optional field
-  //TODO: add a type field to the report schema so you know if it's a post, comment or user report
-  //TODO: add a status field to the report schema so you know if it's pending, approved or rejected
-  type: "post" | "comment" | "user"; // New field to indicate the type of report
-  status: "pending" | "approved" | "rejected"; // New field to indicate the status of the report
+  createdAt: Date;
+  creatorComment?: string;
+  reportReason?: string;
+  status: "pending" | "accepted" | "rejected";
 };
 
 const reports: Report[] = [
   {
     id: 1,
-    actionedAt: "2023-10-01T12:00:00Z",
+    actionedAt: new Date("2023-10-01T12:00:00Z"),
     actionedBy: "moderator1",
     subjectUri: "uri1",
     subjectDid: "did1",
@@ -34,15 +31,13 @@ const reports: Report[] = [
     subjectRkey: "rkey1",
     subjectCid: "cid1",
     createdBy: "user1",
-    createdAt: "2023-09-30T12:00:00Z",
+    createdAt: new Date("2023-09-30T12:00:00Z"),
     creatorComment: "This is a comment by the creator.",
-    labelsAdded: "label1,label2",
-    type: "post",
-    status: "approved",
+    status: "accepted",
   },
   {
     id: 2,
-    actionedAt: "2023-10-02T12:00:00Z",
+    actionedAt: new Date("2023-10-02T12:00:00Z"),
     actionedBy: "moderator2",
     subjectUri: "uri2",
     subjectDid: "did2",
@@ -50,10 +45,8 @@ const reports: Report[] = [
     subjectRkey: "rkey2",
     subjectCid: "cid2",
     createdBy: "user2",
-    createdAt: "2023-09-29T12:00:00Z",
+    createdAt: new Date("2023-09-29T12:00:00Z"),
     creatorComment: "This is another comment by the creator.",
-    labelsAdded: "label3,label4",
-    type: "comment",
     status: "rejected",
   },
   {
@@ -61,8 +54,7 @@ const reports: Report[] = [
     subjectUri: "uri3",
     subjectDid: "did3",
     createdBy: "user3",
-    createdAt: "2023-09-28T12:00:00Z",
-    type: "user",
+    createdAt: new Date("2023-09-28T12:00:00Z"),
     status: "pending",
   },
   {
@@ -71,9 +63,8 @@ const reports: Report[] = [
     subjectDid: "did4",
     subjectCollection: "collection4",
     createdBy: "user4",
-    createdAt: "2023-09-27T12:00:00Z",
+    createdAt: new Date("2023-09-27T12:00:00Z"),
     creatorComment: "Yet another comment by the creator.",
-    type: "post",
     status: "pending",
   },
   {
@@ -82,17 +73,15 @@ const reports: Report[] = [
     subjectDid: "did5",
     subjectRkey: "rkey5",
     createdBy: "user5",
-    createdAt: "2023-09-26T12:00:00Z",
-    labelsAdded: "label5,label6",
-    type: "comment",
-    status: "approved",
+    createdAt: new Date("2023-09-26T12:00:00Z"),
+    status: "pending",
   },
 ];
 
 const stats = {
   total: reports.length,
   pending: reports.filter((r) => r.status === "pending").length,
-  approved: reports.filter((r) => r.status === "approved").length,
+  accepted: reports.filter((r) => r.status === "accepted").length,
   rejected: reports.filter((r) => r.status === "rejected").length,
 };
 
diff --git a/packages/frontpage/drizzle/0003_superb_lilandra.sql b/packages/frontpage/drizzle/0003_superb_lilandra.sql
new file mode 100644
index 00000000..bdb5f03c
--- /dev/null
+++ b/packages/frontpage/drizzle/0003_superb_lilandra.sql
@@ -0,0 +1 @@
+ALTER TABLE `reports` ADD `status` text DEFAULT 'pending';
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/0003_snapshot.json b/packages/frontpage/drizzle/meta/0003_snapshot.json
new file mode 100644
index 00000000..ac4f6373
--- /dev/null
+++ b/packages/frontpage/drizzle/meta/0003_snapshot.json
@@ -0,0 +1,853 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "568f232e-f6bf-4e4d-b3da-c7dc1fae9cc0",
+  "prevId": "0374b59d-b2ce-4b76-8dde-835281e84750",
+  "tables": {
+    "beta_users": {
+      "name": "beta_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "beta_users_did_unique": {
+          "name": "beta_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "body": {
+          "name": "body",
+          "type": "text(10000)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        },
+        "parent_comment_id": {
+          "name": "parent_comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comments_cid_unique": {
+          "name": "comments_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comments_author_did_rkey_unique": {
+          "name": "comments_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comments_post_id_posts_id_fk": {
+          "name": "comments_post_id_posts_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "parent_comment_id_fkey": {
+          "name": "parent_comment_id_fkey",
+          "tableFrom": "comments",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "parent_comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comment_votes": {
+      "name": "comment_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_votes_cid_unique": {
+          "name": "comment_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_rkey_unique": {
+          "name": "comment_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_comment_id_unique": {
+          "name": "comment_votes_author_did_comment_id_unique",
+          "columns": [
+            "author_did",
+            "comment_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_votes_comment_id_comments_id_fk": {
+          "name": "comment_votes_comment_id_comments_id_fk",
+          "tableFrom": "comment_votes",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "consumed_offsets": {
+      "name": "consumed_offsets",
+      "columns": {
+        "offset": {
+          "name": "offset",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "labelled_profiles": {
+      "name": "labelled_profiles",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_hidden": {
+          "name": "is_hidden",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "labelled_profiles_did_unique": {
+          "name": "labelled_profiles_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "moderation_events": {
+      "name": "moderation_events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labels_added": {
+          "name": "labels_added",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels_removed": {
+          "name": "labels_removed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_type": {
+          "name": "report_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_auth_requests": {
+      "name": "oauth_auth_requests",
+      "columns": {
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "nonce": {
+          "name": "nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pkce_verifier": {
+          "name": "pkce_verifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "oauth_auth_requests_state_unique": {
+          "name": "oauth_auth_requests_state_unique",
+          "columns": [
+            "state"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_sessions": {
+      "name": "oauth_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_nonce": {
+          "name": "dpop_nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "posts": {
+      "name": "posts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text(300)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        }
+      },
+      "indexes": {
+        "posts_cid_unique": {
+          "name": "posts_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "posts_author_did_rkey_unique": {
+          "name": "posts_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "post_votes": {
+      "name": "post_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "post_votes_cid_unique": {
+          "name": "post_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_rkey_unique": {
+          "name": "post_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_post_id_unique": {
+          "name": "post_votes_author_did_post_id_unique",
+          "columns": [
+            "author_did",
+            "post_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "post_votes_post_id_posts_id_fk": {
+          "name": "post_votes_post_id_posts_id_fk",
+          "tableFrom": "post_votes",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "reports": {
+      "name": "reports",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "actioned_at": {
+          "name": "actioned_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "actioned_by": {
+          "name": "actioned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "creator_comment": {
+          "name": "creator_comment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_reason": {
+          "name": "report_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'pending'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index b85b060c..b9910832 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -22,6 +22,13 @@
       "when": 1727293406638,
       "tag": "0002_windy_ezekiel_stane",
       "breakpoints": true
+    },
+    {
+      "idx": 3,
+      "version": "6",
+      "when": 1727320432120,
+      "tag": "0003_superb_lilandra",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
new file mode 100644
index 00000000..b22bbcc8
--- /dev/null
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -0,0 +1,40 @@
+import "server-only";
+import { db } from "@/lib/db";
+import * as schema from "@/lib/schema";
+import { cache } from "react";
+import { InferSelectModel } from "drizzle-orm";
+
+export const getReports = cache(async () => {
+  const reports = await db.select().from(schema.Report);
+
+  return reports;
+});
+
+type ReportInfer = InferSelectModel<typeof schema.Report>;
+
+export const createReport = async (report: ReportInfer) => {
+  await db.insert(schema.Report).values(report);
+
+  //   await sendDiscordMessage({
+  //     embeds: [
+  //       {
+  //         title: "New report on Frontpage",
+  //         description:
+  //           report.creatorComment ?? report.reportReason ?? "No reason provided",
+  //         url: report.subjectUri,
+  //         color: 10181046,
+  //         author: {
+  //           name: report.createdBy,
+  //           icon_url: "",
+  //           url: "",
+  //         },
+  //         fields: [
+  //           {
+  //             name: "Link",
+  //             value: "https://frontpage.fyi/moderation",
+  //           },
+  //         ],
+  //       },
+  //     ],
+  //   });
+};
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index 8a2bd093..a27a2681 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -176,6 +176,9 @@ export const LabelledProfile = sqliteTable("labelled_profiles", {
   labels: text("labels"),
 });
 
+const createReportStatusColumn = (col: string) =>
+  text(col, { enum: ["pending", "accepted", "rejected"] }).default("pending");
+
 export const Report = sqliteTable("reports", {
   id: integer("id").primaryKey(),
   actionedAt: dateIsoText("actioned_at"),
@@ -189,4 +192,5 @@ export const Report = sqliteTable("reports", {
   createdAt: dateIsoText("created_at").notNull(),
   creatorComment: text("creator_comment"),
   reportReason: text("report_reason"),
+  status: createReportStatusColumn("status"),
 });

From 020922b73678b67c52ed716279c2143428d05214 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sat, 28 Sep 2024 00:55:24 +0100
Subject: [PATCH 13/43] moderate the things

---
 .../app/(app)/_components/post-card.tsx       |  22 +
 .../app/(app)/_components/report-button.tsx   |  20 +
 .../app/(app)/moderation/_user-handle.tsx     |  13 +
 .../app/(app)/moderation/actions.tsx          |  24 -
 .../frontpage/app/(app)/moderation/client.tsx | 187 ----
 .../frontpage/app/(app)/moderation/page.tsx   | 330 +++++--
 packages/frontpage/app/globals.css            |   6 +
 .../frontpage/drizzle/0004_jittery_random.sql |   7 +
 .../frontpage/drizzle/meta/0004_snapshot.json | 891 ++++++++++++++++++
 packages/frontpage/drizzle/meta/_journal.json |   7 +
 .../frontpage/lib/components/ui/button.tsx    |   2 +
 packages/frontpage/lib/data/db/moderation.ts  |  22 +
 packages/frontpage/lib/data/db/post.ts        |   2 +
 packages/frontpage/lib/data/db/report.ts      |  69 +-
 packages/frontpage/lib/data/user.ts           |  13 +-
 packages/frontpage/lib/schema.ts              |   6 +
 packages/frontpage/tailwind.config.ts         |   4 +
 17 files changed, 1311 insertions(+), 314 deletions(-)
 create mode 100644 packages/frontpage/app/(app)/_components/report-button.tsx
 create mode 100644 packages/frontpage/app/(app)/moderation/_user-handle.tsx
 delete mode 100644 packages/frontpage/app/(app)/moderation/actions.tsx
 delete mode 100644 packages/frontpage/app/(app)/moderation/client.tsx
 create mode 100644 packages/frontpage/drizzle/0004_jittery_random.sql
 create mode 100644 packages/frontpage/drizzle/meta/0004_snapshot.json
 create mode 100644 packages/frontpage/lib/data/db/moderation.ts

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index d55454ef..8ceea066 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -8,6 +8,8 @@ import { PostCollection } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
+import { ReportButton } from "./report-button";
+import { createReport } from "@/lib/data/db/report";
 
 type PostProps = {
   id: number;
@@ -72,6 +74,26 @@ export async function PostCard({
           }
           votes={votes}
         />
+        <ReportButton
+          reportAction={async () => {
+            "use server";
+            const user = await ensureUser();
+
+            await createReport({
+              actionedAt: new Date(),
+              subjectUri: `at://${author}/${PostCollection}/${rkey}`,
+              subjectDid: author,
+              subjectCollection: PostCollection,
+              subjectRkey: rkey,
+              subjectCid: cid,
+              createdBy: user.did,
+              createdAt: new Date(),
+              creatorComment: "This post is spam",
+              reportReason: "spam",
+              status: "pending",
+            });
+          }}
+        />
       </div>
       <div className="w-full">
         <h2 className="mb-1 text-xl">
diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
new file mode 100644
index 00000000..a0723c33
--- /dev/null
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -0,0 +1,20 @@
+import { Button } from "@/lib/components/ui/button";
+import { cn } from "@/lib/utils";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
+
+export type VoteButtonState = "voted" | "unvoted" | "authored";
+
+type VoteButtonProps = {
+  reportAction: () => Promise<void>;
+};
+
+export function ReportButton({ reportAction }: VoteButtonProps) {
+  return (
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <form action={reportAction} className="contents">
+      <Button variant="ghost" size="icon" name="report">
+        <ExclamationTriangleIcon className={cn("w-5 h-5", "text-red-500")} />
+      </Button>
+    </form>
+  );
+}
diff --git a/packages/frontpage/app/(app)/moderation/_user-handle.tsx b/packages/frontpage/app/(app)/moderation/_user-handle.tsx
new file mode 100644
index 00000000..bcd8a3fb
--- /dev/null
+++ b/packages/frontpage/app/(app)/moderation/_user-handle.tsx
@@ -0,0 +1,13 @@
+import { DID } from "@/lib/data/atproto/did";
+import { getVerifiedHandle } from "@/lib/data/atproto/identity";
+import Link from "next/link";
+
+export async function UserHandle({ userDid }: { userDid: DID }) {
+  const handle = (await getVerifiedHandle(userDid)) ?? userDid;
+
+  return (
+    <Link href={`/profile/${handle}`} className="underline">
+      {handle}
+    </Link>
+  );
+}
diff --git a/packages/frontpage/app/(app)/moderation/actions.tsx b/packages/frontpage/app/(app)/moderation/actions.tsx
deleted file mode 100644
index 6720af9a..00000000
--- a/packages/frontpage/app/(app)/moderation/actions.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-"use server";
-
-//TODO: add actions for creating, updating, deleting moderation reports
-
-export async function createModerationAction(
-  _prevState: unknown,
-  formData: FormData,
-) {
-  const test = !!formData.get("test");
-  //create the moderation action and update the report as actioned
-  console.log("Creating moderation action", test);
-  await new Promise((resolve) => setTimeout(resolve, 1000));
-  return { error: "Not implemented", test: test };
-}
-
-export async function rejectReportAction(
-  _prevState: unknown,
-  formData: FormData,
-) {
-  const test = !!formData.get("test");
-  //reject the report and update the report as actioned
-  console.log("Rejecting report", test);
-  return { error: "Not implemented", test: test };
-}
diff --git a/packages/frontpage/app/(app)/moderation/client.tsx b/packages/frontpage/app/(app)/moderation/client.tsx
deleted file mode 100644
index bd6d768d..00000000
--- a/packages/frontpage/app/(app)/moderation/client.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-"use client";
-import { ExternalLink, Flag, Shield } from "lucide-react";
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from "@/lib/components/ui/card";
-import { Report } from "./page";
-import { useActionState, useState } from "react";
-import { createModerationAction } from "./actions";
-
-export default function ModerationPage({
-  reports,
-  stats,
-}: {
-  reports: Report[];
-  stats: { total: number; pending: number; accepted: number; rejected: number };
-}) {
-  const [selectedTab, setSelectedTab] = useState("all");
-  const [_, action, isPending] = useActionState(createModerationAction, null);
-
-  return (
-    <>
-      <Card className="bg-gray-800 border-gray-700 mb-6">
-        <CardHeader>
-          <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
-            <Shield className="h-6 w-6" />
-            Moderation Dashboard
-          </CardTitle>
-          <CardDescription className="text-gray-300">
-            Review and take action on reported content
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-            <Card
-              className={`bg-gray-700 border-gray-600 ${selectedTab === "all" ? "ring-2 ring-blue-500" : ""}`}
-              onClick={() => setSelectedTab("all")}
-            >
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Total Reports
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-blue-300">
-                  {stats.total}
-                </div>
-              </CardContent>
-            </Card>
-            <Card
-              className={`bg-gray-700 border-gray-600 ${selectedTab === "pending" ? "ring-2 ring-blue-500" : ""}`}
-              onClick={() => setSelectedTab("pending")}
-            >
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Pending
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-yellow-300">
-                  {stats.pending}
-                </div>
-              </CardContent>
-            </Card>
-            <Card
-              className={`bg-gray-700 border-gray-600 ${selectedTab === "accepted" ? "ring-2 ring-blue-500" : ""}`}
-              onClick={() => setSelectedTab("accepted")}
-            >
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Accepted
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-green-300">
-                  {stats.accepted}
-                </div>
-              </CardContent>
-            </Card>
-            <Card
-              className={`bg-gray-700 border-gray-600 ${selectedTab === "rejected" ? "ring-2 ring-blue-500" : ""}`}
-              onClick={() => setSelectedTab("rejected")}
-            >
-              <CardHeader className="pb-2">
-                <CardTitle className="text-sm font-medium text-gray-400">
-                  Rejected
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <div className="text-2xl font-bold text-red-300">
-                  {stats.rejected}
-                </div>
-              </CardContent>
-            </Card>
-          </div>
-        </CardContent>
-      </Card>
-      {reports
-        .filter(
-          (report) => selectedTab === "all" || report.status === selectedTab,
-        )
-        .map((report) => (
-          <>
-            <form action={action}>
-              <Card>
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-lg font-medium text-blue-200">
-                    {isPending ?? "Report Actions????"} Report Actions
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                    <div>
-                      <strong>Reported By:</strong> {report.createdBy}
-                    </div>
-                    <div>
-                      <strong>Reported Reason:</strong> {report.creatorComment}
-                    </div>
-                  </div>
-                </CardContent>
-                <button
-                  type="submit"
-                  className="bg-green-500 text-green-900 px-4 py-2 rounded-lg"
-                >
-                  Approve
-                </button>
-              </Card>
-            </form>
-            <Card
-              key={report.subjectCid}
-              className="bg-gray-700 border-gray-600 mb-4"
-            >
-              <CardHeader className="pb-2">
-                <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-                  <span>Reported Item</span>
-                  <span
-                    className={`px-2 py-1 rounded-full text-xs ${
-                      report.status === "pending"
-                        ? "bg-yellow-500 text-yellow-900"
-                        : report.status === "accepted"
-                          ? "bg-green-500 text-green-900"
-                          : "bg-red-500 text-red-900"
-                    }`}
-                  >
-                    {report.status}
-                  </span>
-                </CardTitle>
-              </CardHeader>
-              <CardContent>
-                <p className="text-gray-100 mb-2">{report.creatorComment}</p>
-                <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                  <div>
-                    <strong>DID:</strong> {report.subjectDid}
-                  </div>
-                  <div className="hover:text-blue-200 ml-1 items-center overflow-hidden">
-                    <strong>CID:</strong> {report.subjectCid}
-                  </div>
-                  <div>
-                    <strong>Record Key:</strong> {report.subjectRkey}
-                  </div>
-                  <div>
-                    <strong>URI:</strong>
-                    <a
-                      href={report.subjectUri}
-                      target="_blank"
-                      rel="noopener noreferrer"
-                      className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
-                    >
-                      {report.subjectUri.substring(0, 30)}...
-                      <ExternalLink className="h-3 w-3 ml-1" />
-                    </a>
-                  </div>
-                </div>
-                <div className="flex items-center text-sm text-gray-300 mb-4">
-                  <Flag className="mr-2 h-4 w-4 text-red-400" />
-                  <span>Reason: {report.creatorComment}</span>
-                </div>
-              </CardContent>
-            </Card>
-          </>
-        ))}
-    </>
-  );
-}
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index bdedd20e..65286b88 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -1,99 +1,249 @@
-"use server";
-
-import { hasRole } from "@/lib/data/user";
+import { ExternalLink, Flag, Shield } from "lucide-react";
+import {
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from "@/lib/components/ui/card";
+import { Button } from "@/lib/components/ui/button";
+import { ensureUser, isAdmin as isAdmin } from "@/lib/data/user";
 import { redirect } from "next/navigation";
-import ModerationPage from "./client";
+import {
+  getModeratorReportStats,
+  getReport,
+  getReports,
+  updateReport,
+} from "@/lib/data/db/report";
+import {
+  ModerationEventDTO,
+  createModerationEvent,
+} from "@/lib/data/db/moderation";
+import { PostCollection } from "@/lib/data/atproto/post";
+import { CommentCollection } from "@/lib/data/atproto/comment";
+import { revalidatePath } from "next/cache";
+import Link from "next/link";
+import { getVerifiedHandle } from "@/lib/data/atproto/identity";
+import { UserHandle } from "./_user-handle";
+import { DID } from "@/lib/data/atproto/did";
+
+export async function performModerationAction(
+  input: { reportId: number; status: "accepted" | "rejected" },
+  _: FormData,
+) {
+  "use server";
+  console.log("creating moderation action");
+  console.log("input", input);
+  const user = await ensureUser();
+  const report = await getReport(input.reportId);
+
+  if (!report) {
+    throw new Error("Report not found");
+  }
+
+  const newModEvent: ModerationEventDTO = {
+    subjectUri: report.subjectUri,
+    subjectDid: report.subjectDid,
+    createdBy: user.did,
+    createdAt: new Date(),
+    labelsAdded: report.reportReason,
+    creatorReportReason: report.creatorComment,
+  };
+
+  if (report.subjectCollection) {
+    if (report.subjectCollection === PostCollection) {
+      newModEvent.subjectCollection = PostCollection;
+    } else if (report.subjectCollection === CommentCollection) {
+      newModEvent.subjectCollection = CommentCollection;
+    }
+
+    newModEvent.subjectRkey = report.subjectRkey;
+    newModEvent.subjectCid = report.subjectCid;
+  }
+
+  await Promise.all([
+    createModerationEvent(newModEvent),
+    updateReport(report.id, input.status, user.did),
+  ]);
+
+  revalidatePath("/moderation");
+  return;
+}
 
-export type Report = {
-  id: number;
-  actionedAt?: Date;
-  actionedBy?: string;
-  subjectUri: string;
-  subjectDid: string;
-  subjectCollection?: string;
-  subjectRkey?: string;
-  subjectCid?: string;
-  createdBy: string;
-  createdAt: Date;
-  creatorComment?: string;
-  reportReason?: string;
-  status: "pending" | "accepted" | "rejected";
-};
+export default async function Moderation({
+  searchParams,
+}: {
+  searchParams: { status: string };
+}) {
+  const status =
+    (searchParams.status as "pending" | "accepted" | "rejected") ?? null;
 
-const reports: Report[] = [
-  {
-    id: 1,
-    actionedAt: new Date("2023-10-01T12:00:00Z"),
-    actionedBy: "moderator1",
-    subjectUri: "uri1",
-    subjectDid: "did1",
-    subjectCollection: "collection1",
-    subjectRkey: "rkey1",
-    subjectCid: "cid1",
-    createdBy: "user1",
-    createdAt: new Date("2023-09-30T12:00:00Z"),
-    creatorComment: "This is a comment by the creator.",
-    status: "accepted",
-  },
-  {
-    id: 2,
-    actionedAt: new Date("2023-10-02T12:00:00Z"),
-    actionedBy: "moderator2",
-    subjectUri: "uri2",
-    subjectDid: "did2",
-    subjectCollection: "collection2",
-    subjectRkey: "rkey2",
-    subjectCid: "cid2",
-    createdBy: "user2",
-    createdAt: new Date("2023-09-29T12:00:00Z"),
-    creatorComment: "This is another comment by the creator.",
-    status: "rejected",
-  },
-  {
-    id: 3,
-    subjectUri: "uri3",
-    subjectDid: "did3",
-    createdBy: "user3",
-    createdAt: new Date("2023-09-28T12:00:00Z"),
-    status: "pending",
-  },
-  {
-    id: 4,
-    subjectUri: "uri4",
-    subjectDid: "did4",
-    subjectCollection: "collection4",
-    createdBy: "user4",
-    createdAt: new Date("2023-09-27T12:00:00Z"),
-    creatorComment: "Yet another comment by the creator.",
-    status: "pending",
-  },
-  {
-    id: 5,
-    subjectUri: "uri5",
-    subjectDid: "did5",
-    subjectRkey: "rkey5",
-    createdBy: "user5",
-    createdAt: new Date("2023-09-26T12:00:00Z"),
-    status: "pending",
-  },
-];
+  const reports = await getReports(status).then((reports) =>
+    reports.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime()),
+  );
 
-const stats = {
-  total: reports.length,
-  pending: reports.filter((r) => r.status === "pending").length,
-  accepted: reports.filter((r) => r.status === "accepted").length,
-  rejected: reports.filter((r) => r.status === "rejected").length,
-};
+  const stats = await getModeratorReportStats();
+  // const stats = {
+  //   total: reports.length,
+  //   pending: reports.filter((r) => r.status === "pending").length,
+  //   accepted: reports.filter((r) => r.status === "accepted").length,
+  //   rejected: reports.filter((r) => r.status === "rejected").length,
+  // };
 
-export default async function Moderation() {
-  //TODO: get moderation reports, get moderator's stats etc.
-  if (await hasRole("moderator")) {
-    // const [reports, stats] = await Promise.all([
-    //     await getReports(),
-    //     await getStats(did),
-    // ]);
+  if (await isAdmin()) {
+    return (
+      <>
+        <Card className="bg-gray-800 border-gray-700 mb-6">
+          <CardHeader>
+            <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
+              <Shield className="h-6 w-6" />
+              Moderation Dashboard
+            </CardTitle>
+            <CardDescription className="text-gray-300">
+              Review and take action on reported content
+            </CardDescription>
+          </CardHeader>
+          <CardContent>
+            <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
+              <Link href="/moderation">
+                <Card className="bg-gray-700 border-gray-600">
+                  <CardHeader className="pb-2">
+                    <CardTitle className="text-sm font-medium text-gray-400">
+                      Total Reports
+                    </CardTitle>
+                  </CardHeader>
+                  <CardContent>
+                    <div className="text-2xl font-bold text-blue-300">
+                      {stats.total}
+                    </div>
+                  </CardContent>
+                </Card>
+              </Link>
+              <Link href="/moderation?status=pending">
+                <Card className="bg-gray-700 border-gray-600">
+                  <CardHeader className="pb-2">
+                    <CardTitle className="text-sm font-medium text-gray-400">
+                      Pending
+                    </CardTitle>
+                  </CardHeader>
+                  <CardContent>
+                    <div className="text-2xl font-bold text-yellow-300">
+                      {stats.pending}
+                    </div>
+                  </CardContent>
+                </Card>
+              </Link>
+              <Link href="/moderation?status=accepted">
+                <Card className="bg-gray-700 border-gray-600">
+                  <CardHeader className="pb-2">
+                    <CardTitle className="text-sm font-medium text-gray-400">
+                      Accepted
+                    </CardTitle>
+                  </CardHeader>
+                  <CardContent>
+                    <div className="text-2xl font-bold text-green-300">
+                      {stats.accepted}
+                    </div>
+                  </CardContent>
+                </Card>
+              </Link>
 
-    return <ModerationPage reports={reports} stats={stats} />;
+              <Link href="/moderation?status=rejected">
+                <Card className={`bg-gray-700 border-gray-600 `}>
+                  <CardHeader className="pb-2">
+                    <CardTitle className="text-sm font-medium text-gray-400">
+                      Rejected
+                    </CardTitle>
+                  </CardHeader>
+                  <CardContent>
+                    <div className="text-2xl font-bold text-red-300">
+                      {stats.rejected}
+                    </div>
+                  </CardContent>
+                </Card>
+              </Link>
+            </div>
+          </CardContent>
+        </Card>
+        {reports.map((report) => (
+          <Card
+            key={report.subjectCid}
+            className="bg-gray-700 border-gray-600 mb-4"
+          >
+            <CardHeader className="pb-2">
+              <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+                <span>Reported Item</span>
+                <span
+                  className={`px-2 py-1 rounded-full text-xs ${
+                    report.status === "pending"
+                      ? "bg-yellow-500 text-yellow-900"
+                      : report.status === "accepted"
+                        ? "bg-green-500 text-green-900"
+                        : "bg-red-500 text-red-900"
+                  }`}
+                >
+                  {report.status}
+                </span>
+              </CardTitle>
+            </CardHeader>
+            <CardContent>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                <div>
+                  <strong>URI:</strong>
+                  <a
+                    href={report.subjectUri}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+                  >
+                    {report.subjectUri.substring(0, 30)}...
+                    <ExternalLink className="h-3 w-3 ml-1" />
+                  </a>
+                </div>
+              </div>
+              <div className="flex items-center text-sm text-gray-300 mb-4">
+                <Flag className="mr-2 h-4 w-4 text-red-400" />
+                <span>Reason: {report.creatorComment}</span>
+              </div>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+                <div>
+                  <strong>Reported By: </strong>
+                  <UserHandle userDid={report.createdBy as DID} />
+                </div>
+                <div>
+                  <strong>Reported Reason: </strong> {report.creatorComment}
+                </div>
+              </div>
+              <form>
+                <Button
+                  variant="success"
+                  type="submit"
+                  className="mr-2"
+                  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                  formAction={performModerationAction.bind(null, {
+                    reportId: report.id,
+                    status: "accepted",
+                  })}
+                >
+                  Approve
+                </Button>
+                <Button
+                  variant="destructive"
+                  type="submit"
+                  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+                  formAction={performModerationAction.bind(null, {
+                    reportId: report.id,
+                    status: "rejected",
+                  })}
+                >
+                  Reject
+                </Button>
+              </form>
+            </CardContent>
+          </Card>
+        ))}
+      </>
+    );
   } else {
     redirect("/");
   }
diff --git a/packages/frontpage/app/globals.css b/packages/frontpage/app/globals.css
index a56bc16d..9abc86b3 100644
--- a/packages/frontpage/app/globals.css
+++ b/packages/frontpage/app/globals.css
@@ -28,6 +28,9 @@
     --destructive: 0 84.2% 60.2%;
     --destructive-foreground: 210 40% 98%;
 
+    --success: 142 71% 45%;
+    --success-foreground: 210 40% 98%;
+
     --border: 214.3 31.8% 91.4%;
     --input: 214.3 31.8% 91.4%;
     --ring: 222.2 84% 4.9%;
@@ -79,6 +82,9 @@
   --destructive: 0 62.8% 30.6%;
   --destructive-foreground: 210 40% 98%;
 
+  --success: 142 40% 25%;
+  --success-foreground: 210 40% 98%;
+
   --border: 217.2 32.6% 17.5%;
   --input: 217.2 32.6% 17.5%;
   --ring: 215.4 16.3% 46.9%;
diff --git a/packages/frontpage/drizzle/0004_jittery_random.sql b/packages/frontpage/drizzle/0004_jittery_random.sql
new file mode 100644
index 00000000..8b3edc88
--- /dev/null
+++ b/packages/frontpage/drizzle/0004_jittery_random.sql
@@ -0,0 +1,7 @@
+CREATE TABLE `admin_users` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`created_at` text NOT NULL,
+	`did` text NOT NULL
+);
+--> statement-breakpoint
+CREATE UNIQUE INDEX `admin_users_did_unique` ON `admin_users` (`did`);
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/0004_snapshot.json b/packages/frontpage/drizzle/meta/0004_snapshot.json
new file mode 100644
index 00000000..a726bee7
--- /dev/null
+++ b/packages/frontpage/drizzle/meta/0004_snapshot.json
@@ -0,0 +1,891 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "4b487ed2-7950-4a44-b051-057460b6f589",
+  "prevId": "568f232e-f6bf-4e4d-b3da-c7dc1fae9cc0",
+  "tables": {
+    "admin_users": {
+      "name": "admin_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "admin_users_did_unique": {
+          "name": "admin_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "beta_users": {
+      "name": "beta_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "beta_users_did_unique": {
+          "name": "beta_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "body": {
+          "name": "body",
+          "type": "text(10000)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        },
+        "parent_comment_id": {
+          "name": "parent_comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comments_cid_unique": {
+          "name": "comments_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comments_author_did_rkey_unique": {
+          "name": "comments_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comments_post_id_posts_id_fk": {
+          "name": "comments_post_id_posts_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "parent_comment_id_fkey": {
+          "name": "parent_comment_id_fkey",
+          "tableFrom": "comments",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "parent_comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comment_votes": {
+      "name": "comment_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_votes_cid_unique": {
+          "name": "comment_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_rkey_unique": {
+          "name": "comment_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_comment_id_unique": {
+          "name": "comment_votes_author_did_comment_id_unique",
+          "columns": [
+            "author_did",
+            "comment_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_votes_comment_id_comments_id_fk": {
+          "name": "comment_votes_comment_id_comments_id_fk",
+          "tableFrom": "comment_votes",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "consumed_offsets": {
+      "name": "consumed_offsets",
+      "columns": {
+        "offset": {
+          "name": "offset",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "labelled_profiles": {
+      "name": "labelled_profiles",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_hidden": {
+          "name": "is_hidden",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "labelled_profiles_did_unique": {
+          "name": "labelled_profiles_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "moderation_events": {
+      "name": "moderation_events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labels_added": {
+          "name": "labels_added",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels_removed": {
+          "name": "labels_removed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_type": {
+          "name": "report_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_auth_requests": {
+      "name": "oauth_auth_requests",
+      "columns": {
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "nonce": {
+          "name": "nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pkce_verifier": {
+          "name": "pkce_verifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "oauth_auth_requests_state_unique": {
+          "name": "oauth_auth_requests_state_unique",
+          "columns": [
+            "state"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_sessions": {
+      "name": "oauth_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_nonce": {
+          "name": "dpop_nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "posts": {
+      "name": "posts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text(300)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        }
+      },
+      "indexes": {
+        "posts_cid_unique": {
+          "name": "posts_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "posts_author_did_rkey_unique": {
+          "name": "posts_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "post_votes": {
+      "name": "post_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "post_votes_cid_unique": {
+          "name": "post_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_rkey_unique": {
+          "name": "post_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_post_id_unique": {
+          "name": "post_votes_author_did_post_id_unique",
+          "columns": [
+            "author_did",
+            "post_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "post_votes_post_id_posts_id_fk": {
+          "name": "post_votes_post_id_posts_id_fk",
+          "tableFrom": "post_votes",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "reports": {
+      "name": "reports",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "actioned_at": {
+          "name": "actioned_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "actioned_by": {
+          "name": "actioned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "creator_comment": {
+          "name": "creator_comment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_reason": {
+          "name": "report_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'pending'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index b9910832..755e7859 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -29,6 +29,13 @@
       "when": 1727320432120,
       "tag": "0003_superb_lilandra",
       "breakpoints": true
+    },
+    {
+      "idx": 4,
+      "version": "6",
+      "when": 1727472551203,
+      "tag": "0004_jittery_random",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/frontpage/lib/components/ui/button.tsx b/packages/frontpage/lib/components/ui/button.tsx
index 041e7fd3..280d2f57 100644
--- a/packages/frontpage/lib/components/ui/button.tsx
+++ b/packages/frontpage/lib/components/ui/button.tsx
@@ -11,6 +11,8 @@ const buttonVariants = cva(
       variant: {
         default:
           "bg-primary text-primary-foreground shadow hover:bg-primary/90 dark:bg-slate-200 dark:hover:bg-slate-100",
+        success:
+          "bg-success text-success-foreground shadow-sm hover:bg-success/90",
         destructive:
           "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
         outline:
diff --git a/packages/frontpage/lib/data/db/moderation.ts b/packages/frontpage/lib/data/db/moderation.ts
new file mode 100644
index 00000000..3695478f
--- /dev/null
+++ b/packages/frontpage/lib/data/db/moderation.ts
@@ -0,0 +1,22 @@
+import { db } from "@/lib/db";
+import "server-only";
+import * as schema from "@/lib/schema";
+
+export type ModerationEventDTO = {
+  subjectUri: string;
+  subjectDid: string;
+  subjectCollection?: string | null;
+  subjectRkey?: string | null;
+  subjectCid?: string | null;
+  createdBy: string;
+  createdAt: Date;
+  labelsAdded?: string | null;
+  labelsRemoved?: string | null;
+  creatorReportReason?: string | null;
+};
+
+export async function createModerationEvent(
+  moderationEvent: ModerationEventDTO,
+) {
+  await db.insert(schema.ModerationEvent).values(moderationEvent);
+}
diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index ae62e095..531ab572 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -249,3 +249,5 @@ export async function unauthed_deletePost({ rkey, offset }: DeletePostInput) {
   });
   console.log("Done deleting post transaction");
 }
+
+export async function moderatePost(cid: string) {}
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index b22bbcc8..ab8b0db0 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -2,17 +2,74 @@ import "server-only";
 import { db } from "@/lib/db";
 import * as schema from "@/lib/schema";
 import { cache } from "react";
-import { InferSelectModel } from "drizzle-orm";
+import { InferSelectModel, eq } from "drizzle-orm";
 
-export const getReports = cache(async () => {
+export type ReportDTO = {
+  actionedAt?: Date | null;
+  actionedBy?: string | null;
+  subjectUri: string;
+  subjectDid: string;
+  subjectCollection?: string | null;
+  subjectRkey?: string | null;
+  subjectCid?: string | null;
+  createdBy: string;
+  createdAt: Date;
+  creatorComment?: string | null;
+  reportReason?: string | null;
+  status?: "pending" | "accepted" | "rejected" | null;
+};
+
+export type Report = InferSelectModel<typeof schema.Report>;
+
+export const getReport = cache(
+  async (reportId: number): Promise<Report | null> => {
+    const [report] = await db
+      .select()
+      .from(schema.Report)
+      .where(eq(schema.Report.id, reportId));
+
+    return report ?? null;
+  },
+);
+
+export const getModeratorReportStats = async () => {
   const reports = await db.select().from(schema.Report);
 
-  return reports;
-});
+  return {
+    total: reports.length,
+    pending: reports.filter((r) => r.status === "pending").length,
+    accepted: reports.filter((r) => r.status === "accepted").length,
+    rejected: reports.filter((r) => r.status === "rejected").length,
+  };
+};
+
+export const getReports = async (
+  status: "pending" | "accepted" | "rejected" | null,
+): Promise<Report[]> => {
+  if (status) {
+    return await db
+      .select()
+      .from(schema.Report)
+      .where(eq(schema.Report.status, status));
+  } else {
+    return await db.select().from(schema.Report);
+  }
+};
 
-type ReportInfer = InferSelectModel<typeof schema.Report>;
+export const updateReport = async (
+  reportId: number,
+  status: "pending" | "accepted" | "rejected",
+  actionedBy?: string,
+) => {
+  await db
+    .update(schema.Report)
+    .set({ status, actionedBy, actionedAt: new Date() })
+    .where(eq(schema.Report.id, reportId));
+
+  return;
+};
 
-export const createReport = async (report: ReportInfer) => {
+export const createReport = async (report: ReportDTO) => {
   await db.insert(schema.Report).values(report);
 
   //   await sendDiscordMessage({
diff --git a/packages/frontpage/lib/data/user.ts b/packages/frontpage/lib/data/user.ts
index d6664d77..f58b3233 100644
--- a/packages/frontpage/lib/data/user.ts
+++ b/packages/frontpage/lib/data/user.ts
@@ -64,18 +64,17 @@ export const isBetaUser = cache(async () => {
   );
 });
 
-export const hasRole = cache(async (role: string) => {
+export const isAdmin = cache(async () => {
   const user = await getUser();
   if (!user) {
     return false;
   }
 
-  return Boolean(
-    role === "moderator",
-    // await db.query.User.findFirst({
-    // where: and(eq(schema.User.did, user.did), eq(schema.User.role, role)),
-    // }),
-  );
+  const isAdmin = await db.query.AdminUser.findFirst({
+    where: and(eq(schema.AdminUser.did, user.did)),
+  });
+
+  return isAdmin;
 });
 
 const ProfileResponse = z.object({
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index a27a2681..f6c810d4 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -124,6 +124,12 @@ export const BetaUser = sqliteTable("beta_users", {
   did: did("did").notNull().unique(),
 });
 
+export const AdminUser = sqliteTable("admin_users", {
+  id: integer("id").primaryKey(),
+  createdAt: dateIsoText("created_at").notNull(),
+  did: did("did").notNull().unique(),
+});
+
 export const ConsumedOffset = sqliteTable("consumed_offsets", {
   offset: integer("offset").primaryKey(),
 });
diff --git a/packages/frontpage/tailwind.config.ts b/packages/frontpage/tailwind.config.ts
index 3c38bb32..f1d39754 100644
--- a/packages/frontpage/tailwind.config.ts
+++ b/packages/frontpage/tailwind.config.ts
@@ -37,6 +37,10 @@ const config = {
           DEFAULT: "hsl(var(--destructive))",
           foreground: "hsl(var(--destructive-foreground))",
         },
+        success: {
+          DEFAULT: "hsl(var(--success))",
+          foreground: "hsl(var(--success-foreground))",
+        },
         muted: {
           DEFAULT: "hsl(var(--muted))",
           foreground: "hsl(var(--muted-foreground))",

From 281276d7a13b2d045875c1ecf6c54611bda57d09 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sat, 28 Sep 2024 01:01:31 +0100
Subject: [PATCH 14/43] update packages

---
 packages/frontpage/package.json |   1 +
 pnpm-lock.yaml                  | 614 ++++++++++++++++----------------
 2 files changed, 308 insertions(+), 307 deletions(-)

diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index f6e74854..26136050 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -37,6 +37,7 @@
     "date-fns": "^3.6.0",
     "drizzle-orm": "^0.33.0",
     "jose": "^5.4.0",
+    "lucide-react": "^0.441.0",
     "next": "15.0.0-canary.168",
     "next-themes": "^0.3.0",
     "oauth4webapi": "^2.12.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aa5f7fa3..2dfaec7f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -67,10 +67,10 @@ importers:
         specifier: ^20
         version: 20.13.0
       '@types/react':
-        specifier: ^18
-        version: 18.3.3
+        specifier: ^18.3.10
+        version: 18.3.10
       '@types/react-dom':
-        specifier: ^18
+        specifier: ^18.3.0
         version: 18.3.0
       eslint:
         specifier: ^8
@@ -125,46 +125,46 @@ importers:
         version: 14.2.4
       '@radix-ui/react-alert-dialog':
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-avatar':
         specifier: ^1.1.0
-        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-dropdown-menu':
         specifier: ^2.1.1
-        version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-hover-card':
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-icons':
         specifier: ^1.3.0
         version: 1.3.0(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-label':
         specifier: ^2.1.0
-        version: 2.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 2.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-popover':
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-scroll-area':
         specifier: ^1.1.0
-        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-slot':
         specifier: ^1.1.0
-        version: 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-tabs':
         specifier: ^1.1.0
-        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-toast':
         specifier: ^1.2.1
-        version: 1.2.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.2.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-tooltip':
         specifier: ^1.1.1
-        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@vercel/analytics':
         specifier: ^1.3.1
-        version: 1.3.1(next@15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.3.1(next@15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@vercel/speed-insights':
         specifier: ^1.0.12
-        version: 1.0.12(next@15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 1.0.12(next@15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       class-variance-authority:
         specifier: ^0.7.0
         version: 0.7.0
@@ -176,7 +176,7 @@ importers:
         version: 3.6.0
       drizzle-orm:
         specifier: ^0.33.0
-        version: 0.33.0(@libsql/client@0.9.0(bufferutil@4.0.8)(utf-8-validate@6.0.3))(@neondatabase/serverless@0.7.2)(@types/better-sqlite3@7.6.10)(@types/pg@8.6.6)(@types/react@18.3.3)(@vercel/postgres@0.8.0)(better-sqlite3@11.0.0)(kysely@0.22.0)(react@19.0.0-rc-f994737d14-20240522)
+        version: 0.33.0(@libsql/client@0.9.0(bufferutil@4.0.8)(utf-8-validate@6.0.3))(@neondatabase/serverless@0.7.2)(@types/better-sqlite3@7.6.10)(@types/pg@8.6.6)(@types/react@18.3.10)(@vercel/postgres@0.8.0)(better-sqlite3@11.0.0)(kysely@0.22.0)(react@19.0.0-rc-f994737d14-20240522)
       jose:
         specifier: ^5.4.0
         version: 5.4.0
@@ -184,8 +184,8 @@ importers:
         specifier: ^0.441.0
         version: 0.441.0(react@19.0.0-rc-f994737d14-20240522)
       next:
-        specifier: 15.0.0-canary.167
-        version: 15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        specifier: 15.0.0-canary.168
+        version: 15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       next-themes:
         specifier: ^0.3.0
         version: 0.3.0(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
@@ -222,15 +222,15 @@ importers:
         version: link:../typescript-config
       '@testing-library/react':
         specifier: ^16.0.0
-        version: 16.0.0(@testing-library/dom@10.4.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+        version: 16.0.0(@testing-library/dom@10.4.0)(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@types/node':
         specifier: ^20
         version: 20.13.0
       '@types/react':
-        specifier: ^18
-        version: 18.3.3
+        specifier: ^18.3.10
+        version: 18.3.10
       '@types/react-dom':
-        specifier: ^18
+        specifier: ^18.3.0
         version: 18.3.0
       '@vitejs/plugin-react':
         specifier: ^4.3.1
@@ -284,7 +284,7 @@ importers:
     dependencies:
       '@markdoc/markdoc':
         specifier: ^0.4.0
-        version: 0.4.0(@types/react@18.3.3)(react@19.0.0-rc-3563387fe3-20240621)
+        version: 0.4.0(@types/react@18.3.10)(react@19.0.0-rc-3563387fe3-20240621)
       clsx:
         specifier: ^2.1.1
         version: 2.1.1
@@ -323,8 +323,8 @@ importers:
         specifier: ^20
         version: 20.13.0
       '@types/react':
-        specifier: ^18.3.3
-        version: 18.3.3
+        specifier: ^18.3.10
+        version: 18.3.10
       '@types/react-dom':
         specifier: ^18.3.0
         version: 18.3.0
@@ -1613,8 +1613,8 @@ packages:
   '@next/env@14.2.4':
     resolution: {integrity: sha512-3EtkY5VDkuV2+lNmKlbkibIJxcO4oIHEhBWne6PaAp+76J9KoSsGvNikp6ivzAT8dhhBMYrm6op2pS1ApG0Hzg==}
 
-  '@next/env@15.0.0-canary.167':
-    resolution: {integrity: sha512-0navqyyiycRAb3l6BmvXpb5AsTCp9mFwGoQhCaCK5RM/eUJKY0loApQKlh2iOfhUXJOZgbBQj0N4UaHo5+jbHA==}
+  '@next/env@15.0.0-canary.168':
+    resolution: {integrity: sha512-I9i6y7OxNO9FXbLZi0aOPpf9czuhgbSqvANIIMkZtzc/oidfvaR5ZovZQP4AtL6VBpHXa5AVzcBODyDpbx4MVw==}
 
   '@next/env@15.0.0-rc.0':
     resolution: {integrity: sha512-6W0ndQvHR9sXcqcKeR/inD2UTRCs9+VkSK3lfaGmEuZs7EjwwXMO2BPYjz9oBrtfPL3xuTjtXsHKSsalYQ5l1Q==}
@@ -1625,8 +1625,8 @@ packages:
   '@next/eslint-plugin-next@15.0.0-rc.0':
     resolution: {integrity: sha512-/rQXrN47qxlFHtZg77LdcCYbL54ogQuLeqIGV/6HMGnZH8iL81XEFOITO8GZjOukR5i3BbwyfrsmIqFl/scg+w==}
 
-  '@next/swc-darwin-arm64@15.0.0-canary.167':
-    resolution: {integrity: sha512-LTEM9VY036HWlNVaq6VMAwkkPvd62g6bXuxX9PjiVvzdCBba+WVjP6XL7kXOLnKV6auXY7+lBAzNgV2gi+IeYA==}
+  '@next/swc-darwin-arm64@15.0.0-canary.168':
+    resolution: {integrity: sha512-7nT2Xs5LymGANojseGti6l9n0ZRMCijzRkZcJeKEVoQ//JJZ/wcP4JrLiwqVzPVXW6MuoXPbSEbt5TNRE9BcoA==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [darwin]
@@ -1637,8 +1637,8 @@ packages:
     cpu: [arm64]
     os: [darwin]
 
-  '@next/swc-darwin-x64@15.0.0-canary.167':
-    resolution: {integrity: sha512-VuePFs/JJtO+mlBiWRBL62piZ13uEtEhjyhk2scMy0g/d7AnxXbbk9XtX9hLPlcr3IJM+UZE2bS/69PS9s3qjQ==}
+  '@next/swc-darwin-x64@15.0.0-canary.168':
+    resolution: {integrity: sha512-PE3l7TqBYSIbYs8JXYABip4ZRKYmWfJo8cySThqKPM3WkJTtTEb6t+IaPGCHK0Iu0f8zAs0UaMaNNf+qMvYBgA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [darwin]
@@ -1649,8 +1649,8 @@ packages:
     cpu: [x64]
     os: [darwin]
 
-  '@next/swc-linux-arm64-gnu@15.0.0-canary.167':
-    resolution: {integrity: sha512-+iHcycCrdQCNkFVPiSGwdgpr/fx4bwGCSG1HuMphsTtCcxKUyE6fJ5rZYGfiPYI8tynnwXkwJAcS1Gh3HEyFLw==}
+  '@next/swc-linux-arm64-gnu@15.0.0-canary.168':
+    resolution: {integrity: sha512-bJNCmJSerl1v2iVsJSlv427c3RyKj5z4rYyOGCH2WiUGc6GvhDXh06sG8zmAzKrr6vLNaVwIbZsdlwJxroTOug==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -1661,8 +1661,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-arm64-musl@15.0.0-canary.167':
-    resolution: {integrity: sha512-DOOMODRtDlm4FX35ag5N5akr89IE2MQvFBHEeoeI0FWJmUtGJ4DMXzGSlnv1XwKBiREPgzA9MFfBeDccPymYLw==}
+  '@next/swc-linux-arm64-musl@15.0.0-canary.168':
+    resolution: {integrity: sha512-PqRH1Dk/1Z5RfOO4ewoHnhoZH/nShR48NyhIngmfSrmzBeR/fqM12a5fAP0VgBLpwGozZ/1RPfGgL5QhQH6gPg==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [linux]
@@ -1673,8 +1673,8 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@next/swc-linux-x64-gnu@15.0.0-canary.167':
-    resolution: {integrity: sha512-kOe1pilqNeHR9+5CJKeIM0C5eWw4OSqfSuMYpW/9cjVnvjVmCttchazo8rv1e0oEXvDhn0HB9sgj76d73pMU/g==}
+  '@next/swc-linux-x64-gnu@15.0.0-canary.168':
+    resolution: {integrity: sha512-RSfGiiqWgRzxH5pV0u7f+Vr2g0t8y7s/tcdSFj0GoAeDAc79PfQq5Wyyd/qbSfGqcxE8gBfZkRvtEDRShSBykQ==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -1685,8 +1685,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-linux-x64-musl@15.0.0-canary.167':
-    resolution: {integrity: sha512-SQVYb/WD/VxyVZT06YyBhod/ukh1UQMKO30s/vRVkjX+/nyxJdz6K8EAHsdCYbjMnX0On8vbFw2TVAqfFOVNqQ==}
+  '@next/swc-linux-x64-musl@15.0.0-canary.168':
+    resolution: {integrity: sha512-bgITMce1qBBuqspeBOf4f88ln04yK/AJ6cEVZOMFxH4wAfpGGPbMbBTfC7aUqBdX3ktyF+YSs2D137rr0b23kA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [linux]
@@ -1697,8 +1697,8 @@ packages:
     cpu: [x64]
     os: [linux]
 
-  '@next/swc-win32-arm64-msvc@15.0.0-canary.167':
-    resolution: {integrity: sha512-5F9yMwmpfKdAOBmQarpVvuWTau3Dk/v9s2VfELK3tGeThRpHb4JOpksClw5C7RDYAxWwcqK4EoFeciIT1iIc9A==}
+  '@next/swc-win32-arm64-msvc@15.0.0-canary.168':
+    resolution: {integrity: sha512-xooyrTjrJokmDIXqwQGC8p9sJFWeV0ALwWSefdiHAoeLEG4V8Wpui4rw5OctMhBbnjg3SPXSM0iMJn2WGdaTJw==}
     engines: {node: '>= 10'}
     cpu: [arm64]
     os: [win32]
@@ -1709,8 +1709,8 @@ packages:
     cpu: [arm64]
     os: [win32]
 
-  '@next/swc-win32-ia32-msvc@15.0.0-canary.167':
-    resolution: {integrity: sha512-8tRWrbpPyzHdSjQFFNzAHpWuyU5n5DvvNxWd61hFqxZRJZIwnlUjwgvVpobOZLoWtab0DZK1tEvOuzQX5mOLgw==}
+  '@next/swc-win32-ia32-msvc@15.0.0-canary.168':
+    resolution: {integrity: sha512-hcqPQORa0d3v/7lQpbhGMI52iCPG03j6/RFq1kjj6pq4jvnZC1F2/npU0v2OQ6C6z/IG+MqgYCuedaPVvoGi8g==}
     engines: {node: '>= 10'}
     cpu: [ia32]
     os: [win32]
@@ -1721,8 +1721,8 @@ packages:
     cpu: [ia32]
     os: [win32]
 
-  '@next/swc-win32-x64-msvc@15.0.0-canary.167':
-    resolution: {integrity: sha512-xGkJ0shYzUbSBENSoyXd6a3yFvIaf4x4ro+X56ORHjkaTODFQk9uia6D40PGyGBmSGmJtdXNKYPG2T9DKaQcnQ==}
+  '@next/swc-win32-x64-msvc@15.0.0-canary.168':
+    resolution: {integrity: sha512-ZPojtdhs2bNdQhlG2O+IRdzQ3jJvdkpYGAfqet2gzOYjVT+qPBLwGtKNqsaaqga0Z9FFfFwnklb8OrwU7TQOXA==}
     engines: {node: '>= 10'}
     cpu: [x64]
     os: [win32]
@@ -2545,8 +2545,8 @@ packages:
   '@types/react-dom@18.3.0':
     resolution: {integrity: sha512-EhwApuTmMBmXuFOikhQLIBUn6uFg81SwLMOAUgodJF14SOBOCMdU04gDoYi0WOJJHD144TL32z4yDqCW3dnkQg==}
 
-  '@types/react@18.3.3':
-    resolution: {integrity: sha512-hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==}
+  '@types/react@18.3.10':
+    resolution: {integrity: sha512-02sAAlBnP39JgXwkAq3PeU9DVaaGpZyF3MGcC0MKgQVkZor5IiiDAipVaxQHtDJAmO4GIy/rVBy/LzVj76Cyqg==}
 
   '@types/semver@7.5.8':
     resolution: {integrity: sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==}
@@ -4580,8 +4580,8 @@ packages:
       react: ^16.8 || ^17 || ^18
       react-dom: ^16.8 || ^17 || ^18
 
-  next@15.0.0-canary.167:
-    resolution: {integrity: sha512-IifSWU8gNQ8kTXRf2QnEGvUUpnkZk8WKLKWX6rypnEDDmn38sXaWpemjMUIM98UrT/y9sXBIiBA84X2MvignIA==}
+  next@15.0.0-canary.168:
+    resolution: {integrity: sha512-iiKSwHyyJ/LRe5ZcSt6KOPxjmoH7+NPM/zknLsa180vKT3URVJw9rKwR5z9mb/+/b4CqAYLQqpG/CTptv7/m3w==}
     engines: {node: '>=18.18.0'}
     hasBin: true
     peerDependencies:
@@ -7648,10 +7648,10 @@ snapshots:
   '@libsql/win32-x64-msvc@0.4.1':
     optional: true
 
-  '@markdoc/markdoc@0.4.0(@types/react@18.3.3)(react@19.0.0-rc-3563387fe3-20240621)':
+  '@markdoc/markdoc@0.4.0(@types/react@18.3.10)(react@19.0.0-rc-3563387fe3-20240621)':
     optionalDependencies:
       '@types/markdown-it': 12.2.3
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       react: 19.0.0-rc-3563387fe3-20240621
 
   '@microsoft/tsdoc-config@0.16.2':
@@ -7672,7 +7672,7 @@ snapshots:
 
   '@next/env@14.2.4': {}
 
-  '@next/env@15.0.0-canary.167': {}
+  '@next/env@15.0.0-canary.168': {}
 
   '@next/env@15.0.0-rc.0': {}
 
@@ -7684,55 +7684,55 @@ snapshots:
     dependencies:
       glob: 10.3.10
 
-  '@next/swc-darwin-arm64@15.0.0-canary.167':
+  '@next/swc-darwin-arm64@15.0.0-canary.168':
     optional: true
 
   '@next/swc-darwin-arm64@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-darwin-x64@15.0.0-canary.167':
+  '@next/swc-darwin-x64@15.0.0-canary.168':
     optional: true
 
   '@next/swc-darwin-x64@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-linux-arm64-gnu@15.0.0-canary.167':
+  '@next/swc-linux-arm64-gnu@15.0.0-canary.168':
     optional: true
 
   '@next/swc-linux-arm64-gnu@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-linux-arm64-musl@15.0.0-canary.167':
+  '@next/swc-linux-arm64-musl@15.0.0-canary.168':
     optional: true
 
   '@next/swc-linux-arm64-musl@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-linux-x64-gnu@15.0.0-canary.167':
+  '@next/swc-linux-x64-gnu@15.0.0-canary.168':
     optional: true
 
   '@next/swc-linux-x64-gnu@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-linux-x64-musl@15.0.0-canary.167':
+  '@next/swc-linux-x64-musl@15.0.0-canary.168':
     optional: true
 
   '@next/swc-linux-x64-musl@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-win32-arm64-msvc@15.0.0-canary.167':
+  '@next/swc-win32-arm64-msvc@15.0.0-canary.168':
     optional: true
 
   '@next/swc-win32-arm64-msvc@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-win32-ia32-msvc@15.0.0-canary.167':
+  '@next/swc-win32-ia32-msvc@15.0.0-canary.168':
     optional: true
 
   '@next/swc-win32-ia32-msvc@15.0.0-rc.0':
     optional: true
 
-  '@next/swc-win32-x64-msvc@15.0.0-canary.167':
+  '@next/swc-win32-x64-msvc@15.0.0-canary.168':
     optional: true
 
   '@next/swc-win32-x64-msvc@15.0.0-rc.0':
@@ -7771,415 +7771,415 @@ snapshots:
 
   '@radix-ui/primitive@1.1.0': {}
 
-  '@radix-ui/react-alert-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-alert-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dialog': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dialog': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-arrow@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-arrow@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-avatar@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-avatar@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-compose-refs@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-context@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-context@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-dialog@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       aria-hidden: 1.2.4
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
-      react-remove-scroll: 2.5.7(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      react-remove-scroll: 2.5.7(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-direction@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-direction@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-dismissable-layer@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-dismissable-layer@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-escape-keydown': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-dropdown-menu@2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-dropdown-menu@2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-menu': 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-menu': 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-focus-guards@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-focus-guards@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-focus-scope@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-hover-card@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-hover-card@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
   '@radix-ui/react-icons@1.3.0(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
 
-  '@radix-ui/react-id@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-id@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-label@2.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-label@2.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-menu@2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-menu@2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       aria-hidden: 1.2.4
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
-      react-remove-scroll: 2.5.7(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      react-remove-scroll: 2.5.7(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-popover@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-popover@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       aria-hidden: 1.2.4
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
-      react-remove-scroll: 2.5.7(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      react-remove-scroll: 2.5.7(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-popper@1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-popper@1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@floating-ui/react-dom': 2.1.0(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-arrow': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-rect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-arrow': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-rect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-size': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/rect': 1.1.0
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-portal@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-portal@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-presence@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-presence@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-primitive@2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-primitive@2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-roving-focus@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-roving-focus@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-scroll-area@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-scroll-area@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/number': 1.1.0
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-slot@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-slot@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-tabs@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-tabs@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-roving-focus': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-toast@1.2.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-toast@1.2.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-tooltip@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-tooltip@1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-id': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-use-callback-ref@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-use-controllable-state@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-use-escape-keydown@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-use-layout-effect@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-use-rect@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-use-rect@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/rect': 1.1.0
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-use-size@1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-use-size@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@radix-ui/react-visually-hidden@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@radix-ui/react-visually-hidden@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
   '@radix-ui/rect@1.1.0': {}
@@ -8569,14 +8569,14 @@ snapshots:
       lz-string: 1.5.0
       pretty-format: 27.5.1
 
-  '@testing-library/react@16.0.0(@testing-library/dom@10.4.0)(@types/react-dom@18.3.0)(@types/react@18.3.3)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@testing-library/react@16.0.0(@testing-library/dom@10.4.0)(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@babel/runtime': 7.24.6
       '@testing-library/dom': 10.4.0
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
   '@tokenizer/token@0.3.0': {}
@@ -8663,9 +8663,9 @@ snapshots:
 
   '@types/react-dom@18.3.0':
     dependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  '@types/react@18.3.3':
+  '@types/react@18.3.10':
     dependencies:
       '@types/prop-types': 15.7.12
       csstype: 3.1.3
@@ -8874,11 +8874,11 @@ snapshots:
 
   '@ungap/structured-clone@1.2.0': {}
 
-  '@vercel/analytics@1.3.1(next@15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@vercel/analytics@1.3.1(next@15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       server-only: 0.0.1
     optionalDependencies:
-      next: 15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      next: 15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
 
   '@vercel/postgres@0.8.0':
@@ -8889,9 +8889,9 @@ snapshots:
       ws: 8.14.2(bufferutil@4.0.8)(utf-8-validate@6.0.3)
     optional: true
 
-  '@vercel/speed-insights@1.0.12(next@15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+  '@vercel/speed-insights@1.0.12(next@15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     optionalDependencies:
-      next: 15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      next: 15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       react: 19.0.0-rc-f994737d14-20240522
 
   '@vercel/style-guide@6.0.0(@next/eslint-plugin-next@14.2.3)(eslint@8.57.0)(prettier@3.3.0)(typescript@5.5.2)(vitest@2.0.4)':
@@ -9600,13 +9600,13 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  drizzle-orm@0.33.0(@libsql/client@0.9.0(bufferutil@4.0.8)(utf-8-validate@6.0.3))(@neondatabase/serverless@0.7.2)(@types/better-sqlite3@7.6.10)(@types/pg@8.6.6)(@types/react@18.3.3)(@vercel/postgres@0.8.0)(better-sqlite3@11.0.0)(kysely@0.22.0)(react@19.0.0-rc-f994737d14-20240522):
+  drizzle-orm@0.33.0(@libsql/client@0.9.0(bufferutil@4.0.8)(utf-8-validate@6.0.3))(@neondatabase/serverless@0.7.2)(@types/better-sqlite3@7.6.10)(@types/pg@8.6.6)(@types/react@18.3.10)(@vercel/postgres@0.8.0)(better-sqlite3@11.0.0)(kysely@0.22.0)(react@19.0.0-rc-f994737d14-20240522):
     optionalDependencies:
       '@libsql/client': 0.9.0(bufferutil@4.0.8)(utf-8-validate@6.0.3)
       '@neondatabase/serverless': 0.7.2
       '@types/better-sqlite3': 7.6.10
       '@types/pg': 8.6.6
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
       '@vercel/postgres': 0.8.0
       better-sqlite3: 11.0.0
       kysely: 0.22.0
@@ -10037,7 +10037,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -11123,9 +11123,9 @@ snapshots:
       react: 19.0.0-rc-f994737d14-20240522
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
 
-  next@15.0.0-canary.167(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522):
+  next@15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522):
     dependencies:
-      '@next/env': 15.0.0-canary.167
+      '@next/env': 15.0.0-canary.168
       '@swc/counter': 0.1.3
       '@swc/helpers': 0.5.13
       busboy: 1.6.0
@@ -11135,15 +11135,15 @@ snapshots:
       react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
       styled-jsx: 5.1.6(@babel/core@7.24.7)(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@next/swc-darwin-arm64': 15.0.0-canary.167
-      '@next/swc-darwin-x64': 15.0.0-canary.167
-      '@next/swc-linux-arm64-gnu': 15.0.0-canary.167
-      '@next/swc-linux-arm64-musl': 15.0.0-canary.167
-      '@next/swc-linux-x64-gnu': 15.0.0-canary.167
-      '@next/swc-linux-x64-musl': 15.0.0-canary.167
-      '@next/swc-win32-arm64-msvc': 15.0.0-canary.167
-      '@next/swc-win32-ia32-msvc': 15.0.0-canary.167
-      '@next/swc-win32-x64-msvc': 15.0.0-canary.167
+      '@next/swc-darwin-arm64': 15.0.0-canary.168
+      '@next/swc-darwin-x64': 15.0.0-canary.168
+      '@next/swc-linux-arm64-gnu': 15.0.0-canary.168
+      '@next/swc-linux-arm64-musl': 15.0.0-canary.168
+      '@next/swc-linux-x64-gnu': 15.0.0-canary.168
+      '@next/swc-linux-x64-musl': 15.0.0-canary.168
+      '@next/swc-win32-arm64-msvc': 15.0.0-canary.168
+      '@next/swc-win32-ia32-msvc': 15.0.0-canary.168
+      '@next/swc-win32-x64-msvc': 15.0.0-canary.168
       babel-plugin-react-compiler: 0.0.0-experimental-334f00b-20240725
       sharp: 0.33.5
     transitivePeerDependencies:
@@ -11635,33 +11635,33 @@ snapshots:
 
   react-refresh@0.14.2: {}
 
-  react-remove-scroll-bar@2.3.6(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522):
+  react-remove-scroll-bar@2.3.6(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522):
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
-      react-style-singleton: 2.2.1(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      react-style-singleton: 2.2.1(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       tslib: 2.6.2
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  react-remove-scroll@2.5.7(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522):
+  react-remove-scroll@2.5.7(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522):
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
-      react-remove-scroll-bar: 2.3.6(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      react-style-singleton: 2.2.1(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      react-remove-scroll-bar: 2.3.6(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      react-style-singleton: 2.2.1(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
       tslib: 2.6.2
-      use-callback-ref: 1.3.2(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
-      use-sidecar: 1.1.2(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522)
+      use-callback-ref: 1.3.2(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      use-sidecar: 1.1.2(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  react-style-singleton@2.2.1(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522):
+  react-style-singleton@2.2.1(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522):
     dependencies:
       get-nonce: 1.0.1
       invariant: 2.2.4
       react: 19.0.0-rc-f994737d14-20240522
       tslib: 2.6.2
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
   react@19.0.0-rc-3563387fe3-20240621: {}
 
@@ -12481,20 +12481,20 @@ snapshots:
       querystringify: 2.2.0
       requires-port: 1.0.0
 
-  use-callback-ref@1.3.2(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522):
+  use-callback-ref@1.3.2(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522):
     dependencies:
       react: 19.0.0-rc-f994737d14-20240522
       tslib: 2.6.2
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
-  use-sidecar@1.1.2(@types/react@18.3.3)(react@19.0.0-rc-f994737d14-20240522):
+  use-sidecar@1.1.2(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522):
     dependencies:
       detect-node-es: 1.1.0
       react: 19.0.0-rc-f994737d14-20240522
       tslib: 2.6.2
     optionalDependencies:
-      '@types/react': 18.3.3
+      '@types/react': 18.3.10
 
   use-sync-external-store@1.2.2(react@19.0.0-rc-f994737d14-20240522):
     dependencies:

From ac5e36534fcc338f364d096575360f7abe3cd574 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sun, 29 Sep 2024 04:22:25 +0100
Subject: [PATCH 15/43] add dropdown menu to posts wip

---
 .../(app)/_components/ellipsis-dropdown.tsx   |  92 +++++++++++++
 .../app/(app)/_components/post-card.tsx       |  53 ++++----
 packages/frontpage/app/(app)/layout.tsx       |   9 +-
 .../moderation/_components/report-card.tsx    |  89 +++++++++++++
 .../user-handle.tsx}                          |   0
 .../frontpage/app/(app)/moderation/page.tsx   |  85 +-----------
 .../frontpage/lib/components/ui/dialog.tsx    | 122 ++++++++++++++++++
 packages/frontpage/package.json               |   1 +
 8 files changed, 346 insertions(+), 105 deletions(-)
 create mode 100644 packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
 create mode 100644 packages/frontpage/app/(app)/moderation/_components/report-card.tsx
 rename packages/frontpage/app/(app)/moderation/{_user-handle.tsx => _components/user-handle.tsx} (100%)
 create mode 100644 packages/frontpage/lib/components/ui/dialog.tsx

diff --git a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
new file mode 100644
index 00000000..f026483f
--- /dev/null
+++ b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
@@ -0,0 +1,92 @@
+"use client";
+
+import * as React from "react";
+import { MoreHorizontal, Trash } from "lucide-react";
+import { Button } from "@/lib/components/ui/button";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuTrigger,
+} from "@/lib/components/ui/dropdown-menu";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
+import { DialogHeader } from "@/lib/components/ui/dialog";
+import {
+  Dialog,
+  DialogContent,
+  DialogTitle,
+  DialogDescription,
+  DialogTrigger,
+} from "@radix-ui/react-dialog";
+
+type EllipsisDropdownProps = {
+  onReport: () => Promise<void>;
+  onDelete: () => Promise<void>;
+  isAuthor: boolean;
+};
+
+export function EllipsisDropdown({
+  onReport,
+  onDelete,
+  isAuthor,
+}: EllipsisDropdownProps) {
+  const [open, setOpen] = React.useState(false);
+
+  return (
+    <DropdownMenu open={open} onOpenChange={setOpen}>
+      <DropdownMenuTrigger asChild>
+        <Button variant="ghost" size="sm">
+          <MoreHorizontal />
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" className="w-[200px]">
+        <DropdownMenuLabel>Actions</DropdownMenuLabel>
+        <DropdownMenuGroup>
+          <Dialog>
+            <DialogTrigger asChild>
+              <DropdownMenuItem
+                onSelect={(e) => {
+                  e.preventDefault();
+                  void onReport?.();
+                  setOpen(false);
+                }}
+              >
+                <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
+                Report
+              </DropdownMenuItem>
+            </DialogTrigger>
+            <DialogContent>
+              <DialogHeader>
+                <DialogTitle>Are you absolutely sure?</DialogTitle>
+                <DialogDescription>
+                  This will report the comment. This action cannot be undone.
+                </DialogDescription>
+              </DialogHeader>
+            </DialogContent>
+          </Dialog>
+          {isAuthor || true ? (
+            <>
+              <DropdownMenuSeparator />
+              <DropdownMenuItem
+                className="text-red-600"
+                onSelect={(e) => {
+                  e.preventDefault();
+                  void onDelete?.();
+                  setOpen(false);
+                }}
+              >
+                <Trash className="mr-2 h-4 w-4" />
+                Delete
+                <DropdownMenuShortcut>⌘⌫</DropdownMenuShortcut>
+              </DropdownMenuItem>
+            </>
+          ) : null}
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 8ceea066..e9f7e37f 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -8,8 +8,8 @@ import { PostCollection } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
-import { ReportButton } from "./report-button";
 import { createReport } from "@/lib/data/db/report";
+import { EllipsisDropdown } from "./ellipsis-dropdown";
 
 type PostProps = {
   id: number;
@@ -74,26 +74,6 @@ export async function PostCard({
           }
           votes={votes}
         />
-        <ReportButton
-          reportAction={async () => {
-            "use server";
-            const user = await ensureUser();
-
-            await createReport({
-              actionedAt: new Date(),
-              subjectUri: `at://${author}/${PostCollection}/${rkey}`,
-              subjectDid: author,
-              subjectCollection: PostCollection,
-              subjectRkey: rkey,
-              subjectCid: cid,
-              createdBy: user.did,
-              createdAt: new Date(),
-              creatorComment: "This post is spam",
-              reportReason: "spam",
-              status: "pending",
-            });
-          }}
-        />
       </div>
       <div className="w-full">
         <h2 className="mb-1 text-xl">
@@ -109,7 +89,7 @@ export async function PostCard({
         </h2>
         <div className="flex flex-wrap text-gray-500 dark:text-gray-400 sm:gap-4">
           <div className="flex gap-2 flex-wrap md:flex-nowrap">
-            <div className="flex gap-2">
+            <div className="flex gap-2 items-center">
               <span aria-hidden>•</span>
               <UserHoverCard did={author} asChild>
                 <Link href={`/profile/${handle}`} className="hover:underline">
@@ -130,6 +110,35 @@ export async function PostCard({
               </Link>
             </div>
           </div>
+          <div className="ml-auto">
+            <EllipsisDropdown
+              isAuthor={false}
+              onDelete={async () => {
+                "use server";
+                console.log("Deleting post", rkey);
+                return;
+              }}
+              onReport={async () => {
+                "use server";
+                const user = await ensureUser();
+
+                console.log("Reporting post", rkey);
+
+                await createReport({
+                  subjectUri: `at://${author}/${PostCollection}/${rkey}`,
+                  subjectDid: author,
+                  subjectCollection: PostCollection,
+                  subjectRkey: rkey,
+                  subjectCid: cid,
+                  createdBy: user.did,
+                  createdAt: new Date(),
+                  creatorComment: "This post is terrible",
+                  reportReason: "spam",
+                  status: "pending",
+                });
+              }}
+            />
+          </div>
         </div>
       </div>
     </article>
diff --git a/packages/frontpage/app/(app)/layout.tsx b/packages/frontpage/app/(app)/layout.tsx
index f1cdeeb4..4281f408 100644
--- a/packages/frontpage/app/(app)/layout.tsx
+++ b/packages/frontpage/app/(app)/layout.tsx
@@ -2,7 +2,7 @@ import { deleteAuthCookie, getSession, signOut } from "@/lib/auth";
 import Link from "next/link";
 import { Suspense } from "react";
 import { Button } from "@/lib/components/ui/button";
-import { isBetaUser } from "@/lib/data/user";
+import { isAdmin, isBetaUser } from "@/lib/data/user";
 import { OpenInNewWindowIcon } from "@radix-ui/react-icons";
 import { ThemeToggle } from "./_components/theme-toggle";
 import {
@@ -123,6 +123,13 @@ async function LoginOrLogout() {
               Profile
             </Link>
           </DropdownMenuItem>
+          {(await isAdmin()) ? (
+            <DropdownMenuItem asChild>
+              <Link href="/moderation" className="cursor-pointer">
+                Moderation
+              </Link>
+            </DropdownMenuItem>
+          ) : null}
           <DropdownMenuSeparator />
           <form
             action={async () => {
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
new file mode 100644
index 00000000..6fb3fe8a
--- /dev/null
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -0,0 +1,89 @@
+import { Button } from "@/lib/components/ui/button";
+import {
+  Card,
+  CardHeader,
+  CardTitle,
+  CardContent,
+} from "@/lib/components/ui/card";
+import { DID } from "@/lib/data/atproto/did";
+import { Report } from "@/lib/data/db/report";
+import { ExternalLink, Flag } from "lucide-react";
+import { performModerationAction } from "../page";
+import { UserHandle } from "./user-handle";
+
+export async function ReportCard({ report }: { report: Report }) {
+  return (
+    <Card className="bg-gray-700 border-gray-600 mb-4">
+      <CardHeader className="pb-2">
+        <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
+          <span>Reported Item</span>
+          <span
+            className={`px-2 py-1 rounded-full text-xs ${
+              report.status === "pending"
+                ? "bg-yellow-500 text-yellow-900"
+                : report.status === "accepted"
+                  ? "bg-green-500 text-green-900"
+                  : "bg-red-500 text-red-900"
+            }`}
+          >
+            {report.status}
+          </span>
+        </CardTitle>
+      </CardHeader>
+      <CardContent>
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+          <div>
+            <strong>URI:</strong>
+            <a
+              href={report.subjectUri}
+              target="_blank"
+              rel="noopener noreferrer"
+              className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
+            >
+              {report.subjectUri.substring(0, 30)}...
+              <ExternalLink className="h-3 w-3 ml-1" />
+            </a>
+          </div>
+        </div>
+        <div className="flex items-center text-sm text-gray-300 mb-4">
+          <Flag className="mr-2 h-4 w-4 text-red-400" />
+          <span>Reason: {report.creatorComment}</span>
+        </div>
+        <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
+          <div>
+            <strong>Reported By: </strong>
+            <UserHandle userDid={report.createdBy as DID} />
+          </div>
+          <div>
+            <strong>Reported Reason: </strong> {report.creatorComment}
+          </div>
+        </div>
+        <form>
+          <Button
+            variant="success"
+            type="submit"
+            className="mr-2"
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            formAction={performModerationAction.bind(null, {
+              reportId: report.id,
+              status: "accepted",
+            })}
+          >
+            Approve
+          </Button>
+          <Button
+            variant="destructive"
+            type="submit"
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            formAction={performModerationAction.bind(null, {
+              reportId: report.id,
+              status: "rejected",
+            })}
+          >
+            Reject
+          </Button>
+        </form>
+      </CardContent>
+    </Card>
+  );
+}
diff --git a/packages/frontpage/app/(app)/moderation/_user-handle.tsx b/packages/frontpage/app/(app)/moderation/_components/user-handle.tsx
similarity index 100%
rename from packages/frontpage/app/(app)/moderation/_user-handle.tsx
rename to packages/frontpage/app/(app)/moderation/_components/user-handle.tsx
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 65286b88..9ba99f0f 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -1,4 +1,4 @@
-import { ExternalLink, Flag, Shield } from "lucide-react";
+import { Shield } from "lucide-react";
 import {
   Card,
   CardContent,
@@ -6,7 +6,6 @@ import {
   CardHeader,
   CardTitle,
 } from "@/lib/components/ui/card";
-import { Button } from "@/lib/components/ui/button";
 import { ensureUser, isAdmin as isAdmin } from "@/lib/data/user";
 import { redirect } from "next/navigation";
 import {
@@ -23,17 +22,13 @@ import { PostCollection } from "@/lib/data/atproto/post";
 import { CommentCollection } from "@/lib/data/atproto/comment";
 import { revalidatePath } from "next/cache";
 import Link from "next/link";
-import { getVerifiedHandle } from "@/lib/data/atproto/identity";
-import { UserHandle } from "./_user-handle";
-import { DID } from "@/lib/data/atproto/did";
+import { ReportCard } from "./_components/report-card";
 
 export async function performModerationAction(
   input: { reportId: number; status: "accepted" | "rejected" },
   _: FormData,
 ) {
   "use server";
-  console.log("creating moderation action");
-  console.log("input", input);
   const user = await ensureUser();
   const report = await getReport(input.reportId);
 
@@ -166,81 +161,7 @@ export default async function Moderation({
           </CardContent>
         </Card>
         {reports.map((report) => (
-          <Card
-            key={report.subjectCid}
-            className="bg-gray-700 border-gray-600 mb-4"
-          >
-            <CardHeader className="pb-2">
-              <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-                <span>Reported Item</span>
-                <span
-                  className={`px-2 py-1 rounded-full text-xs ${
-                    report.status === "pending"
-                      ? "bg-yellow-500 text-yellow-900"
-                      : report.status === "accepted"
-                        ? "bg-green-500 text-green-900"
-                        : "bg-red-500 text-red-900"
-                  }`}
-                >
-                  {report.status}
-                </span>
-              </CardTitle>
-            </CardHeader>
-            <CardContent>
-              <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                <div>
-                  <strong>URI:</strong>
-                  <a
-                    href={report.subjectUri}
-                    target="_blank"
-                    rel="noopener noreferrer"
-                    className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
-                  >
-                    {report.subjectUri.substring(0, 30)}...
-                    <ExternalLink className="h-3 w-3 ml-1" />
-                  </a>
-                </div>
-              </div>
-              <div className="flex items-center text-sm text-gray-300 mb-4">
-                <Flag className="mr-2 h-4 w-4 text-red-400" />
-                <span>Reason: {report.creatorComment}</span>
-              </div>
-              <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-                <div>
-                  <strong>Reported By: </strong>
-                  <UserHandle userDid={report.createdBy as DID} />
-                </div>
-                <div>
-                  <strong>Reported Reason: </strong> {report.creatorComment}
-                </div>
-              </div>
-              <form>
-                <Button
-                  variant="success"
-                  type="submit"
-                  className="mr-2"
-                  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                  formAction={performModerationAction.bind(null, {
-                    reportId: report.id,
-                    status: "accepted",
-                  })}
-                >
-                  Approve
-                </Button>
-                <Button
-                  variant="destructive"
-                  type="submit"
-                  // eslint-disable-next-line @typescript-eslint/no-misused-promises
-                  formAction={performModerationAction.bind(null, {
-                    reportId: report.id,
-                    status: "rejected",
-                  })}
-                >
-                  Reject
-                </Button>
-              </form>
-            </CardContent>
-          </Card>
+          <ReportCard key={report.subjectCid} report={report} />
         ))}
       </>
     );
diff --git a/packages/frontpage/lib/components/ui/dialog.tsx b/packages/frontpage/lib/components/ui/dialog.tsx
new file mode 100644
index 00000000..95b0d38a
--- /dev/null
+++ b/packages/frontpage/lib/components/ui/dialog.tsx
@@ -0,0 +1,122 @@
+"use client"
+
+import * as React from "react"
+import * as DialogPrimitive from "@radix-ui/react-dialog"
+import { Cross2Icon } from "@radix-ui/react-icons"
+
+import { cn } from "@/lib/utils"
+
+const Dialog = DialogPrimitive.Root
+
+const DialogTrigger = DialogPrimitive.Trigger
+
+const DialogPortal = DialogPrimitive.Portal
+
+const DialogClose = DialogPrimitive.Close
+
+const DialogOverlay = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Overlay>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Overlay>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Overlay
+    ref={ref}
+    className={cn(
+      "fixed inset-0 z-50 bg-black/80  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+      className
+    )}
+    {...props}
+  />
+))
+DialogOverlay.displayName = DialogPrimitive.Overlay.displayName
+
+const DialogContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content>
+>(({ className, children, ...props }, ref) => (
+  <DialogPortal>
+    <DialogOverlay />
+    <DialogPrimitive.Content
+      ref={ref}
+      className={cn(
+        "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
+        className
+      )}
+      {...props}
+    >
+      {children}
+      <DialogPrimitive.Close className="absolute right-4 top-4 rounded-sm opacity-70 ring-offset-background transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-accent data-[state=open]:text-muted-foreground">
+        <Cross2Icon className="h-4 w-4" />
+        <span className="sr-only">Close</span>
+      </DialogPrimitive.Close>
+    </DialogPrimitive.Content>
+  </DialogPortal>
+))
+DialogContent.displayName = DialogPrimitive.Content.displayName
+
+const DialogHeader = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col space-y-1.5 text-center sm:text-left",
+      className
+    )}
+    {...props}
+  />
+)
+DialogHeader.displayName = "DialogHeader"
+
+const DialogFooter = ({
+  className,
+  ...props
+}: React.HTMLAttributes<HTMLDivElement>) => (
+  <div
+    className={cn(
+      "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
+      className
+    )}
+    {...props}
+  />
+)
+DialogFooter.displayName = "DialogFooter"
+
+const DialogTitle = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Title>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Title>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Title
+    ref={ref}
+    className={cn(
+      "text-lg font-semibold leading-none tracking-tight",
+      className
+    )}
+    {...props}
+  />
+))
+DialogTitle.displayName = DialogPrimitive.Title.displayName
+
+const DialogDescription = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Description>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Description>
+>(({ className, ...props }, ref) => (
+  <DialogPrimitive.Description
+    ref={ref}
+    className={cn("text-sm text-muted-foreground", className)}
+    {...props}
+  />
+))
+DialogDescription.displayName = DialogPrimitive.Description.displayName
+
+export {
+  Dialog,
+  DialogPortal,
+  DialogOverlay,
+  DialogTrigger,
+  DialogClose,
+  DialogContent,
+  DialogHeader,
+  DialogFooter,
+  DialogTitle,
+  DialogDescription,
+}
diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index 26136050..870b3940 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -20,6 +20,7 @@
     "@next/env": "^14.2.4",
     "@radix-ui/react-alert-dialog": "^1.1.1",
     "@radix-ui/react-avatar": "^1.1.0",
+    "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-dropdown-menu": "^2.1.1",
     "@radix-ui/react-hover-card": "^1.1.1",
     "@radix-ui/react-icons": "^1.3.0",

From b845fe01b367f6cd34e53f9cdd8d6ed22f55d19f Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sun, 29 Sep 2024 04:24:30 +0100
Subject: [PATCH 16/43] why

---
 pnpm-lock.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 2dfaec7f..ab48925f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -129,6 +129,9 @@ importers:
       '@radix-ui/react-avatar':
         specifier: ^1.1.0
         version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dialog':
+        specifier: ^1.1.1
+        version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-dropdown-menu':
         specifier: ^2.1.1
         version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)

From 18ca0321a25ea0344f040ac3865a13235d5f8cfe Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sun, 29 Sep 2024 04:29:58 +0100
Subject: [PATCH 17/43] remove unused

---
 packages/frontpage/lib/data/db/post.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index e2d872a5..dd6c38aa 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -256,5 +256,3 @@ export async function unauthed_deletePost({
   });
   console.log("Done deleting post transaction");
 }
-
-export async function moderatePost(cid: string) {}

From 87f43bb606f262df940ae68b71d1ecb9901275e0 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Sun, 29 Sep 2024 15:22:51 +0100
Subject: [PATCH 18/43] add confirmation dialogs

---
 .../(app)/_components/ellipsis-dropdown.tsx   | 115 +++++++++---------
 .../frontpage/app/(app)/moderation/page.tsx   |   6 -
 2 files changed, 59 insertions(+), 62 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
index f026483f..7029947e 100644
--- a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
+++ b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
@@ -10,18 +10,21 @@ import {
   DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuSeparator,
-  DropdownMenuShortcut,
   DropdownMenuTrigger,
 } from "@/lib/components/ui/dropdown-menu";
 import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
-import { DialogHeader } from "@/lib/components/ui/dialog";
 import {
-  Dialog,
-  DialogContent,
-  DialogTitle,
-  DialogDescription,
-  DialogTrigger,
-} from "@radix-ui/react-dialog";
+  AlertDialog,
+  AlertDialogAction,
+  AlertDialogCancel,
+  AlertDialogContent,
+  AlertDialogDescription,
+  AlertDialogFooter,
+  AlertDialogHeader,
+  AlertDialogTitle,
+  AlertDialogTrigger,
+} from "@/lib/components/ui/alert-dialog";
+import { toast } from "@/lib/components/ui/use-toast";
 
 type EllipsisDropdownProps = {
   onReport: () => Promise<void>;
@@ -37,56 +40,56 @@ export function EllipsisDropdown({
   const [open, setOpen] = React.useState(false);
 
   return (
-    <DropdownMenu open={open} onOpenChange={setOpen}>
-      <DropdownMenuTrigger asChild>
-        <Button variant="ghost" size="sm">
-          <MoreHorizontal />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" className="w-[200px]">
-        <DropdownMenuLabel>Actions</DropdownMenuLabel>
-        <DropdownMenuGroup>
-          <Dialog>
-            <DialogTrigger asChild>
-              <DropdownMenuItem
-                onSelect={(e) => {
-                  e.preventDefault();
-                  void onReport?.();
-                  setOpen(false);
-                }}
-              >
+    <AlertDialog>
+      <DropdownMenu open={open} onOpenChange={setOpen}>
+        <DropdownMenuTrigger asChild>
+          <Button variant="ghost" size="sm">
+            <MoreHorizontal />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end" className="w-[200px]">
+          <DropdownMenuLabel>Actions</DropdownMenuLabel>
+          <DropdownMenuGroup>
+            <AlertDialogTrigger asChild>
+              <DropdownMenuItem>
                 <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
                 Report
               </DropdownMenuItem>
-            </DialogTrigger>
-            <DialogContent>
-              <DialogHeader>
-                <DialogTitle>Are you absolutely sure?</DialogTitle>
-                <DialogDescription>
-                  This will report the comment. This action cannot be undone.
-                </DialogDescription>
-              </DialogHeader>
-            </DialogContent>
-          </Dialog>
-          {isAuthor || true ? (
-            <>
-              <DropdownMenuSeparator />
-              <DropdownMenuItem
-                className="text-red-600"
-                onSelect={(e) => {
-                  e.preventDefault();
-                  void onDelete?.();
-                  setOpen(false);
-                }}
-              >
-                <Trash className="mr-2 h-4 w-4" />
-                Delete
-                <DropdownMenuShortcut>⌘⌫</DropdownMenuShortcut>
-              </DropdownMenuItem>
-            </>
-          ) : null}
-        </DropdownMenuGroup>
-      </DropdownMenuContent>
-    </DropdownMenu>
+            </AlertDialogTrigger>
+            {isAuthor || true ? (
+              <>
+                <DropdownMenuSeparator />
+                <DropdownMenuItem className="text-red-600">
+                  <Trash className="mr-2 h-4 w-4" />
+                  Delete
+                </DropdownMenuItem>
+              </>
+            ) : null}
+          </DropdownMenuGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This will report the post. This action cannot be undone.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter>
+          <AlertDialogAction
+            onClick={() => {
+              void onReport();
+              toast({
+                title: "Post reported",
+                type: "foreground",
+              });
+            }}
+          >
+            Confirm
+          </AlertDialogAction>
+          <AlertDialogCancel>Cancel</AlertDialogCancel>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
   );
 }
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 9ba99f0f..72f8526d 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -78,12 +78,6 @@ export default async function Moderation({
   );
 
   const stats = await getModeratorReportStats();
-  // const stats = {
-  //   total: reports.length,
-  //   pending: reports.filter((r) => r.status === "pending").length,
-  //   accepted: reports.filter((r) => r.status === "accepted").length,
-  //   rejected: reports.filter((r) => r.status === "rejected").length,
-  // };
 
   if (await isAdmin()) {
     return (

From 1796b6cf146fa190c023f2cd6b458bb5cbb5b39a Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Mon, 30 Sep 2024 06:30:47 +0100
Subject: [PATCH 19/43] get ellipsis working for posts, create moderator
 actions in db, add ellipsis to comments, delete is wip

---
 .../(app)/_components/ellipsis-dropdown.tsx   | 172 +++++++++++++-----
 .../app/(app)/_components/post-card.tsx       |  59 +++---
 .../moderation/_components/report-card.tsx    | 163 ++++++++++-------
 .../moderation/_components/user-handle.tsx    |   2 +-
 .../frontpage/app/(app)/moderation/page.tsx   |  34 +++-
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  |  27 +++
 .../[postRkey]/_lib/comment-client.tsx        |  21 +++
 .../frontpage/lib/components/ui/select.tsx    | 164 +++++++++++++++++
 packages/frontpage/lib/constants.ts           |   7 +
 packages/frontpage/lib/data/db/comment.ts     |  24 +++
 packages/frontpage/lib/data/db/moderation.ts  |   3 +-
 packages/frontpage/lib/data/db/post.ts        |  25 +++
 packages/frontpage/lib/data/db/report.ts      |   1 +
 packages/frontpage/lib/data/db/user.ts        |  16 ++
 packages/frontpage/package.json               |   1 +
 pnpm-lock.yaml                                |  62 ++++++-
 16 files changed, 639 insertions(+), 142 deletions(-)
 create mode 100644 packages/frontpage/lib/components/ui/select.tsx
 create mode 100644 packages/frontpage/lib/data/db/user.ts

diff --git a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
index 7029947e..d691b528 100644
--- a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
+++ b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
@@ -9,7 +9,6 @@ import {
   DropdownMenuGroup,
   DropdownMenuItem,
   DropdownMenuLabel,
-  DropdownMenuSeparator,
   DropdownMenuTrigger,
 } from "@/lib/components/ui/dropdown-menu";
 import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
@@ -25,71 +24,148 @@ import {
   AlertDialogTrigger,
 } from "@/lib/components/ui/alert-dialog";
 import { toast } from "@/lib/components/ui/use-toast";
+import { Textarea } from "@/lib/components/ui/textarea";
+import {
+  Select,
+  SelectTrigger,
+  SelectValue,
+  SelectContent,
+  SelectItem,
+} from "@/lib/components/ui/select";
+import { ReportReason } from "@/lib/constants";
 
 type EllipsisDropdownProps = {
-  onReport: () => Promise<void>;
-  onDelete: () => Promise<void>;
+  onReportAction: (
+    creatorComment: string,
+    reportReason: ReportReason,
+  ) => Promise<void>;
+  onDeleteAction: () => Promise<void>;
   isAuthor: boolean;
 };
 
 export function EllipsisDropdown({
-  onReport,
-  onDelete,
+  onReportAction,
+  onDeleteAction,
   isAuthor,
 }: EllipsisDropdownProps) {
   const [open, setOpen] = React.useState(false);
+  const [input, setInput] = React.useState("");
+  const [reportReason, setReportReason] = React.useState("SPAM");
 
   return (
-    <AlertDialog>
-      <DropdownMenu open={open} onOpenChange={setOpen}>
-        <DropdownMenuTrigger asChild>
-          <Button variant="ghost" size="sm">
-            <MoreHorizontal />
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" className="w-[200px]">
-          <DropdownMenuLabel>Actions</DropdownMenuLabel>
-          <DropdownMenuGroup>
+    <DropdownMenu open={open} onOpenChange={setOpen}>
+      <DropdownMenuTrigger asChild>
+        <Button variant="ghost" size="sm">
+          <MoreHorizontal />
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent align="end" className="w-[200px]">
+        <DropdownMenuLabel>Actions</DropdownMenuLabel>
+        <DropdownMenuGroup>
+          <AlertDialog>
             <AlertDialogTrigger asChild>
-              <DropdownMenuItem>
+              <DropdownMenuItem
+                onSelect={(e) => {
+                  e.preventDefault();
+                }}
+              >
                 <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
                 Report
               </DropdownMenuItem>
             </AlertDialogTrigger>
-            {isAuthor || true ? (
-              <>
-                <DropdownMenuSeparator />
-                <DropdownMenuItem className="text-red-600">
+            <AlertDialogContent>
+              <AlertDialogHeader>
+                <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+                <AlertDialogDescription>
+                  This will report the post. This action cannot be undone.
+                </AlertDialogDescription>
+              </AlertDialogHeader>
+              <Select value={reportReason} onValueChange={setReportReason}>
+                <SelectTrigger className="w-[180px]">
+                  <SelectValue placeholder="Please select one" />
+                </SelectTrigger>
+                <SelectContent>
+                  {Object.keys(ReportReason).map((reason) => (
+                    <SelectItem key={reason} value={reason}>
+                      {reason}
+                    </SelectItem>
+                  ))}
+                </SelectContent>
+              </Select>
+              <Textarea
+                value={input}
+                onChange={(event) => {
+                  setInput(event.target.value);
+                }}
+                id="textArea"
+                name="reportReason"
+                placeholder="Enter your report reason here..."
+                // disabled={isPending}
+                className="resize-y flex-1"
+              />
+              <AlertDialogFooter>
+                <AlertDialogAction
+                  onClick={() => {
+                    console.log(reportReason);
+                    void onReportAction(input, reportReason as ReportReason);
+                    toast({
+                      title: "Post reported",
+                      type: "foreground",
+                    });
+                    setOpen(false);
+                  }}
+                >
+                  Confirm
+                </AlertDialogAction>
+                <AlertDialogCancel onClick={() => setOpen(false)}>
+                  Cancel
+                </AlertDialogCancel>
+              </AlertDialogFooter>
+            </AlertDialogContent>
+          </AlertDialog>
+          {/* TODO: delete the true bit when done */}
+          {isAuthor || true ? (
+            <AlertDialog>
+              <AlertDialogTrigger asChild>
+                <DropdownMenuItem
+                  className="text-red-600"
+                  onSelect={(e) => {
+                    e.preventDefault();
+                  }}
+                >
                   <Trash className="mr-2 h-4 w-4" />
                   Delete
                 </DropdownMenuItem>
-              </>
-            ) : null}
-          </DropdownMenuGroup>
-        </DropdownMenuContent>
-      </DropdownMenu>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-          <AlertDialogDescription>
-            This will report the post. This action cannot be undone.
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <AlertDialogFooter>
-          <AlertDialogAction
-            onClick={() => {
-              void onReport();
-              toast({
-                title: "Post reported",
-                type: "foreground",
-              });
-            }}
-          >
-            Confirm
-          </AlertDialogAction>
-          <AlertDialogCancel>Cancel</AlertDialogCancel>
-        </AlertDialogFooter>
-      </AlertDialogContent>
-    </AlertDialog>
+              </AlertDialogTrigger>
+              <AlertDialogContent>
+                <AlertDialogHeader>
+                  <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+                  <AlertDialogDescription>
+                    This will delete the post. This action cannot be undone.
+                  </AlertDialogDescription>
+                </AlertDialogHeader>
+                <AlertDialogFooter>
+                  <AlertDialogAction
+                    onClick={() => {
+                      void onDeleteAction();
+                      toast({
+                        title: "Post deleted",
+                        type: "foreground",
+                      });
+                      setOpen(false);
+                    }}
+                  >
+                    Confirm
+                  </AlertDialogAction>
+                  <AlertDialogCancel onClick={() => setOpen(false)}>
+                    Cancel
+                  </AlertDialogCancel>
+                </AlertDialogFooter>
+              </AlertDialogContent>
+            </AlertDialog>
+          ) : null}
+        </DropdownMenuGroup>
+      </DropdownMenuContent>
+    </DropdownMenu>
   );
 }
diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index e9f7e37f..3456a6ed 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -10,6 +10,7 @@ import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
 import { createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
+import { ReportReason } from "@/lib/constants";
 
 type PostProps = {
   id: number;
@@ -110,35 +111,39 @@ export async function PostCard({
               </Link>
             </div>
           </div>
-          <div className="ml-auto">
-            <EllipsisDropdown
-              isAuthor={false}
-              onDelete={async () => {
-                "use server";
-                console.log("Deleting post", rkey);
-                return;
-              }}
-              onReport={async () => {
-                "use server";
-                const user = await ensureUser();
 
-                console.log("Reporting post", rkey);
+          {(await getUser()) ? (
+            <div className="ml-auto">
+              <EllipsisDropdown
+                isAuthor={false}
+                onDeleteAction={async () => {
+                  "use server";
+                  console.log("Deleting post", rkey);
+                  return;
+                }}
+                onReportAction={async (
+                  creatorComment: string,
+                  reportReason: ReportReason,
+                ) => {
+                  "use server";
+                  const user = await ensureUser();
 
-                await createReport({
-                  subjectUri: `at://${author}/${PostCollection}/${rkey}`,
-                  subjectDid: author,
-                  subjectCollection: PostCollection,
-                  subjectRkey: rkey,
-                  subjectCid: cid,
-                  createdBy: user.did,
-                  createdAt: new Date(),
-                  creatorComment: "This post is terrible",
-                  reportReason: "spam",
-                  status: "pending",
-                });
-              }}
-            />
-          </div>
+                  await createReport({
+                    subjectUri: `at://${author}/${PostCollection}/${rkey}`,
+                    subjectDid: author,
+                    subjectCollection: PostCollection,
+                    subjectRkey: rkey,
+                    subjectCid: cid,
+                    createdBy: user.did,
+                    createdAt: new Date(),
+                    creatorComment,
+                    reportReason,
+                    status: "pending",
+                  });
+                }}
+              />
+            </div>
+          ) : null}
         </div>
       </div>
     </article>
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index 6fb3fe8a..4f07801f 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -1,3 +1,4 @@
+"use server";
 import { Button } from "@/lib/components/ui/button";
 import {
   Card,
@@ -7,82 +8,122 @@ import {
 } from "@/lib/components/ui/card";
 import { DID } from "@/lib/data/atproto/did";
 import { Report } from "@/lib/data/db/report";
-import { ExternalLink, Flag } from "lucide-react";
 import { performModerationAction } from "../page";
 import { UserHandle } from "./user-handle";
+import { PostCollection } from "@/lib/data/atproto/post";
+import { CommentCollection } from "@/lib/data/atproto/comment";
+import Link from "next/link";
+
+const statusClasses = {
+  pending: "bg-yellow-500 text-yellow-900",
+  accepted: "bg-green-500 text-green-900",
+  rejected: "bg-red-500 text-red-900",
+};
+
+const createLink = (
+  collection?: string | null,
+  postAuthor?: string | null,
+  postRkey?: string | null,
+  commentAuthor?: string | null,
+  commentRkey?: string | null,
+) => {
+  if (collection === PostCollection) {
+    return `/post/${postAuthor}/${postRkey}/`;
+  } else if (collection === CommentCollection) {
+    return `/post/${postAuthor}/${postRkey}/${commentAuthor}/${commentRkey}/`;
+  } else {
+    return `/profile/${postAuthor}/`;
+  }
+};
 
 export async function ReportCard({ report }: { report: Report }) {
   return (
-    <Card className="bg-gray-700 border-gray-600 mb-4">
+    <Card className="dark:bg-gray-700 border-gray-600 mb-4">
       <CardHeader className="pb-2">
-        <CardTitle className="text-lg font-medium text-blue-200 flex items-center justify-between">
-          <span>Reported Item</span>
-          <span
-            className={`px-2 py-1 rounded-full text-xs ${
-              report.status === "pending"
-                ? "bg-yellow-500 text-yellow-900"
-                : report.status === "accepted"
-                  ? "bg-green-500 text-green-900"
+        <CardTitle className="text-lg flex items-center justify-between text-blue-400">
+          <p>Reported {report.subjectCollection}</p>
+          <p
+            className={`px-2 py-1 rounded-full text-xs 
+              ${
+                report.status
+                  ? statusClasses[report.status]
                   : "bg-red-500 text-red-900"
-            }`}
+              }`}
           >
             {report.status}
-          </span>
+          </p>
         </CardTitle>
       </CardHeader>
       <CardContent>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-          <div>
-            <strong>URI:</strong>
-            <a
-              href={report.subjectUri}
-              target="_blank"
-              rel="noopener noreferrer"
-              className="text-blue-300 hover:text-blue-200 ml-1 inline-flex items-center flex-wrap"
-            >
-              {report.subjectUri.substring(0, 30)}...
-              <ExternalLink className="h-3 w-3 ml-1" />
-            </a>
-          </div>
-        </div>
-        <div className="flex items-center text-sm text-gray-300 mb-4">
-          <Flag className="mr-2 h-4 w-4 text-red-400" />
-          <span>Reason: {report.creatorComment}</span>
-        </div>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-2 text-xs text-gray-300 mb-4">
-          <div>
-            <strong>Reported By: </strong>
+        <div className="flex flex-col mb-4 gap-1 flex-wrap">
+          <p>
+            <strong className="mr-2">Reason:</strong>
+            {report.reportReason}
+          </p>
+          <p>
+            <strong className="mr-2">Reported By:</strong>
             <UserHandle userDid={report.createdBy as DID} />
-          </div>
-          <div>
-            <strong>Reported Reason: </strong> {report.creatorComment}
-          </div>
+          </p>
+          <p>
+            <strong className="mr-2">Comment:</strong>
+            {report.creatorComment}
+          </p>
         </div>
-        <form>
-          <Button
-            variant="success"
-            type="submit"
-            className="mr-2"
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            formAction={performModerationAction.bind(null, {
-              reportId: report.id,
-              status: "accepted",
-            })}
-          >
-            Approve
-          </Button>
-          <Button
-            variant="destructive"
-            type="submit"
-            // eslint-disable-next-line @typescript-eslint/no-misused-promises
-            formAction={performModerationAction.bind(null, {
-              reportId: report.id,
-              status: "rejected",
-            })}
+        {report.actionedAt ? (
+          <div className="mb-2 flex flex-row gap-5">
+            <p>
+              <strong className="mr-2">Actioned at:</strong>
+              <span className="italic">
+                {report.actionedAt.toLocaleString()}
+              </span>
+            </p>
+            <p>
+              <strong className="mr-2">Actioned By:</strong>
+
+              <UserHandle userDid={report.actionedBy as DID} />
+            </p>
+          </div>
+        ) : null}
+        <div className="flex">
+          <form>
+            <Button
+              variant="success"
+              type="submit"
+              className="mr-2"
+              formAction={performModerationAction.bind(null, {
+                reportId: report.id,
+                status: "accepted",
+              })}
+            >
+              Approve
+            </Button>
+            <Button
+              variant="destructive"
+              type="submit"
+              formAction={performModerationAction.bind(null, {
+                reportId: report.id,
+                status: "rejected",
+              })}
+            >
+              Reject
+            </Button>
+          </form>
+          <Link
+            className="ml-2"
+            href={createLink(
+              report.subjectCollection,
+              report.subjectDid,
+              report.subjectRkey,
+              report.subjectDid,
+              report.subjectCid,
+            )}
+            target="_blank"
           >
-            Reject
-          </Button>
-        </form>
+            <Button variant="outline" type="button">
+              View
+            </Button>
+          </Link>
+        </div>
       </CardContent>
     </Card>
   );
diff --git a/packages/frontpage/app/(app)/moderation/_components/user-handle.tsx b/packages/frontpage/app/(app)/moderation/_components/user-handle.tsx
index bcd8a3fb..09be6b0b 100644
--- a/packages/frontpage/app/(app)/moderation/_components/user-handle.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/user-handle.tsx
@@ -6,7 +6,7 @@ export async function UserHandle({ userDid }: { userDid: DID }) {
   const handle = (await getVerifiedHandle(userDid)) ?? userDid;
 
   return (
-    <Link href={`/profile/${handle}`} className="underline">
+    <Link href={`/profile/${handle}`} className="underline text-blue-500">
       {handle}
     </Link>
   );
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 72f8526d..cc7f10b5 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -1,3 +1,4 @@
+"use server";
 import { Shield } from "lucide-react";
 import {
   Card,
@@ -23,6 +24,10 @@ import { CommentCollection } from "@/lib/data/atproto/comment";
 import { revalidatePath } from "next/cache";
 import Link from "next/link";
 import { ReportCard } from "./_components/report-card";
+import { moderatePost } from "@/lib/data/db/post";
+import { DID } from "@/lib/data/atproto/did";
+import { moderateComment } from "@/lib/data/db/comment";
+import { moderateUser } from "@/lib/data/db/user";
 
 export async function performModerationAction(
   input: { reportId: number; status: "accepted" | "rejected" },
@@ -56,9 +61,30 @@ export async function performModerationAction(
     newModEvent.subjectCid = report.subjectCid;
   }
 
+  const modAction = async () =>
+    report.subjectCollection === PostCollection
+      ? moderatePost({
+          rkey: report.subjectRkey!,
+          authorDid: report.subjectDid! as DID,
+          cid: report.subjectCid!,
+          hide: input.status === "accepted",
+        })
+      : report.subjectCollection === CommentCollection
+        ? moderateComment({
+            rkey: report.subjectRkey!,
+            authorDid: report.subjectDid! as DID,
+            cid: report.subjectCid!,
+            hide: input.status === "accepted",
+          })
+        : moderateUser({
+            userDid: report.subjectDid as DID,
+            hide: input.status === "accepted",
+          });
+
   await Promise.all([
     createModerationEvent(newModEvent),
     updateReport(report.id, input.status, user.did),
+    modAction(),
   ]);
 
   revalidatePath("/moderation");
@@ -73,8 +99,10 @@ export default async function Moderation({
   const status =
     (searchParams.status as "pending" | "accepted" | "rejected") ?? null;
 
-  const reports = await getReports(status).then((reports) =>
-    reports.sort((a, b) => b.createdAt.getTime() - a.createdAt.getTime()),
+  const reportList = await getReports(status);
+
+  const reports = reportList.sort(
+    (a, b) => b.createdAt.getTime() - a.createdAt.getTime(),
   );
 
   const stats = await getModeratorReportStats();
@@ -155,7 +183,7 @@ export default async function Moderation({
           </CardContent>
         </Card>
         {reports.map((report) => (
-          <ReportCard key={report.subjectCid} report={report} />
+          <ReportCard key={report.id} report={report} />
         ))}
       </>
     );
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index 1713213d..0ff40fd3 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -1,5 +1,6 @@
 "use server";
 
+import { ReportReason } from "@/lib/constants";
 import {
   CommentCollection,
   createComment,
@@ -10,6 +11,7 @@ import { deletePost } from "@/lib/data/atproto/post";
 import { createVote, deleteVote } from "@/lib/data/atproto/vote";
 import { getComment, uncached_doesCommentExist } from "@/lib/data/db/comment";
 import { getPost } from "@/lib/data/db/post";
+import { createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
 import { revalidatePath } from "next/cache";
@@ -73,6 +75,31 @@ export async function deleteCommentAction(rkey: string) {
   await deleteComment(rkey);
 }
 
+export async function reportCommentAction(input: {
+  creatorComment: string;
+  reportReason: ReportReason;
+  authorDid: DID;
+  rkey: string;
+  cid: string;
+}) {
+  console.log("Reporting comment", input);
+  const user = await ensureUser();
+
+  await createReport({
+    //TODO: double check this is the correct uri
+    subjectUri: `at://${input.authorDid}/${CommentCollection}/${input.rkey}`,
+    subjectDid: input.authorDid,
+    subjectCollection: CommentCollection,
+    subjectRkey: input.rkey,
+    subjectCid: input.cid,
+    createdBy: user.did,
+    createdAt: new Date(),
+    creatorComment: input.creatorComment,
+    reportReason: input.reportReason,
+    status: "pending",
+  });
+}
+
 export async function commentVoteAction(input: {
   cid: string;
   rkey: string;
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
index 4d214035..7b0ae301 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
@@ -19,6 +19,7 @@ import {
   commentVoteAction,
   createCommentAction,
   deleteCommentAction,
+  reportCommentAction,
 } from "./actions";
 import { ChatBubbleIcon, TrashIcon } from "@radix-ui/react-icons";
 import {
@@ -37,6 +38,7 @@ import { DID } from "@/lib/data/atproto/did";
 import { InputLengthIndicator } from "@/lib/components/input-length-indicator";
 import { MAX_COMMENT_LENGTH } from "@/lib/data/db/constants";
 import type { CommentModel } from "@/lib/data/db/comment";
+import { EllipsisDropdown } from "@/app/(app)/_components/ellipsis-dropdown";
 
 export type CommentClientProps = Pick<
   CommentModel,
@@ -93,6 +95,25 @@ export function CommentClientWrapperWithToolbar({
             </Button>
           </SimpleTooltip>
           {hasAuthored ? <DeleteCommentButton rkey={rkey} /> : null}
+          <SimpleTooltip content="action-menu" side="bottom">
+            <EllipsisDropdown
+              isAuthor={false}
+              //TODO: implement onDeleteAction
+              onDeleteAction={async () => {
+                return;
+              }}
+              //TODO: fix this, it's not working
+              onReportAction={async (creatorComment, reportReason) => {
+                reportCommentAction.bind(null, {
+                  creatorComment: creatorComment,
+                  reportReason: reportReason,
+                  authorDid: authorDid,
+                  cid: cid,
+                  rkey: rkey,
+                });
+              }}
+            />
+          </SimpleTooltip>
         </div>
       </div>
       {showNewComment ? (
diff --git a/packages/frontpage/lib/components/ui/select.tsx b/packages/frontpage/lib/components/ui/select.tsx
new file mode 100644
index 00000000..ac2a8f2b
--- /dev/null
+++ b/packages/frontpage/lib/components/ui/select.tsx
@@ -0,0 +1,164 @@
+"use client"
+
+import * as React from "react"
+import {
+  CaretSortIcon,
+  CheckIcon,
+  ChevronDownIcon,
+  ChevronUpIcon,
+} from "@radix-ui/react-icons"
+import * as SelectPrimitive from "@radix-ui/react-select"
+
+import { cn } from "@/lib/utils"
+
+const Select = SelectPrimitive.Root
+
+const SelectGroup = SelectPrimitive.Group
+
+const SelectValue = SelectPrimitive.Value
+
+const SelectTrigger = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Trigger>
+>(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Trigger
+    ref={ref}
+    className={cn(
+      "flex h-9 w-full items-center justify-between whitespace-nowrap rounded-md border border-input bg-transparent px-3 py-2 text-sm shadow-sm ring-offset-background placeholder:text-muted-foreground focus:outline-none focus:ring-1 focus:ring-ring disabled:cursor-not-allowed disabled:opacity-50 [&>span]:line-clamp-1",
+      className
+    )}
+    {...props}
+  >
+    {children}
+    <SelectPrimitive.Icon asChild>
+      <CaretSortIcon className="h-4 w-4 opacity-50" />
+    </SelectPrimitive.Icon>
+  </SelectPrimitive.Trigger>
+))
+SelectTrigger.displayName = SelectPrimitive.Trigger.displayName
+
+const SelectScrollUpButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollUpButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollUpButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollUpButton
+    ref={ref}
+    className={cn(
+      "flex cursor-default items-center justify-center py-1",
+      className
+    )}
+    {...props}
+  >
+    <ChevronUpIcon />
+  </SelectPrimitive.ScrollUpButton>
+))
+SelectScrollUpButton.displayName = SelectPrimitive.ScrollUpButton.displayName
+
+const SelectScrollDownButton = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.ScrollDownButton>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.ScrollDownButton>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.ScrollDownButton
+    ref={ref}
+    className={cn(
+      "flex cursor-default items-center justify-center py-1",
+      className
+    )}
+    {...props}
+  >
+    <ChevronDownIcon />
+  </SelectPrimitive.ScrollDownButton>
+))
+SelectScrollDownButton.displayName =
+  SelectPrimitive.ScrollDownButton.displayName
+
+const SelectContent = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Content>
+>(({ className, children, position = "popper", ...props }, ref) => (
+  <SelectPrimitive.Portal>
+    <SelectPrimitive.Content
+      ref={ref}
+      className={cn(
+        "relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border bg-popover text-popover-foreground shadow-md data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+        position === "popper" &&
+          "data-[side=bottom]:translate-y-1 data-[side=left]:-translate-x-1 data-[side=right]:translate-x-1 data-[side=top]:-translate-y-1",
+        className
+      )}
+      position={position}
+      {...props}
+    >
+      <SelectScrollUpButton />
+      <SelectPrimitive.Viewport
+        className={cn(
+          "p-1",
+          position === "popper" &&
+            "h-[var(--radix-select-trigger-height)] w-full min-w-[var(--radix-select-trigger-width)]"
+        )}
+      >
+        {children}
+      </SelectPrimitive.Viewport>
+      <SelectScrollDownButton />
+    </SelectPrimitive.Content>
+  </SelectPrimitive.Portal>
+))
+SelectContent.displayName = SelectPrimitive.Content.displayName
+
+const SelectLabel = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Label>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Label>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.Label
+    ref={ref}
+    className={cn("px-2 py-1.5 text-sm font-semibold", className)}
+    {...props}
+  />
+))
+SelectLabel.displayName = SelectPrimitive.Label.displayName
+
+const SelectItem = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Item>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Item>
+>(({ className, children, ...props }, ref) => (
+  <SelectPrimitive.Item
+    ref={ref}
+    className={cn(
+      "relative flex w-full cursor-default select-none items-center rounded-sm py-1.5 pl-2 pr-8 text-sm outline-none focus:bg-accent focus:text-accent-foreground data-[disabled]:pointer-events-none data-[disabled]:opacity-50",
+      className
+    )}
+    {...props}
+  >
+    <span className="absolute right-2 flex h-3.5 w-3.5 items-center justify-center">
+      <SelectPrimitive.ItemIndicator>
+        <CheckIcon className="h-4 w-4" />
+      </SelectPrimitive.ItemIndicator>
+    </span>
+    <SelectPrimitive.ItemText>{children}</SelectPrimitive.ItemText>
+  </SelectPrimitive.Item>
+))
+SelectItem.displayName = SelectPrimitive.Item.displayName
+
+const SelectSeparator = React.forwardRef<
+  React.ElementRef<typeof SelectPrimitive.Separator>,
+  React.ComponentPropsWithoutRef<typeof SelectPrimitive.Separator>
+>(({ className, ...props }, ref) => (
+  <SelectPrimitive.Separator
+    ref={ref}
+    className={cn("-mx-1 my-1 h-px bg-muted", className)}
+    {...props}
+  />
+))
+SelectSeparator.displayName = SelectPrimitive.Separator.displayName
+
+export {
+  Select,
+  SelectGroup,
+  SelectValue,
+  SelectTrigger,
+  SelectContent,
+  SelectLabel,
+  SelectItem,
+  SelectSeparator,
+  SelectScrollUpButton,
+  SelectScrollDownButton,
+}
diff --git a/packages/frontpage/lib/constants.ts b/packages/frontpage/lib/constants.ts
index 59b2de54..a527e9e9 100644
--- a/packages/frontpage/lib/constants.ts
+++ b/packages/frontpage/lib/constants.ts
@@ -1 +1,8 @@
 export const FRONTPAGE_ATPROTO_HANDLE = "frontpage.fyi";
+
+export enum ReportReason {
+  SPAM = "spam",
+  MISLEADING = "misleading",
+  SEXUAL = "sexual",
+  OTHER = "other",
+}
diff --git a/packages/frontpage/lib/data/db/comment.ts b/packages/frontpage/lib/data/db/comment.ts
index c51c058c..05f2adf0 100644
--- a/packages/frontpage/lib/data/db/comment.ts
+++ b/packages/frontpage/lib/data/db/comment.ts
@@ -232,3 +232,27 @@ export function shouldHideComment(comment: CommentModel) {
     comment.children.length === 0
   );
 }
+
+type ModerateCommentInput = {
+  rkey: string;
+  authorDid: DID;
+  cid: string;
+  hide: boolean;
+};
+export async function moderateComment({
+  rkey,
+  authorDid,
+  cid,
+  hide,
+}: ModerateCommentInput) {
+  await db
+    .update(schema.Comment)
+    .set({ status: hide ? "moderator_hidden" : "live" })
+    .where(
+      and(
+        eq(schema.Comment.rkey, rkey),
+        eq(schema.Comment.authorDid, authorDid),
+        eq(schema.Comment.cid, cid),
+      ),
+    );
+}
diff --git a/packages/frontpage/lib/data/db/moderation.ts b/packages/frontpage/lib/data/db/moderation.ts
index 3695478f..d96081c3 100644
--- a/packages/frontpage/lib/data/db/moderation.ts
+++ b/packages/frontpage/lib/data/db/moderation.ts
@@ -1,5 +1,5 @@
-import { db } from "@/lib/db";
 import "server-only";
+import { db } from "@/lib/db";
 import * as schema from "@/lib/schema";
 
 export type ModerationEventDTO = {
@@ -19,4 +19,5 @@ export async function createModerationEvent(
   moderationEvent: ModerationEventDTO,
 ) {
   await db.insert(schema.ModerationEvent).values(moderationEvent);
+  return;
 }
diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index dd6c38aa..f1c9ab4a 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -256,3 +256,28 @@ export async function unauthed_deletePost({
   });
   console.log("Done deleting post transaction");
 }
+
+type ModeratePostInput = {
+  rkey: string;
+  authorDid: DID;
+  cid: string;
+  hide: boolean;
+};
+export async function moderatePost({
+  rkey,
+  authorDid,
+  cid,
+  hide,
+}: ModeratePostInput) {
+  console.log("Moderating post", rkey, hide);
+  await db
+    .update(schema.Post)
+    .set({ status: hide ? "moderator_hidden" : "live" })
+    .where(
+      and(
+        eq(schema.Post.rkey, rkey),
+        eq(schema.Post.authorDid, authorDid),
+        eq(schema.Post.cid, cid),
+      ),
+    );
+}
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index ab8b0db0..11f6d1d6 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -1,4 +1,5 @@
 import "server-only";
+
 import { db } from "@/lib/db";
 import * as schema from "@/lib/schema";
 import { cache } from "react";
diff --git a/packages/frontpage/lib/data/db/user.ts b/packages/frontpage/lib/data/db/user.ts
new file mode 100644
index 00000000..c52a824d
--- /dev/null
+++ b/packages/frontpage/lib/data/db/user.ts
@@ -0,0 +1,16 @@
+import { db } from "@/lib/db";
+import { eq } from "drizzle-orm";
+import { DID } from "../atproto/did";
+import * as schema from "@/lib/schema";
+
+type ModerateUserInput = {
+  userDid: DID;
+  hide: boolean;
+};
+
+export async function moderateUser({ userDid, hide }: ModerateUserInput) {
+  await db
+    .update(schema.LabelledProfile)
+    .set({ isHidden: hide })
+    .where(eq(schema.LabelledProfile.did, userDid));
+}
diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index 870b3940..f6e76786 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -27,6 +27,7 @@
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
     "@radix-ui/react-scroll-area": "^1.1.0",
+    "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-toast": "^1.2.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ab48925f..68060f0e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -150,6 +150,9 @@ importers:
       '@radix-ui/react-scroll-area':
         specifier: ^1.1.0
         version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-select':
+        specifier: ^2.1.1
+        version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-slot':
         specifier: ^1.1.0
         version: 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
@@ -2059,6 +2062,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-select@2.1.1':
+    resolution: {integrity: sha512-8iRDfyLtzxlprOo9IicnzvpsO1wNCkuwzzCM+Z5Rb5tNOpCdMvcc2AkzX0Fz+Tz9v6NJ5B/7EEgyZveo4FBRfQ==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-slot@1.1.0':
     resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
     peerDependencies:
@@ -2143,6 +2159,15 @@ packages:
       '@types/react':
         optional: true
 
+  '@radix-ui/react-use-previous@1.1.0':
+    resolution: {integrity: sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==}
+    peerDependencies:
+      '@types/react': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+
   '@radix-ui/react-use-rect@1.1.0':
     resolution: {integrity: sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==}
     peerDependencies:
@@ -8073,6 +8098,35 @@ snapshots:
       '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
+  '@radix-ui/react-select@2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+    dependencies:
+      '@radix-ui/number': 1.1.0
+      '@radix-ui/primitive': 1.1.0
+      '@radix-ui/react-collection': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-dismissable-layer': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-guards': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-focus-scope': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-id': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-popper': 1.2.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-portal': 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-slot': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-use-previous': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-visually-hidden': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      aria-hidden: 1.2.4
+      react: 19.0.0-rc-f994737d14-20240522
+      react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
+      react-remove-scroll: 2.5.7(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
+    optionalDependencies:
+      '@types/react': 18.3.10
+      '@types/react-dom': 18.3.0
+
   '@radix-ui/react-slot@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
@@ -8162,6 +8216,12 @@ snapshots:
     optionalDependencies:
       '@types/react': 18.3.10
 
+  '@radix-ui/react-use-previous@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
+    dependencies:
+      react: 19.0.0-rc-f994737d14-20240522
+    optionalDependencies:
+      '@types/react': 18.3.10
+
   '@radix-ui/react-use-rect@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/rect': 1.1.0
@@ -10040,7 +10100,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3

From e64d956380399d25cc7ea062a04f3860e437fb78 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Mon, 30 Sep 2024 18:32:47 +0100
Subject: [PATCH 20/43] better server actions

---
 packages/frontpage/README.md                  |  2 +-
 .../(app)/_components/ellipsis-dropdown.tsx   | 94 ++++++++++---------
 .../app/(app)/_components/post-card.tsx       | 27 ++++--
 .../moderation/_components/report-card.tsx    | 27 +++---
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  | 32 +++++--
 .../[postRkey]/_lib/comment-client.tsx        | 22 ++---
 packages/frontpage/lib/data/db/post.ts        | 22 +++++
 7 files changed, 135 insertions(+), 91 deletions(-)

diff --git a/packages/frontpage/README.md b/packages/frontpage/README.md
index 6ed84acd..49503b9a 100644
--- a/packages/frontpage/README.md
+++ b/packages/frontpage/README.md
@@ -2,7 +2,7 @@
 
 Frontpage AppView and frontend client.
 
-## Running locally
+<!-- ## Running locally -->
 
 If you just need to work on the app in a logged-out state, then you just need to run the following:
 
diff --git a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
index d691b528..d7c82d2d 100644
--- a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
+++ b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
@@ -35,10 +35,7 @@ import {
 import { ReportReason } from "@/lib/constants";
 
 type EllipsisDropdownProps = {
-  onReportAction: (
-    creatorComment: string,
-    reportReason: ReportReason,
-  ) => Promise<void>;
+  onReportAction: (formData: FormData) => Promise<void>;
   onDeleteAction: () => Promise<void>;
   isAuthor: boolean;
 };
@@ -49,8 +46,6 @@ export function EllipsisDropdown({
   isAuthor,
 }: EllipsisDropdownProps) {
   const [open, setOpen] = React.useState(false);
-  const [input, setInput] = React.useState("");
-  const [reportReason, setReportReason] = React.useState("SPAM");
 
   return (
     <DropdownMenu open={open} onOpenChange={setOpen}>
@@ -80,51 +75,60 @@ export function EllipsisDropdown({
                   This will report the post. This action cannot be undone.
                 </AlertDialogDescription>
               </AlertDialogHeader>
-              <Select value={reportReason} onValueChange={setReportReason}>
-                <SelectTrigger className="w-[180px]">
-                  <SelectValue placeholder="Please select one" />
-                </SelectTrigger>
-                <SelectContent>
-                  {Object.keys(ReportReason).map((reason) => (
-                    <SelectItem key={reason} value={reason}>
-                      {reason}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-              <Textarea
-                value={input}
-                onChange={(event) => {
-                  setInput(event.target.value);
-                }}
-                id="textArea"
-                name="reportReason"
-                placeholder="Enter your report reason here..."
-                // disabled={isPending}
-                className="resize-y flex-1"
-              />
-              <AlertDialogFooter>
-                <AlertDialogAction
-                  onClick={() => {
-                    console.log(reportReason);
-                    void onReportAction(input, reportReason as ReportReason);
+              <form
+                action={async (formData) => {
+                  try {
+                    await onReportAction(formData);
+                  } catch (_) {
                     toast({
-                      title: "Post reported",
+                      title: "Something went wrong",
                       type: "foreground",
                     });
-                    setOpen(false);
-                  }}
-                >
-                  Confirm
-                </AlertDialogAction>
-                <AlertDialogCancel onClick={() => setOpen(false)}>
-                  Cancel
-                </AlertDialogCancel>
-              </AlertDialogFooter>
+                    return;
+                  }
+                  toast({
+                    title: "Post reported",
+                    type: "foreground",
+                  });
+                  setOpen(false);
+                }}
+              >
+                <Select name="reportReason">
+                  <SelectTrigger className="w-[180px]">
+                    <SelectValue placeholder="Please select one" />
+                  </SelectTrigger>
+                  <SelectContent>
+                    {Object.keys(ReportReason).map((reason) => (
+                      <SelectItem key={reason} value={reason}>
+                        {reason}
+                      </SelectItem>
+                    ))}
+                  </SelectContent>
+                </Select>
+                <Textarea
+                  id="textArea"
+                  name="creatorComment"
+                  placeholder="Enter your report reason here..."
+                  // disabled={isPending}
+                  className="resize-y flex-1"
+                  maxLength={250}
+                />
+                <AlertDialogFooter>
+                  <Button variant="success" type="submit">
+                    Confirm
+                  </Button>
+                  <AlertDialogCancel
+                    type="button"
+                    onClick={() => setOpen(false)}
+                  >
+                    Cancel
+                  </AlertDialogCancel>
+                </AlertDialogFooter>
+              </form>
             </AlertDialogContent>
           </AlertDialog>
           {/* TODO: delete the true bit when done */}
-          {isAuthor || true ? (
+          {isAuthor ? (
             <AlertDialog>
               <AlertDialogTrigger asChild>
                 <DropdownMenuItem
diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 3456a6ed..8928ad8b 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -4,7 +4,7 @@ import { getVoteForPost } from "@/lib/data/db/vote";
 import { ensureUser, getUser } from "@/lib/data/user";
 import { TimeAgo } from "@/lib/components/time-ago";
 import { VoteButton } from "./vote-button";
-import { PostCollection } from "@/lib/data/atproto/post";
+import { PostCollection, deletePost } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
@@ -115,19 +115,30 @@ export async function PostCard({
           {(await getUser()) ? (
             <div className="ml-auto">
               <EllipsisDropdown
-                isAuthor={false}
+                isAuthor={(await getUser())?.did === author}
                 onDeleteAction={async () => {
                   "use server";
-                  console.log("Deleting post", rkey);
-                  return;
+                  await ensureUser();
+                  await deletePost(rkey);
                 }}
-                onReportAction={async (
-                  creatorComment: string,
-                  reportReason: ReportReason,
-                ) => {
+                onReportAction={async (formData: FormData) => {
                   "use server";
                   const user = await ensureUser();
 
+                  const creatorComment = formData.get(
+                    "creatorComment",
+                  ) as string;
+                  const reportReason = formData.get(
+                    "reportReason",
+                  ) as ReportReason;
+
+                  if (
+                    typeof creatorComment !== "string" ||
+                    !reportReason ||
+                    creatorComment.length >= 250
+                  ) {
+                    throw new Error("Missing creatorComment or reportReason");
+                  }
                   await createReport({
                     subjectUri: `at://${author}/${PostCollection}/${rkey}`,
                     subjectDid: author,
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index 4f07801f..866773b7 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -13,6 +13,7 @@ import { UserHandle } from "./user-handle";
 import { PostCollection } from "@/lib/data/atproto/post";
 import { CommentCollection } from "@/lib/data/atproto/comment";
 import Link from "next/link";
+import { getPostFromComment } from "@/lib/data/db/post";
 
 const statusClasses = {
   pending: "bg-yellow-500 text-yellow-900",
@@ -20,19 +21,23 @@ const statusClasses = {
   rejected: "bg-red-500 text-red-900",
 };
 
-const createLink = (
+const createLink = async (
   collection?: string | null,
-  postAuthor?: string | null,
-  postRkey?: string | null,
-  commentAuthor?: string | null,
-  commentRkey?: string | null,
+  author?: DID | null,
+  rkey?: string | null,
 ) => {
   if (collection === PostCollection) {
-    return `/post/${postAuthor}/${postRkey}/`;
+    return `/post/${author}/${rkey}/`;
   } else if (collection === CommentCollection) {
-    return `/post/${postAuthor}/${postRkey}/${commentAuthor}/${commentRkey}/`;
+    console.log(rkey, author);
+    const { postRkey, postAuthor } = (await getPostFromComment({
+      rkey: rkey!,
+      did: author!,
+    }))!;
+    console.log(postRkey, postAuthor);
+    return `/post/${postAuthor}/${postRkey}/${author}/${rkey}/`;
   } else {
-    return `/profile/${postAuthor}/`;
+    return `/profile/${author}/`;
   }
 };
 
@@ -110,12 +115,10 @@ export async function ReportCard({ report }: { report: Report }) {
           </form>
           <Link
             className="ml-2"
-            href={createLink(
+            href={await createLink(
               report.subjectCollection,
-              report.subjectDid,
+              report.subjectDid as DID,
               report.subjectRkey,
-              report.subjectDid,
-              report.subjectCid,
             )}
             target="_blank"
           >
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index 0ff40fd3..7a968b2c 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -15,6 +15,7 @@ import { createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
 import { revalidatePath } from "next/cache";
+import { string } from "zod";
 
 export async function createCommentAction(
   input: { parentRkey?: string; postRkey: string; postAuthorDid: DID },
@@ -75,18 +76,29 @@ export async function deleteCommentAction(rkey: string) {
   await deleteComment(rkey);
 }
 
-export async function reportCommentAction(input: {
-  creatorComment: string;
-  reportReason: ReportReason;
-  authorDid: DID;
-  rkey: string;
-  cid: string;
-}) {
+export async function reportCommentAction(
+  input: {
+    authorDid: DID;
+    rkey: string;
+    cid: string;
+  },
+  formData: FormData,
+) {
   console.log("Reporting comment", input);
+
   const user = await ensureUser();
+  const creatorComment = formData.get("creatorComment") as string;
+  const reportReason = formData.get("reportReason") as ReportReason;
+
+  if (
+    typeof creatorComment !== "string" ||
+    !reportReason ||
+    creatorComment.length >= 250
+  ) {
+    throw new Error("Missing creatorComment or reportReason");
+  }
 
   await createReport({
-    //TODO: double check this is the correct uri
     subjectUri: `at://${input.authorDid}/${CommentCollection}/${input.rkey}`,
     subjectDid: input.authorDid,
     subjectCollection: CommentCollection,
@@ -94,8 +106,8 @@ export async function reportCommentAction(input: {
     subjectCid: input.cid,
     createdBy: user.did,
     createdAt: new Date(),
-    creatorComment: input.creatorComment,
-    reportReason: input.reportReason,
+    creatorComment: creatorComment,
+    reportReason: reportReason,
     status: "pending",
   });
 }
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
index 7b0ae301..03b6d9c8 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
@@ -97,21 +97,13 @@ export function CommentClientWrapperWithToolbar({
           {hasAuthored ? <DeleteCommentButton rkey={rkey} /> : null}
           <SimpleTooltip content="action-menu" side="bottom">
             <EllipsisDropdown
-              isAuthor={false}
-              //TODO: implement onDeleteAction
-              onDeleteAction={async () => {
-                return;
-              }}
-              //TODO: fix this, it's not working
-              onReportAction={async (creatorComment, reportReason) => {
-                reportCommentAction.bind(null, {
-                  creatorComment: creatorComment,
-                  reportReason: reportReason,
-                  authorDid: authorDid,
-                  cid: cid,
-                  rkey: rkey,
-                });
-              }}
+              isAuthor={hasAuthored}
+              onDeleteAction={deleteCommentAction.bind(null, rkey)}
+              onReportAction={reportCommentAction.bind(null, {
+                authorDid: authorDid,
+                cid: cid,
+                rkey: rkey,
+              })}
             />
           </SimpleTooltip>
         </div>
diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index f1c9ab4a..85f03681 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -281,3 +281,25 @@ export async function moderatePost({
       ),
     );
 }
+
+export async function getPostFromComment({
+  rkey,
+  did,
+}: {
+  rkey: string;
+  did: DID;
+}) {
+  const [join] = await db
+    .select()
+    .from(schema.Comment)
+    .where(
+      and(eq(schema.Comment.rkey, rkey), eq(schema.Comment.authorDid, did)),
+    )
+    .leftJoin(schema.Post, eq(schema.Comment.postId, schema.Post.id));
+
+  if (!join || !join.posts) {
+    return null;
+  }
+
+  return { postRkey: join.posts.rkey, postAuthor: join.posts.authorDid };
+}

From fb90c03cf7d5807a3ee17cbefde159a449f2df96 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Tue, 1 Oct 2024 16:49:41 +0100
Subject: [PATCH 21/43] reusable ellipsis component takes children

---
 .../app/(app)/_components/delete-button.tsx   |  67 ++++++
 .../(app)/_components/ellipsis-dropdown.tsx   | 191 +++---------------
 .../app/(app)/_components/post-card.tsx       | 100 +++++----
 .../app/(app)/_components/report-button.tsx   | 175 ++++++++++++++--
 .../moderation/_components/report-card.tsx    |  13 +-
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  |   7 +-
 .../[postRkey]/_lib/comment-client.tsx        |  58 ------
 .../[postRkey]/_lib/delete-post-button.tsx    |  64 ------
 .../post/[postAuthor]/[postRkey]/layout.tsx   |   7 -
 .../frontpage/lib/components/ui/separator.tsx |  31 +++
 .../lib/components/user-hover-card-client.tsx |   8 +
 .../lib/components/user-hover-card.tsx        |  35 ++++
 packages/frontpage/lib/data/db/report.ts      |  45 +++--
 packages/frontpage/package.json               |   1 +
 14 files changed, 431 insertions(+), 371 deletions(-)
 create mode 100644 packages/frontpage/app/(app)/_components/delete-button.tsx
 delete mode 100644 packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/delete-post-button.tsx
 create mode 100644 packages/frontpage/lib/components/ui/separator.tsx

diff --git a/packages/frontpage/app/(app)/_components/delete-button.tsx b/packages/frontpage/app/(app)/_components/delete-button.tsx
new file mode 100644
index 00000000..b8abe05d
--- /dev/null
+++ b/packages/frontpage/app/(app)/_components/delete-button.tsx
@@ -0,0 +1,67 @@
+"use client";
+
+import {
+  AlertDialogHeader,
+  AlertDialogFooter,
+} from "@/lib/components/ui/alert-dialog";
+import { toast } from "@/lib/components/ui/use-toast";
+import {
+  AlertDialog,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogAction,
+  AlertDialogCancel,
+} from "@/lib/components/ui/alert-dialog";
+import { DropdownMenuItem } from "@/lib/components/ui/dropdown-menu";
+import { Trash } from "lucide-react";
+import { useEllipsisDropdownContext } from "./ellipsis-dropdown";
+
+type DeleteButtonProps = {
+  deleteAction: () => Promise<void>;
+};
+
+export function DeleteButton({ deleteAction }: DeleteButtonProps) {
+  const ellipsisDropdownContext = useEllipsisDropdownContext();
+  return (
+    <AlertDialog>
+      <AlertDialogTrigger asChild>
+        <DropdownMenuItem
+          className="text-red-600"
+          onSelect={(e) => {
+            e.preventDefault();
+          }}
+        >
+          <Trash className="mr-2 h-4 w-4" />
+          Delete
+        </DropdownMenuItem>
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This will delete your entry. This action cannot be undone.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <AlertDialogFooter className="mt-3">
+          <AlertDialogAction
+            onClick={() => {
+              void deleteAction();
+              toast({
+                title: "Your entry will be deleted shortly",
+                type: "foreground",
+              });
+              ellipsisDropdownContext.close();
+            }}
+          >
+            Confirm
+          </AlertDialogAction>
+          <AlertDialogCancel onClick={() => ellipsisDropdownContext.close()}>
+            Cancel
+          </AlertDialogCancel>
+        </AlertDialogFooter>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}
diff --git a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
index d7c82d2d..28f25975 100644
--- a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
+++ b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
@@ -1,175 +1,50 @@
 "use client";
 
-import * as React from "react";
-import { MoreHorizontal, Trash } from "lucide-react";
 import { Button } from "@/lib/components/ui/button";
 import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuGroup,
-  DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuTrigger,
 } from "@/lib/components/ui/dropdown-menu";
-import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-} from "@/lib/components/ui/alert-dialog";
-import { toast } from "@/lib/components/ui/use-toast";
-import { Textarea } from "@/lib/components/ui/textarea";
-import {
-  Select,
-  SelectTrigger,
-  SelectValue,
-  SelectContent,
-  SelectItem,
-} from "@/lib/components/ui/select";
-import { ReportReason } from "@/lib/constants";
+import { MoreHorizontal } from "lucide-react";
+import React, { ReactNode } from "react";
 
-type EllipsisDropdownProps = {
-  onReportAction: (formData: FormData) => Promise<void>;
-  onDeleteAction: () => Promise<void>;
-  isAuthor: boolean;
-};
+interface EllipsisDropdownProps {
+  children: ReactNode;
+}
 
-export function EllipsisDropdown({
-  onReportAction,
-  onDeleteAction,
-  isAuthor,
-}: EllipsisDropdownProps) {
+const EllipsisDropdownContext = React.createContext<null | {
+  close: () => void;
+}>(null);
+
+export function EllipsisDropdown({ children }: EllipsisDropdownProps) {
   const [open, setOpen] = React.useState(false);
 
   return (
-    <DropdownMenu open={open} onOpenChange={setOpen}>
-      <DropdownMenuTrigger asChild>
-        <Button variant="ghost" size="sm">
-          <MoreHorizontal />
-        </Button>
-      </DropdownMenuTrigger>
-      <DropdownMenuContent align="end" className="w-[200px]">
-        <DropdownMenuLabel>Actions</DropdownMenuLabel>
-        <DropdownMenuGroup>
-          <AlertDialog>
-            <AlertDialogTrigger asChild>
-              <DropdownMenuItem
-                onSelect={(e) => {
-                  e.preventDefault();
-                }}
-              >
-                <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
-                Report
-              </DropdownMenuItem>
-            </AlertDialogTrigger>
-            <AlertDialogContent>
-              <AlertDialogHeader>
-                <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-                <AlertDialogDescription>
-                  This will report the post. This action cannot be undone.
-                </AlertDialogDescription>
-              </AlertDialogHeader>
-              <form
-                action={async (formData) => {
-                  try {
-                    await onReportAction(formData);
-                  } catch (_) {
-                    toast({
-                      title: "Something went wrong",
-                      type: "foreground",
-                    });
-                    return;
-                  }
-                  toast({
-                    title: "Post reported",
-                    type: "foreground",
-                  });
-                  setOpen(false);
-                }}
-              >
-                <Select name="reportReason">
-                  <SelectTrigger className="w-[180px]">
-                    <SelectValue placeholder="Please select one" />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {Object.keys(ReportReason).map((reason) => (
-                      <SelectItem key={reason} value={reason}>
-                        {reason}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-                <Textarea
-                  id="textArea"
-                  name="creatorComment"
-                  placeholder="Enter your report reason here..."
-                  // disabled={isPending}
-                  className="resize-y flex-1"
-                  maxLength={250}
-                />
-                <AlertDialogFooter>
-                  <Button variant="success" type="submit">
-                    Confirm
-                  </Button>
-                  <AlertDialogCancel
-                    type="button"
-                    onClick={() => setOpen(false)}
-                  >
-                    Cancel
-                  </AlertDialogCancel>
-                </AlertDialogFooter>
-              </form>
-            </AlertDialogContent>
-          </AlertDialog>
-          {/* TODO: delete the true bit when done */}
-          {isAuthor ? (
-            <AlertDialog>
-              <AlertDialogTrigger asChild>
-                <DropdownMenuItem
-                  className="text-red-600"
-                  onSelect={(e) => {
-                    e.preventDefault();
-                  }}
-                >
-                  <Trash className="mr-2 h-4 w-4" />
-                  Delete
-                </DropdownMenuItem>
-              </AlertDialogTrigger>
-              <AlertDialogContent>
-                <AlertDialogHeader>
-                  <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-                  <AlertDialogDescription>
-                    This will delete the post. This action cannot be undone.
-                  </AlertDialogDescription>
-                </AlertDialogHeader>
-                <AlertDialogFooter>
-                  <AlertDialogAction
-                    onClick={() => {
-                      void onDeleteAction();
-                      toast({
-                        title: "Post deleted",
-                        type: "foreground",
-                      });
-                      setOpen(false);
-                    }}
-                  >
-                    Confirm
-                  </AlertDialogAction>
-                  <AlertDialogCancel onClick={() => setOpen(false)}>
-                    Cancel
-                  </AlertDialogCancel>
-                </AlertDialogFooter>
-              </AlertDialogContent>
-            </AlertDialog>
-          ) : null}
-        </DropdownMenuGroup>
-      </DropdownMenuContent>
-    </DropdownMenu>
+    <EllipsisDropdownContext.Provider value={{ close: () => setOpen(false) }}>
+      <DropdownMenu open={open} onOpenChange={setOpen}>
+        <DropdownMenuTrigger asChild>
+          <Button variant="ghost" size="sm">
+            <MoreHorizontal />
+          </Button>
+        </DropdownMenuTrigger>
+        <DropdownMenuContent align="end" className="w-[200px]">
+          <DropdownMenuLabel>Actions</DropdownMenuLabel>
+          <DropdownMenuGroup>{children}</DropdownMenuGroup>
+        </DropdownMenuContent>
+      </DropdownMenu>
+    </EllipsisDropdownContext.Provider>
   );
 }
+
+export const useEllipsisDropdownContext = () => {
+  const context = React.useContext(EllipsisDropdownContext);
+  if (!context) {
+    throw new Error(
+      "useEllipsisDropdownContext must be used within a EllipsisDropdown",
+    );
+  }
+  return context;
+};
diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 8928ad8b..3060f68b 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -11,6 +11,9 @@ import type { DID } from "@/lib/data/atproto/did";
 import { createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
 import { ReportReason } from "@/lib/constants";
+import { revalidatePath } from "next/cache";
+import { ReportButton } from "./report-button";
+import { DeleteButton } from "./delete-button";
 
 type PostProps = {
   id: number;
@@ -114,45 +117,20 @@ export async function PostCard({
 
           {(await getUser()) ? (
             <div className="ml-auto">
-              <EllipsisDropdown
-                isAuthor={(await getUser())?.did === author}
-                onDeleteAction={async () => {
-                  "use server";
-                  await ensureUser();
-                  await deletePost(rkey);
-                }}
-                onReportAction={async (formData: FormData) => {
-                  "use server";
-                  const user = await ensureUser();
-
-                  const creatorComment = formData.get(
-                    "creatorComment",
-                  ) as string;
-                  const reportReason = formData.get(
-                    "reportReason",
-                  ) as ReportReason;
-
-                  if (
-                    typeof creatorComment !== "string" ||
-                    !reportReason ||
-                    creatorComment.length >= 250
-                  ) {
-                    throw new Error("Missing creatorComment or reportReason");
-                  }
-                  await createReport({
-                    subjectUri: `at://${author}/${PostCollection}/${rkey}`,
-                    subjectDid: author,
-                    subjectCollection: PostCollection,
-                    subjectRkey: rkey,
-                    subjectCid: cid,
-                    createdBy: user.did,
-                    createdAt: new Date(),
-                    creatorComment,
-                    reportReason,
-                    status: "pending",
-                  });
-                }}
-              />
+              <EllipsisDropdown>
+                <ReportButton
+                  reportAction={ReportPostAction.bind(null, {
+                    rkey,
+                    cid,
+                    author,
+                  })}
+                />
+                {(await getUser())?.did === author ? (
+                  <DeleteButton
+                    deleteAction={DeletePostAction.bind(null, rkey)}
+                  />
+                ) : null}
+              </EllipsisDropdown>
             </div>
           ) : null}
         </div>
@@ -160,3 +138,47 @@ export async function PostCard({
     </article>
   );
 }
+
+export async function DeletePostAction(rkey: string) {
+  "use server";
+  await ensureUser();
+  await deletePost(rkey);
+
+  revalidatePath("/");
+}
+
+export async function ReportPostAction(
+  input: {
+    rkey: string;
+    cid: string;
+    author: DID;
+  },
+  formData: FormData,
+) {
+  "use server";
+  const user = await ensureUser();
+
+  const creatorComment = formData.get("creatorComment") as string;
+  const reportReason = formData.get("reportReason") as ReportReason;
+
+  if (
+    typeof creatorComment !== "string" ||
+    !reportReason ||
+    creatorComment.length >= 250
+  ) {
+    throw new Error("Missing creatorComment or reportReason");
+  }
+  await createReport({
+    subjectUri: `at://${input.author}/${PostCollection}/${input.rkey}`,
+    subjectDid: input.author,
+    subjectCollection: PostCollection,
+    subjectRkey: input.rkey,
+    subjectCid: input.cid,
+    createdBy: user.did,
+    createdAt: new Date(),
+    creatorComment,
+    reportReason,
+    status: "pending",
+  });
+  revalidatePath("/");
+}
diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
index a0723c33..ee9fdda8 100644
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -1,20 +1,171 @@
+"use client";
+
+import {
+  AlertDialogHeader,
+  AlertDialogFooter,
+  AlertDialog,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogCancel,
+} from "@/lib/components/ui/alert-dialog";
 import { Button } from "@/lib/components/ui/button";
-import { cn } from "@/lib/utils";
+import { Textarea } from "@/lib/components/ui/textarea";
+import { toast } from "@/lib/components/ui/use-toast";
+import { ReportReason } from "@/lib/constants";
 import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
+import { useEllipsisDropdownContext } from "./ellipsis-dropdown";
+import { DropdownMenuItem } from "@/lib/components/ui/dropdown-menu";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/lib/components/ui/select";
+
+interface ReportButtonProps {
+  reportAction: (formData: FormData) => Promise<void>;
+}
 
-export type VoteButtonState = "voted" | "unvoted" | "authored";
+export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
+  return (
+    <AlertDialog>
+      <AlertDialogTrigger asChild>
+        <Button size="icon" variant="outline">
+          <ExclamationTriangleIcon className="h-4 w-4 text-red-500" />
+        </Button>
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This will report the entry. This action cannot be undone.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <form
+          action={async (formData) => {
+            try {
+              await reportAction(formData);
+            } catch (_) {
+              toast({
+                title: "Something went wrong",
+                type: "foreground",
+              });
+              return;
+            }
+            toast({
+              title: "Report submitted",
+              type: "foreground",
+            });
+          }}
+        >
+          <Select name="reportReason">
+            <SelectTrigger className="w-[180px]">
+              <SelectValue placeholder="Please select one" />
+            </SelectTrigger>
+            <SelectContent>
+              {Object.keys(ReportReason).map((reason) => (
+                <SelectItem key={reason} value={reason}>
+                  {reason}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+          <Textarea
+            id="textArea"
+            name="creatorComment"
+            placeholder="Enter your report reason here..."
+            // disabled={isPending}
+            className="resize-y my-3"
+            maxLength={250}
+          />
+          <AlertDialogFooter>
+            <Button variant="success" type="submit">
+              Confirm
+            </Button>
+            <AlertDialogCancel type="button">Cancel</AlertDialogCancel>
+          </AlertDialogFooter>
+        </form>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}
 
-type VoteButtonProps = {
-  reportAction: () => Promise<void>;
-};
+export function ReportButton({ reportAction }: ReportButtonProps) {
+  const ellipsisDropdownContext = useEllipsisDropdownContext();
 
-export function ReportButton({ reportAction }: VoteButtonProps) {
   return (
-    // eslint-disable-next-line @typescript-eslint/no-misused-promises
-    <form action={reportAction} className="contents">
-      <Button variant="ghost" size="icon" name="report">
-        <ExclamationTriangleIcon className={cn("w-5 h-5", "text-red-500")} />
-      </Button>
-    </form>
+    <AlertDialog>
+      <AlertDialogTrigger asChild>
+        <DropdownMenuItem
+          onSelect={(e) => {
+            e.preventDefault();
+          }}
+        >
+          <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
+          Report
+        </DropdownMenuItem>
+      </AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This will report the entry. This action cannot be undone.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <form
+          action={async (formData) => {
+            try {
+              await reportAction(formData);
+            } catch (_) {
+              toast({
+                title: "Something went wrong",
+                type: "foreground",
+              });
+              return;
+            }
+            toast({
+              title: "Report submitted",
+              type: "foreground",
+            });
+            ellipsisDropdownContext.close();
+          }}
+        >
+          <Select name="reportReason">
+            <SelectTrigger className="w-[180px]">
+              <SelectValue placeholder="Please select one" />
+            </SelectTrigger>
+            <SelectContent>
+              {Object.keys(ReportReason).map((reason) => (
+                <SelectItem key={reason} value={reason}>
+                  {reason}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+          <Textarea
+            id="textArea"
+            name="creatorComment"
+            placeholder="Enter your report reason here..."
+            // disabled={isPending}
+            className="resize-y my-3"
+            maxLength={250}
+          />
+          <AlertDialogFooter>
+            <Button variant="success" type="submit">
+              Confirm
+            </Button>
+            <AlertDialogCancel
+              type="button"
+              onClick={() => ellipsisDropdownContext.close()}
+            >
+              Cancel
+            </AlertDialogCancel>
+          </AlertDialogFooter>
+        </form>
+      </AlertDialogContent>
+    </AlertDialog>
   );
 }
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index 866773b7..d75d2a49 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -29,12 +29,10 @@ const createLink = async (
   if (collection === PostCollection) {
     return `/post/${author}/${rkey}/`;
   } else if (collection === CommentCollection) {
-    console.log(rkey, author);
     const { postRkey, postAuthor } = (await getPostFromComment({
       rkey: rkey!,
       did: author!,
     }))!;
-    console.log(postRkey, postAuthor);
     return `/post/${postAuthor}/${postRkey}/${author}/${rkey}/`;
   } else {
     return `/profile/${author}/`;
@@ -46,7 +44,7 @@ export async function ReportCard({ report }: { report: Report }) {
     <Card className="dark:bg-gray-700 border-gray-600 mb-4">
       <CardHeader className="pb-2">
         <CardTitle className="text-lg flex items-center justify-between text-blue-400">
-          <p>Reported {report.subjectCollection}</p>
+          <p>Reported {report.subjectCollection ?? "User"}</p>
           <p
             className={`px-2 py-1 rounded-full text-xs 
               ${
@@ -61,6 +59,12 @@ export async function ReportCard({ report }: { report: Report }) {
       </CardHeader>
       <CardContent>
         <div className="flex flex-col mb-4 gap-1 flex-wrap">
+          <p>
+            <strong>Reported User: </strong>
+            {!report.subjectCollection ? (
+              <UserHandle key={report.id} userDid={report.subjectDid as DID} />
+            ) : null}
+          </p>
           <p>
             <strong className="mr-2">Reason:</strong>
             {report.reportReason}
@@ -90,11 +94,10 @@ export async function ReportCard({ report }: { report: Report }) {
           </div>
         ) : null}
         <div className="flex">
-          <form>
+          <form className="space-x-2">
             <Button
               variant="success"
               type="submit"
-              className="mr-2"
               formAction={performModerationAction.bind(null, {
                 reportId: report.id,
                 status: "accepted",
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index 7a968b2c..dfb45c5e 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -7,7 +7,6 @@ import {
   deleteComment,
 } from "@/lib/data/atproto/comment";
 import { DID } from "@/lib/data/atproto/did";
-import { deletePost } from "@/lib/data/atproto/post";
 import { createVote, deleteVote } from "@/lib/data/atproto/vote";
 import { getComment, uncached_doesCommentExist } from "@/lib/data/db/comment";
 import { getPost } from "@/lib/data/db/post";
@@ -15,7 +14,6 @@ import { createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
 import { revalidatePath } from "next/cache";
-import { string } from "zod";
 
 export async function createCommentAction(
   input: { parentRkey?: string; postRkey: string; postAuthorDid: DID },
@@ -67,13 +65,10 @@ async function waitForComment(rkey: string) {
   }
 }
 
-export async function deletePostAction(rkey: string) {
-  await deletePost(rkey);
-}
-
 export async function deleteCommentAction(rkey: string) {
   await ensureUser();
   await deleteComment(rkey);
+  revalidatePath("/post");
 }
 
 export async function reportCommentAction(
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
index 03b6d9c8..251d1ac1 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
@@ -94,7 +94,6 @@ export function CommentClientWrapperWithToolbar({
               <span className="sr-only">Reply</span>
             </Button>
           </SimpleTooltip>
-          {hasAuthored ? <DeleteCommentButton rkey={rkey} /> : null}
           <SimpleTooltip content="action-menu" side="bottom">
             <EllipsisDropdown
               isAuthor={hasAuthored}
@@ -174,63 +173,6 @@ export function CommentClientWrapperWithToolbar({
   );
 }
 
-function DeleteCommentButton({ rkey }: { rkey: string }) {
-  const [_, deleteAction, isDeletePending] = useActionState(
-    deleteCommentAction.bind(null, rkey),
-    undefined,
-  );
-  const { toast } = useToast();
-
-  return (
-    <form
-      action={deleteAction}
-      onSubmit={(e) => {
-        // Prevent default form submission
-        // Action is dispatched on dialog action
-        e.preventDefault();
-      }}
-    >
-      <AlertDialog>
-        <SimpleTooltip content="Delete">
-          <AlertDialogTrigger asChild>
-            <Button
-              variant="ghost-destructive"
-              size="icon"
-              disabled={isDeletePending}
-            >
-              <TrashIcon className="w-4 h-4" />
-              <span className="sr-only">Delete</span>
-            </Button>
-          </AlertDialogTrigger>
-        </SimpleTooltip>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-            <AlertDialogDescription>
-              This will delete your comment. This action cannot be undone.
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-
-          <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
-            <AlertDialogAction
-              onClick={() => {
-                deleteAction();
-                toast({
-                  title: "Comment will be deleted shortly",
-                  type: "foreground",
-                });
-              }}
-            >
-              Delete
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </form>
-  );
-}
-
 export function NewComment({
   autoFocus = false,
   parentRkey,
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/delete-post-button.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/delete-post-button.tsx
deleted file mode 100644
index 3f497fa3..00000000
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/delete-post-button.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-"use client";
-
-import {
-  AlertDialog,
-  AlertDialogAction,
-  AlertDialogCancel,
-  AlertDialogContent,
-  AlertDialogDescription,
-  AlertDialogFooter,
-  AlertDialogHeader,
-  AlertDialogTitle,
-  AlertDialogTrigger,
-} from "@/lib/components/ui/alert-dialog";
-import { Button } from "@/lib/components/ui/button";
-import { useToast } from "@/lib/components/ui/use-toast";
-import { TrashIcon } from "@radix-ui/react-icons";
-import { useRouter } from "next/navigation";
-import { deletePostAction } from "./actions";
-
-export function DeletePostButton({ rkey }: { rkey: string }) {
-  const { toast } = useToast();
-  const router = useRouter();
-
-  return (
-    <form>
-      <AlertDialog>
-        <AlertDialogTrigger asChild>
-          <Button variant="destructive" className="flex flex-row gap-2">
-            <TrashIcon />
-            Delete post
-          </Button>
-        </AlertDialogTrigger>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>
-              Are you sure you want to delete this post?
-            </AlertDialogTitle>
-            <AlertDialogDescription>
-              This action cannot be undone.
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>Cancel</AlertDialogCancel>
-            <AlertDialogAction asChild>
-              <Button
-                variant="destructive"
-                onClick={() => {
-                  void deletePostAction(rkey);
-                  toast({
-                    title: "Your post will be deleted shortly.",
-                    description: "This usually takes a few seconds",
-                  });
-                  router.push("/");
-                }}
-              >
-                Delete post
-              </Button>
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </form>
-  );
-}
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx
index 841866bb..47460c4f 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/layout.tsx
@@ -1,7 +1,6 @@
 import { getUser } from "@/lib/data/user";
 import { notFound } from "next/navigation";
 import { PostCard } from "../../../_components/post-card";
-import { DeletePostButton } from "./_lib/delete-post-button";
 import { getPost } from "@/lib/data/db/post";
 import { getDidFromHandleOrDid } from "@/lib/data/atproto/identity";
 
@@ -26,7 +25,6 @@ export default async function Post({
   if (!post) {
     notFound();
   }
-  const user = await getUser();
 
   return (
     <main className="mx-auto max-w-4xl space-y-6">
@@ -42,11 +40,6 @@ export default async function Post({
         cid={post.cid}
         isUpvoted={post.userHasVoted}
       />
-      {user?.did === post.authorDid && post.status === "live" && (
-        <div className="flex justify-end">
-          <DeletePostButton rkey={post.rkey} />
-        </div>
-      )}
       {children}
     </main>
   );
diff --git a/packages/frontpage/lib/components/ui/separator.tsx b/packages/frontpage/lib/components/ui/separator.tsx
new file mode 100644
index 00000000..12d81c4a
--- /dev/null
+++ b/packages/frontpage/lib/components/ui/separator.tsx
@@ -0,0 +1,31 @@
+"use client"
+
+import * as React from "react"
+import * as SeparatorPrimitive from "@radix-ui/react-separator"
+
+import { cn } from "@/lib/utils"
+
+const Separator = React.forwardRef<
+  React.ElementRef<typeof SeparatorPrimitive.Root>,
+  React.ComponentPropsWithoutRef<typeof SeparatorPrimitive.Root>
+>(
+  (
+    { className, orientation = "horizontal", decorative = true, ...props },
+    ref
+  ) => (
+    <SeparatorPrimitive.Root
+      ref={ref}
+      decorative={decorative}
+      orientation={orientation}
+      className={cn(
+        "shrink-0 bg-border",
+        orientation === "horizontal" ? "h-[1px] w-full" : "h-full w-[1px]",
+        className
+      )}
+      {...props}
+    />
+  )
+)
+Separator.displayName = SeparatorPrimitive.Root.displayName
+
+export { Separator }
diff --git a/packages/frontpage/lib/components/user-hover-card-client.tsx b/packages/frontpage/lib/components/user-hover-card-client.tsx
index d5485a3e..432e18e8 100644
--- a/packages/frontpage/lib/components/user-hover-card-client.tsx
+++ b/packages/frontpage/lib/components/user-hover-card-client.tsx
@@ -9,6 +9,8 @@ import { ChatBubbleIcon, Link1Icon } from "@radix-ui/react-icons";
 import { ApiRouteResponse } from "../api-route";
 import type { GET as GetHoverCardContent } from "@/app/api/hover-card-content/route";
 import Link from "next/link";
+import { ReportButtonIcon } from "@/app/(app)/_components/report-button";
+import { Separator } from "./ui/separator";
 
 type Props = {
   did: DID;
@@ -16,6 +18,7 @@ type Props = {
   asChild?: boolean;
   avatar: ReactNode;
   initialHandle: string;
+  reportAction: (formData: FormData) => Promise<void>;
 };
 
 export function UserHoverCardClient({
@@ -24,6 +27,7 @@ export function UserHoverCardClient({
   asChild,
   avatar,
   initialHandle,
+  reportAction,
 }: Props) {
   return (
     <>
@@ -46,6 +50,10 @@ export function UserHoverCardClient({
             </Suspense>
           </div>
         </div>
+        <Separator className="my-2" />
+        <div>
+          <ReportButtonIcon reportAction={reportAction} />
+        </div>
       </HoverCardContent>
     </>
   );
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 9b747f3c..bdd392b3 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -3,6 +3,9 @@ import { HoverCard } from "@/lib/components/ui/hover-card";
 import { DID } from "../data/atproto/did";
 import { getVerifiedHandle } from "../data/atproto/identity";
 import { UserHoverCardClient } from "./user-hover-card-client";
+import { ensureUser } from "../data/user";
+import { ReportReason } from "../constants";
+import { createReport } from "../data/db/report";
 
 type Props = {
   did: DID;
@@ -20,9 +23,41 @@ export async function UserHoverCard({ did, children, asChild }: Props) {
         did={did}
         asChild={asChild}
         initialHandle={handle ?? ""}
+        reportAction={ReportUserAction.bind(null, { did })}
       >
         {children}
       </UserHoverCardClient>
     </HoverCard>
   );
 }
+
+export async function ReportUserAction(
+  input: {
+    did: DID;
+  },
+  formData: FormData,
+) {
+  "use server";
+  const user = await ensureUser();
+
+  const creatorComment = formData.get("creatorComment") as string;
+  const reportReason = formData.get("reportReason") as ReportReason;
+
+  if (
+    typeof creatorComment !== "string" ||
+    !reportReason ||
+    creatorComment.length >= 250
+  ) {
+    throw new Error("Missing creatorComment or reportReason");
+  }
+
+  await createReport({
+    subjectUri: `at://${input.did}`,
+    subjectDid: input.did,
+    createdBy: user.did,
+    createdAt: new Date(),
+    creatorComment,
+    reportReason,
+    status: "pending",
+  });
+}
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 11f6d1d6..9c7f47e4 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -4,6 +4,7 @@ import { db } from "@/lib/db";
 import * as schema from "@/lib/schema";
 import { cache } from "react";
 import { InferSelectModel, eq } from "drizzle-orm";
+import { sendDiscordMessage } from "@/lib/discord";
 
 export type ReportDTO = {
   actionedAt?: Date | null;
@@ -73,26 +74,26 @@ export const updateReport = async (
 export const createReport = async (report: ReportDTO) => {
   await db.insert(schema.Report).values(report);
 
-  //   await sendDiscordMessage({
-  //     embeds: [
-  //       {
-  //         title: "New report on Frontpage",
-  //         description:
-  //           report.creatorComment ?? report.reportReason ?? "No reason provided",
-  //         url: report.subjectUri,
-  //         color: 10181046,
-  //         author: {
-  //           name: report.createdBy,
-  //           icon_url: "",
-  //           url: "",
-  //         },
-  //         fields: [
-  //           {
-  //             name: "Link",
-  //             value: "https://frontpage.fyi/moderation",
-  //           },
-  //         ],
-  //       },
-  //     ],
-  //   });
+  await sendDiscordMessage({
+    embeds: [
+      {
+        title: "New report on Frontpage",
+        description:
+          report.creatorComment ?? report.reportReason ?? "No reason provided",
+        url: report.subjectUri,
+        color: 10181046,
+        author: {
+          name: report.createdBy,
+          icon_url: "",
+          url: "",
+        },
+        fields: [
+          {
+            name: "Link",
+            value: "https://frontpage.fyi/moderation",
+          },
+        ],
+      },
+    ],
+  });
 };
diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index f6e76786..c5152c0f 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -28,6 +28,7 @@
     "@radix-ui/react-popover": "^1.1.1",
     "@radix-ui/react-scroll-area": "^1.1.0",
     "@radix-ui/react-select": "^2.1.1",
+    "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
     "@radix-ui/react-tabs": "^1.1.0",
     "@radix-ui/react-toast": "^1.2.1",

From bc96907d944d178758d03ec1bc8828cc1c54a91e Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Tue, 1 Oct 2024 16:49:59 +0100
Subject: [PATCH 22/43] lock file

---
 pnpm-lock.yaml | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 68060f0e..8c071d41 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -153,6 +153,9 @@ importers:
       '@radix-ui/react-select':
         specifier: ^2.1.1
         version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      '@radix-ui/react-separator':
+        specifier: ^1.1.0
+        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-slot':
         specifier: ^1.1.0
         version: 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
@@ -2075,6 +2078,19 @@ packages:
       '@types/react-dom':
         optional: true
 
+  '@radix-ui/react-separator@1.1.0':
+    resolution: {integrity: sha512-3uBAs+egzvJBDZAzvb/n4NxxOYpnspmWxO2u5NbZ8Y6FM/NdrGSF9bop3Cf6F6C71z1rTSn8KV0Fo2ZVd79lGA==}
+    peerDependencies:
+      '@types/react': '*'
+      '@types/react-dom': '*'
+      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
+    peerDependenciesMeta:
+      '@types/react':
+        optional: true
+      '@types/react-dom':
+        optional: true
+
   '@radix-ui/react-slot@1.1.0':
     resolution: {integrity: sha512-FUCf5XMfmW4dtYl69pdS4DbxKy8nj4M7SafBgPllysxmdachynNflAdp/gCsnYWNDnge6tI9onzMp5ARYc1KNw==}
     peerDependencies:
@@ -8127,6 +8143,15 @@ snapshots:
       '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
+  '@radix-ui/react-separator@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
+    dependencies:
+      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
+      react: 19.0.0-rc-f994737d14-20240522
+      react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
+    optionalDependencies:
+      '@types/react': 18.3.10
+      '@types/react-dom': 18.3.0
+
   '@radix-ui/react-slot@1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)

From d83c2a00d6a74b339dfa9910c5cee91f9adf4ecd Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Tue, 1 Oct 2024 19:35:06 +0100
Subject: [PATCH 23/43] update page query to filter hidden users

---
 .../frontpage/app/(app)/moderation/page.tsx   | 37 +++++++++++--------
 packages/frontpage/lib/data/db/comment.ts     | 10 +++++
 packages/frontpage/lib/data/db/post.ts        | 24 +++++++++++-
 packages/frontpage/lib/data/db/user.ts        | 17 ++++++---
 4 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index cc7f10b5..411f57be 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -61,25 +61,32 @@ export async function performModerationAction(
     newModEvent.subjectCid = report.subjectCid;
   }
 
-  const modAction = async () =>
-    report.subjectCollection === PostCollection
-      ? moderatePost({
+  const modAction = async () => {
+    switch (report.subjectCollection) {
+      case PostCollection:
+        return await moderatePost({
           rkey: report.subjectRkey!,
           authorDid: report.subjectDid! as DID,
           cid: report.subjectCid!,
           hide: input.status === "accepted",
-        })
-      : report.subjectCollection === CommentCollection
-        ? moderateComment({
-            rkey: report.subjectRkey!,
-            authorDid: report.subjectDid! as DID,
-            cid: report.subjectCid!,
-            hide: input.status === "accepted",
-          })
-        : moderateUser({
-            userDid: report.subjectDid as DID,
-            hide: input.status === "accepted",
-          });
+        });
+
+      case CommentCollection:
+        return await moderateComment({
+          rkey: report.subjectRkey!,
+          authorDid: report.subjectDid! as DID,
+          cid: report.subjectCid!,
+          hide: input.status === "accepted",
+        });
+
+      default:
+        return await moderateUser({
+          userDid: report.subjectDid as DID,
+          hide: input.status === "accepted",
+          label: report.reportReason ?? "",
+        });
+    }
+  };
 
   await Promise.all([
     createModerationEvent(newModEvent),
diff --git a/packages/frontpage/lib/data/db/comment.ts b/packages/frontpage/lib/data/db/comment.ts
index 05f2adf0..48a1afaa 100644
--- a/packages/frontpage/lib/data/db/comment.ts
+++ b/packages/frontpage/lib/data/db/comment.ts
@@ -53,6 +53,16 @@ const buildUserHasVotedQuery = cache(async () => {
     .as("hasVoted");
 });
 
+//TODO: implement banned user query for comments
+
+// const bannedUserSubQuery = db
+//   .select({
+//     did: schema.LabelledProfile.did,
+//     isHidden: schema.LabelledProfile.isHidden,
+//   })
+//   .from(schema.LabelledProfile)
+//   .as("bannedUser");
+
 export const getCommentsForPost = cache(async (postId: number) => {
   const votes = db
     .select({
diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index 85f03681..9f2f2af7 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -2,7 +2,7 @@ import "server-only";
 
 import { cache } from "react";
 import { db } from "@/lib/db";
-import { eq, sql, count, desc, and } from "drizzle-orm";
+import { eq, sql, count, desc, and, isNull, or } from "drizzle-orm";
 import * as schema from "@/lib/schema";
 import { getBlueskyProfile, getUser } from "../user";
 import * as atprotoPost from "../atproto/post";
@@ -40,6 +40,14 @@ const commentCountSubQuery = db
   .groupBy(schema.Comment.postId, schema.Comment.status)
   .as("commentCount");
 
+const bannedUserSubQuery = db
+  .select({
+    did: schema.LabelledProfile.did,
+    isHidden: schema.LabelledProfile.isHidden,
+  })
+  .from(schema.LabelledProfile)
+  .as("bannedUser");
+
 export const getFrontpagePosts = cache(async () => {
   // This ranking is very naive. I believe it'll need to consider every row in the table even if you limit the results.
   // We should closely monitor this and consider alternatives if it gets slow over time
@@ -76,7 +84,19 @@ export const getFrontpagePosts = cache(async () => {
     )
     .leftJoin(votesSubQuery, eq(votesSubQuery.postId, schema.Post.id))
     .leftJoin(userHasVoted, eq(userHasVoted.postId, schema.Post.id))
-    .where(eq(schema.Post.status, "live"))
+    .fullJoin(
+      bannedUserSubQuery,
+      eq(bannedUserSubQuery.did, schema.Post.authorDid),
+    )
+    .where(
+      and(
+        eq(schema.Post.status, "live"),
+        or(
+          isNull(bannedUserSubQuery.isHidden),
+          eq(bannedUserSubQuery.isHidden, false),
+        ),
+      ),
+    )
     .orderBy(desc(rank));
 
   return rows.map((row) => ({
diff --git a/packages/frontpage/lib/data/db/user.ts b/packages/frontpage/lib/data/db/user.ts
index c52a824d..4fa0d032 100644
--- a/packages/frontpage/lib/data/db/user.ts
+++ b/packages/frontpage/lib/data/db/user.ts
@@ -1,16 +1,23 @@
 import { db } from "@/lib/db";
-import { eq } from "drizzle-orm";
 import { DID } from "../atproto/did";
 import * as schema from "@/lib/schema";
 
 type ModerateUserInput = {
   userDid: DID;
   hide: boolean;
+  label?: string;
 };
 
-export async function moderateUser({ userDid, hide }: ModerateUserInput) {
+export async function moderateUser({
+  userDid,
+  hide,
+  label,
+}: ModerateUserInput) {
   await db
-    .update(schema.LabelledProfile)
-    .set({ isHidden: hide })
-    .where(eq(schema.LabelledProfile.did, userDid));
+    .insert(schema.LabelledProfile)
+    .values({ did: userDid, isHidden: hide, labels: label })
+    .onConflictDoUpdate({
+      target: schema.LabelledProfile.did,
+      set: { isHidden: hide, labels: label },
+    });
 }

From f4737eb963af8543372100682785daf35d1b8a60 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 2 Oct 2024 00:29:58 +0100
Subject: [PATCH 24/43] left join to prevent query being weird

---
 packages/frontpage/lib/data/db/post.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index 9f2f2af7..f3c9885a 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -84,7 +84,7 @@ export const getFrontpagePosts = cache(async () => {
     )
     .leftJoin(votesSubQuery, eq(votesSubQuery.postId, schema.Post.id))
     .leftJoin(userHasVoted, eq(userHasVoted.postId, schema.Post.id))
-    .fullJoin(
+    .leftJoin(
       bannedUserSubQuery,
       eq(bannedUserSubQuery.did, schema.Post.authorDid),
     )

From 1c65d7821551549c3070e7518122b7433bb10bd7 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 2 Oct 2024 11:05:00 +0100
Subject: [PATCH 25/43] report button on card and profile working, add logging
 to db for reports

---
 .../app/(app)/_components/report-button.tsx   |  5 +++-
 .../[postRkey]/_lib/comment-client.tsx        | 25 ++++++++++++-------
 .../app/(app)/profile/[user]/page.tsx         |  6 +++++
 packages/frontpage/lib/data/db/comment.ts     |  1 +
 packages/frontpage/lib/data/db/post.ts        |  2 +-
 packages/frontpage/lib/data/db/user.ts        |  1 +
 6 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
index ee9fdda8..cbe303ea 100644
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -24,14 +24,16 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/lib/components/ui/select";
+import { useState } from "react";
 
 interface ReportButtonProps {
   reportAction: (formData: FormData) => Promise<void>;
 }
 
 export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
+  const [open, setOpen] = useState(false);
   return (
-    <AlertDialog>
+    <AlertDialog open={open} onOpenChange={setOpen}>
       <AlertDialogTrigger asChild>
         <Button size="icon" variant="outline">
           <ExclamationTriangleIcon className="h-4 w-4 text-red-500" />
@@ -59,6 +61,7 @@ export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
               title: "Report submitted",
               type: "foreground",
             });
+            setOpen(false);
           }}
         >
           <Select name="reportReason">
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
index 251d1ac1..726e62f9 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
@@ -39,6 +39,8 @@ import { InputLengthIndicator } from "@/lib/components/input-length-indicator";
 import { MAX_COMMENT_LENGTH } from "@/lib/data/db/constants";
 import type { CommentModel } from "@/lib/data/db/comment";
 import { EllipsisDropdown } from "@/app/(app)/_components/ellipsis-dropdown";
+import { ReportButton } from "@/app/(app)/_components/report-button";
+import { DeleteButton } from "@/app/(app)/_components/delete-button";
 
 export type CommentClientProps = Pick<
   CommentModel,
@@ -95,15 +97,20 @@ export function CommentClientWrapperWithToolbar({
             </Button>
           </SimpleTooltip>
           <SimpleTooltip content="action-menu" side="bottom">
-            <EllipsisDropdown
-              isAuthor={hasAuthored}
-              onDeleteAction={deleteCommentAction.bind(null, rkey)}
-              onReportAction={reportCommentAction.bind(null, {
-                authorDid: authorDid,
-                cid: cid,
-                rkey: rkey,
-              })}
-            />
+            <EllipsisDropdown>
+              <ReportButton
+                reportAction={reportCommentAction.bind(null, {
+                  authorDid: authorDid,
+                  cid: cid,
+                  rkey: rkey,
+                })}
+              />
+              {hasAuthored ? (
+                <DeleteButton
+                  deleteAction={deleteCommentAction.bind(null, rkey)}
+                />
+              ) : null}
+            </EllipsisDropdown>
           </SimpleTooltip>
         </div>
       </div>
diff --git a/packages/frontpage/app/(app)/profile/[user]/page.tsx b/packages/frontpage/app/(app)/profile/[user]/page.tsx
index 41bb0661..74cbb2fd 100644
--- a/packages/frontpage/app/(app)/profile/[user]/page.tsx
+++ b/packages/frontpage/app/(app)/profile/[user]/page.tsx
@@ -15,6 +15,9 @@ import { getUserComments } from "@/lib/data/db/comment";
 import { Comment } from "../../post/[postAuthor]/[postRkey]/_lib/comment";
 import { Suspense } from "react";
 import { getDidFromHandleOrDid } from "@/lib/data/atproto/identity";
+import { EllipsisDropdown } from "../../_components/ellipsis-dropdown";
+import { ReportButton } from "../../_components/report-button";
+import { ReportUserAction } from "@/lib/components/user-hover-card";
 
 type Params = {
   user: string;
@@ -49,6 +52,9 @@ export default async function Profile({ params }: { params: Params }) {
       <div className="flex items-center space-x-4 mb-4">
         <UserAvatar did={did} size="medium" />
         <h1 className="text-2xl font-bold">{bskyProfile.handle}</h1>
+        <EllipsisDropdown>
+          <ReportButton reportAction={ReportUserAction.bind(null, { did })} />
+        </EllipsisDropdown>
       </div>
       <Tabs defaultValue="overview">
         <TabsList>
diff --git a/packages/frontpage/lib/data/db/comment.ts b/packages/frontpage/lib/data/db/comment.ts
index 48a1afaa..03e4fd9a 100644
--- a/packages/frontpage/lib/data/db/comment.ts
+++ b/packages/frontpage/lib/data/db/comment.ts
@@ -255,6 +255,7 @@ export async function moderateComment({
   cid,
   hide,
 }: ModerateCommentInput) {
+  console.log(`Moderating comment, setting hidden to ${hide}`);
   await db
     .update(schema.Comment)
     .set({ status: hide ? "moderator_hidden" : "live" })
diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index f3c9885a..77331807 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -289,7 +289,7 @@ export async function moderatePost({
   cid,
   hide,
 }: ModeratePostInput) {
-  console.log("Moderating post", rkey, hide);
+  console.log(`Moderating post, setting hidden to ${hide}`);
   await db
     .update(schema.Post)
     .set({ status: hide ? "moderator_hidden" : "live" })
diff --git a/packages/frontpage/lib/data/db/user.ts b/packages/frontpage/lib/data/db/user.ts
index 4fa0d032..b11ca55a 100644
--- a/packages/frontpage/lib/data/db/user.ts
+++ b/packages/frontpage/lib/data/db/user.ts
@@ -13,6 +13,7 @@ export async function moderateUser({
   hide,
   label,
 }: ModerateUserInput) {
+  console.log(`Moderating user, setting hidden to ${hide}`);
   await db
     .insert(schema.LabelledProfile)
     .values({ did: userDid, isHidden: hide, labels: label })

From 09bd437458bcb20b04073f3cf31e4e2627f75721 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 2 Oct 2024 11:07:39 +0100
Subject: [PATCH 26/43] cache reports

---
 packages/frontpage/lib/data/db/report.ts | 30 +++++++++++++-----------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 9c7f47e4..b2d492f3 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -34,7 +34,7 @@ export const getReport = cache(
   },
 );
 
-export const getModeratorReportStats = async () => {
+export const getModeratorReportStats = cache(async () => {
   const reports = await db.select().from(schema.Report);
 
   return {
@@ -43,20 +43,22 @@ export const getModeratorReportStats = async () => {
     accepted: reports.filter((r) => r.status === "accepted").length,
     rejected: reports.filter((r) => r.status === "rejected").length,
   };
-};
+});
 
-export const getReports = async (
-  status: "pending" | "accepted" | "rejected" | null,
-): Promise<Report[]> => {
-  if (status) {
-    return await db
-      .select()
-      .from(schema.Report)
-      .where(eq(schema.Report.status, status));
-  } else {
-    return await db.select().from(schema.Report);
-  }
-};
+export const getReports = cache(
+  async (
+    status: "pending" | "accepted" | "rejected" | null,
+  ): Promise<Report[]> => {
+    if (status) {
+      return await db
+        .select()
+        .from(schema.Report)
+        .where(eq(schema.Report.status, status));
+    } else {
+      return await db.select().from(schema.Report);
+    }
+  },
+);
 
 export const updateReport = async (
   reportId: number,

From 7879b26def9f6c8b326adfee17fadfe23d6df759 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 2 Oct 2024 11:20:34 +0100
Subject: [PATCH 27/43] lower case the things

---
 packages/frontpage/app/(app)/profile/[user]/page.tsx  | 4 ++--
 packages/frontpage/lib/components/user-hover-card.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/frontpage/app/(app)/profile/[user]/page.tsx b/packages/frontpage/app/(app)/profile/[user]/page.tsx
index 74cbb2fd..20581ab3 100644
--- a/packages/frontpage/app/(app)/profile/[user]/page.tsx
+++ b/packages/frontpage/app/(app)/profile/[user]/page.tsx
@@ -17,7 +17,7 @@ import { Suspense } from "react";
 import { getDidFromHandleOrDid } from "@/lib/data/atproto/identity";
 import { EllipsisDropdown } from "../../_components/ellipsis-dropdown";
 import { ReportButton } from "../../_components/report-button";
-import { ReportUserAction } from "@/lib/components/user-hover-card";
+import { reportUserAction } from "@/lib/components/user-hover-card";
 
 type Params = {
   user: string;
@@ -53,7 +53,7 @@ export default async function Profile({ params }: { params: Params }) {
         <UserAvatar did={did} size="medium" />
         <h1 className="text-2xl font-bold">{bskyProfile.handle}</h1>
         <EllipsisDropdown>
-          <ReportButton reportAction={ReportUserAction.bind(null, { did })} />
+          <ReportButton reportAction={reportUserAction.bind(null, { did })} />
         </EllipsisDropdown>
       </div>
       <Tabs defaultValue="overview">
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index bdd392b3..65c4ae22 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -23,7 +23,7 @@ export async function UserHoverCard({ did, children, asChild }: Props) {
         did={did}
         asChild={asChild}
         initialHandle={handle ?? ""}
-        reportAction={ReportUserAction.bind(null, { did })}
+        reportAction={reportUserAction.bind(null, { did })}
       >
         {children}
       </UserHoverCardClient>
@@ -31,7 +31,7 @@ export async function UserHoverCard({ did, children, asChild }: Props) {
   );
 }
 
-export async function ReportUserAction(
+export async function reportUserAction(
   input: {
     did: DID;
   },

From 47aa95b976f1c938a1e65a5d5d9071aa0561ea40 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 2 Oct 2024 12:21:39 +0100
Subject: [PATCH 28/43] deduplicate, convert messy ifs to switch

---
 .../app/(app)/_components/post-card.tsx       |  5 ++--
 .../moderation/_components/report-card.tsx    | 23 +++++++++++--------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 3060f68b..d9cdb704 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -42,6 +42,7 @@ export async function PostCard({
 }: PostProps) {
   const handle = await getVerifiedHandle(author);
   const postHref = `/post/${handle}/${rkey}`;
+  const user = await getUser();
 
   return (
     // TODO: Make article route to postHref via onClick on card except innser links or buttons
@@ -115,7 +116,7 @@ export async function PostCard({
             </div>
           </div>
 
-          {(await getUser()) ? (
+          {user ? (
             <div className="ml-auto">
               <EllipsisDropdown>
                 <ReportButton
@@ -125,7 +126,7 @@ export async function PostCard({
                     author,
                   })}
                 />
-                {(await getUser())?.did === author ? (
+                {user?.did === author ? (
                   <DeleteButton
                     deleteAction={DeletePostAction.bind(null, rkey)}
                   />
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index d75d2a49..adeafde5 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -26,16 +26,19 @@ const createLink = async (
   author?: DID | null,
   rkey?: string | null,
 ) => {
-  if (collection === PostCollection) {
-    return `/post/${author}/${rkey}/`;
-  } else if (collection === CommentCollection) {
-    const { postRkey, postAuthor } = (await getPostFromComment({
-      rkey: rkey!,
-      did: author!,
-    }))!;
-    return `/post/${postAuthor}/${postRkey}/${author}/${rkey}/`;
-  } else {
-    return `/profile/${author}/`;
+  switch (collection) {
+    case PostCollection:
+      return `/post/${author}/${rkey}/`;
+
+    case CommentCollection:
+      const { postRkey, postAuthor } = (await getPostFromComment({
+        rkey: rkey!,
+        did: author!,
+      }))!;
+      return `/post/${postAuthor}/${postRkey}/${author}/${rkey}/`;
+
+    default:
+      return `/profile/${author}/`;
   }
 };
 

From 6decdef637d0c99594b1e8781afbf3262b05368d Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Wed, 2 Oct 2024 19:26:47 +0100
Subject: [PATCH 29/43] fix suggested changes

---
 .../app/(app)/_components/delete-button.tsx   |  4 ++--
 .../(app)/_components/ellipsis-dropdown.tsx   |  6 +++---
 .../app/(app)/_components/post-card.tsx       |  5 ++---
 .../app/(app)/_components/report-button.tsx   | 11 +++++-----
 .../moderation/_components/report-card.tsx    | 20 +++++++++----------
 .../frontpage/app/(app)/moderation/page.tsx   |  9 +++++----
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  | 10 ++++------
 .../lib/components/user-hover-card.tsx        |  3 +--
 packages/frontpage/lib/constants.ts           |  7 -------
 packages/frontpage/lib/data/db/report.ts      |  9 ++++++++-
 packages/frontpage/lib/data/user.ts           |  2 +-
 packages/frontpage/lib/schema.ts              |  7 +++----
 packages/frontpage/package.json               |  1 -
 pnpm-lock.yaml                                | 19 +++---------------
 14 files changed, 47 insertions(+), 66 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/delete-button.tsx b/packages/frontpage/app/(app)/_components/delete-button.tsx
index b8abe05d..f65f891e 100644
--- a/packages/frontpage/app/(app)/_components/delete-button.tsx
+++ b/packages/frontpage/app/(app)/_components/delete-button.tsx
@@ -15,8 +15,8 @@ import {
   AlertDialogCancel,
 } from "@/lib/components/ui/alert-dialog";
 import { DropdownMenuItem } from "@/lib/components/ui/dropdown-menu";
-import { Trash } from "lucide-react";
 import { useEllipsisDropdownContext } from "./ellipsis-dropdown";
+import { TrashIcon } from "@radix-ui/react-icons";
 
 type DeleteButtonProps = {
   deleteAction: () => Promise<void>;
@@ -33,7 +33,7 @@ export function DeleteButton({ deleteAction }: DeleteButtonProps) {
             e.preventDefault();
           }}
         >
-          <Trash className="mr-2 h-4 w-4" />
+          <TrashIcon className="mr-2 scale-125" />
           Delete
         </DropdownMenuItem>
       </AlertDialogTrigger>
diff --git a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
index 28f25975..93a8746f 100644
--- a/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
+++ b/packages/frontpage/app/(app)/_components/ellipsis-dropdown.tsx
@@ -8,7 +8,7 @@ import {
   DropdownMenuLabel,
   DropdownMenuTrigger,
 } from "@/lib/components/ui/dropdown-menu";
-import { MoreHorizontal } from "lucide-react";
+import { DotsHorizontalIcon } from "@radix-ui/react-icons";
 import React, { ReactNode } from "react";
 
 interface EllipsisDropdownProps {
@@ -27,10 +27,10 @@ export function EllipsisDropdown({ children }: EllipsisDropdownProps) {
       <DropdownMenu open={open} onOpenChange={setOpen}>
         <DropdownMenuTrigger asChild>
           <Button variant="ghost" size="sm">
-            <MoreHorizontal />
+            <DotsHorizontalIcon className="scale-125" />
           </Button>
         </DropdownMenuTrigger>
-        <DropdownMenuContent align="end" className="w-[200px]">
+        <DropdownMenuContent align="end" className="w-48">
           <DropdownMenuLabel>Actions</DropdownMenuLabel>
           <DropdownMenuGroup>{children}</DropdownMenuGroup>
         </DropdownMenuContent>
diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index d9cdb704..cef2573b 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -8,9 +8,8 @@ import { PostCollection, deletePost } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
-import { createReport } from "@/lib/data/db/report";
+import { ReportReason, createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
-import { ReportReason } from "@/lib/constants";
 import { revalidatePath } from "next/cache";
 import { ReportButton } from "./report-button";
 import { DeleteButton } from "./delete-button";
@@ -167,7 +166,7 @@ export async function ReportPostAction(
     !reportReason ||
     creatorComment.length >= 250
   ) {
-    throw new Error("Missing creatorComment or reportReason");
+    throw new Error("Missing creatorComment or reportReason or length > 250");
   }
   await createReport({
     subjectUri: `at://${input.author}/${PostCollection}/${input.rkey}`,
diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
index cbe303ea..364f92b4 100644
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -13,7 +13,6 @@ import {
 import { Button } from "@/lib/components/ui/button";
 import { Textarea } from "@/lib/components/ui/textarea";
 import { toast } from "@/lib/components/ui/use-toast";
-import { ReportReason } from "@/lib/constants";
 import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
 import { useEllipsisDropdownContext } from "./ellipsis-dropdown";
 import { DropdownMenuItem } from "@/lib/components/ui/dropdown-menu";
@@ -25,6 +24,7 @@ import {
   SelectValue,
 } from "@/lib/components/ui/select";
 import { useState } from "react";
+import { ReportReason } from "@/lib/data/db/report";
 
 interface ReportButtonProps {
   reportAction: (formData: FormData) => Promise<void>;
@@ -65,7 +65,7 @@ export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
           }}
         >
           <Select name="reportReason">
-            <SelectTrigger className="w-[180px]">
+            <SelectTrigger className="w-44">
               <SelectValue placeholder="Please select one" />
             </SelectTrigger>
             <SelectContent>
@@ -80,7 +80,6 @@ export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
             id="textArea"
             name="creatorComment"
             placeholder="Enter your report reason here..."
-            // disabled={isPending}
             className="resize-y my-3"
             maxLength={250}
           />
@@ -103,6 +102,9 @@ export function ReportButton({ reportAction }: ReportButtonProps) {
     <AlertDialog>
       <AlertDialogTrigger asChild>
         <DropdownMenuItem
+          //this prevents the alert dialog from closing when the dropdown item is clicked
+          //alternatively wrap the whole dropdown in the dialog as per https://github.com/radix-ui/primitives/issues/1836
+          //but that defeats the purpose of this reusable component
           onSelect={(e) => {
             e.preventDefault();
           }}
@@ -137,7 +139,7 @@ export function ReportButton({ reportAction }: ReportButtonProps) {
           }}
         >
           <Select name="reportReason">
-            <SelectTrigger className="w-[180px]">
+            <SelectTrigger className="w-44">
               <SelectValue placeholder="Please select one" />
             </SelectTrigger>
             <SelectContent>
@@ -152,7 +154,6 @@ export function ReportButton({ reportAction }: ReportButtonProps) {
             id="textArea"
             name="creatorComment"
             placeholder="Enter your report reason here..."
-            // disabled={isPending}
             className="resize-y my-3"
             maxLength={250}
           />
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index adeafde5..c3a663c7 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -14,12 +14,7 @@ import { PostCollection } from "@/lib/data/atproto/post";
 import { CommentCollection } from "@/lib/data/atproto/comment";
 import Link from "next/link";
 import { getPostFromComment } from "@/lib/data/db/post";
-
-const statusClasses = {
-  pending: "bg-yellow-500 text-yellow-900",
-  accepted: "bg-green-500 text-green-900",
-  rejected: "bg-red-500 text-red-900",
-};
+import { cn } from "@/lib/utils";
 
 const createLink = async (
   collection?: string | null,
@@ -50,11 +45,14 @@ export async function ReportCard({ report }: { report: Report }) {
           <p>Reported {report.subjectCollection ?? "User"}</p>
           <p
             className={`px-2 py-1 rounded-full text-xs 
-              ${
-                report.status
-                  ? statusClasses[report.status]
-                  : "bg-red-500 text-red-900"
-              }`}
+              ${cn({
+                "bg-yellow-500 text-destructive-foreground":
+                  report.status === "pending",
+                "bg-success text-success-foreground":
+                  report.status === "accepted",
+                "bg-destructive text-destructive-foreground":
+                  report.status === "rejected",
+              })}`}
           >
             {report.status}
           </p>
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 411f57be..a3c6fab9 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -1,5 +1,4 @@
 "use server";
-import { Shield } from "lucide-react";
 import {
   Card,
   CardContent,
@@ -28,6 +27,7 @@ import { moderatePost } from "@/lib/data/db/post";
 import { DID } from "@/lib/data/atproto/did";
 import { moderateComment } from "@/lib/data/db/comment";
 import { moderateUser } from "@/lib/data/db/user";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
 
 export async function performModerationAction(
   input: { reportId: number; status: "accepted" | "rejected" },
@@ -98,13 +98,14 @@ export async function performModerationAction(
   return;
 }
 
+type StatusTypes = "pending" | "accepted" | "rejected";
+
 export default async function Moderation({
   searchParams,
 }: {
   searchParams: { status: string };
 }) {
-  const status =
-    (searchParams.status as "pending" | "accepted" | "rejected") ?? null;
+  const status = (searchParams.status as StatusTypes) ?? null;
 
   const reportList = await getReports(status);
 
@@ -120,7 +121,7 @@ export default async function Moderation({
         <Card className="bg-gray-800 border-gray-700 mb-6">
           <CardHeader>
             <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
-              <Shield className="h-6 w-6" />
+              <ExclamationTriangleIcon className="scale-150 mr-1" />
               Moderation Dashboard
             </CardTitle>
             <CardDescription className="text-gray-300">
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index dfb45c5e..11c38a58 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -1,6 +1,5 @@
 "use server";
 
-import { ReportReason } from "@/lib/constants";
 import {
   CommentCollection,
   createComment,
@@ -10,7 +9,7 @@ import { DID } from "@/lib/data/atproto/did";
 import { createVote, deleteVote } from "@/lib/data/atproto/vote";
 import { getComment, uncached_doesCommentExist } from "@/lib/data/db/comment";
 import { getPost } from "@/lib/data/db/post";
-import { createReport } from "@/lib/data/db/report";
+import { ReportReason, createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
 import { revalidatePath } from "next/cache";
@@ -22,7 +21,6 @@ export async function createCommentAction(
 ) {
   const content = formData.get("comment") as string;
   const user = await ensureUser();
-  console.log(input);
 
   const [post, comment] = await Promise.all([
     getPost(input.postAuthorDid, input.postRkey),
@@ -79,8 +77,6 @@ export async function reportCommentAction(
   },
   formData: FormData,
 ) {
-  console.log("Reporting comment", input);
-
   const user = await ensureUser();
   const creatorComment = formData.get("creatorComment") as string;
   const reportReason = formData.get("reportReason") as ReportReason;
@@ -90,7 +86,9 @@ export async function reportCommentAction(
     !reportReason ||
     creatorComment.length >= 250
   ) {
-    throw new Error("Missing creatorComment or reportReason");
+    throw new Error(
+      "Missing creatorComment or reportReason or comment length > 250",
+    );
   }
 
   await createReport({
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 65c4ae22..3413fbcc 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -4,8 +4,7 @@ import { DID } from "../data/atproto/did";
 import { getVerifiedHandle } from "../data/atproto/identity";
 import { UserHoverCardClient } from "./user-hover-card-client";
 import { ensureUser } from "../data/user";
-import { ReportReason } from "../constants";
-import { createReport } from "../data/db/report";
+import { ReportReason, createReport } from "../data/db/report";
 
 type Props = {
   did: DID;
diff --git a/packages/frontpage/lib/constants.ts b/packages/frontpage/lib/constants.ts
index a527e9e9..59b2de54 100644
--- a/packages/frontpage/lib/constants.ts
+++ b/packages/frontpage/lib/constants.ts
@@ -1,8 +1 @@
 export const FRONTPAGE_ATPROTO_HANDLE = "frontpage.fyi";
-
-export enum ReportReason {
-  SPAM = "spam",
-  MISLEADING = "misleading",
-  SEXUAL = "sexual",
-  OTHER = "other",
-}
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index b2d492f3..84072b16 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -6,6 +6,13 @@ import { cache } from "react";
 import { InferSelectModel, eq } from "drizzle-orm";
 import { sendDiscordMessage } from "@/lib/discord";
 
+export enum ReportReason {
+  SPAM = "spam",
+  MISLEADING = "misleading",
+  SEXUAL = "sexual",
+  OTHER = "other",
+}
+
 export type ReportDTO = {
   actionedAt?: Date | null;
   actionedBy?: string | null;
@@ -17,7 +24,7 @@ export type ReportDTO = {
   createdBy: string;
   createdAt: Date;
   creatorComment?: string | null;
-  reportReason?: string | null;
+  reportReason?: ReportReason | null;
   status?: "pending" | "accepted" | "rejected" | null;
 };
 
diff --git a/packages/frontpage/lib/data/user.ts b/packages/frontpage/lib/data/user.ts
index f58b3233..f1e53f7d 100644
--- a/packages/frontpage/lib/data/user.ts
+++ b/packages/frontpage/lib/data/user.ts
@@ -74,7 +74,7 @@ export const isAdmin = cache(async () => {
     where: and(eq(schema.AdminUser.did, user.did)),
   });
 
-  return isAdmin;
+  return Boolean(isAdmin);
 });
 
 const ProfileResponse = z.object({
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index f6c810d4..4592f422 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -182,9 +182,6 @@ export const LabelledProfile = sqliteTable("labelled_profiles", {
   labels: text("labels"),
 });
 
-const createReportStatusColumn = (col: string) =>
-  text(col, { enum: ["pending", "accepted", "rejected"] }).default("pending");
-
 export const Report = sqliteTable("reports", {
   id: integer("id").primaryKey(),
   actionedAt: dateIsoText("actioned_at"),
@@ -198,5 +195,7 @@ export const Report = sqliteTable("reports", {
   createdAt: dateIsoText("created_at").notNull(),
   creatorComment: text("creator_comment"),
   reportReason: text("report_reason"),
-  status: createReportStatusColumn("status"),
+  status: text("status", {
+    enum: ["pending", "accepted", "rejected"],
+  }).default("pending"),
 });
diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index c5152c0f..efd29297 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -40,7 +40,6 @@
     "date-fns": "^3.6.0",
     "drizzle-orm": "^0.33.0",
     "jose": "^5.4.0",
-    "lucide-react": "^0.441.0",
     "next": "15.0.0-canary.168",
     "next-themes": "^0.3.0",
     "oauth4webapi": "^2.12.1",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8c071d41..15bd366d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -189,9 +189,6 @@ importers:
       jose:
         specifier: ^5.4.0
         version: 5.4.0
-      lucide-react:
-        specifier: ^0.441.0
-        version: 0.441.0(react@19.0.0-rc-f994737d14-20240522)
       next:
         specifier: 15.0.0-canary.168
         version: 15.0.0-canary.168(@babel/core@7.24.7)(babel-plugin-react-compiler@0.0.0-experimental-334f00b-20240725)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
@@ -4499,11 +4496,6 @@ packages:
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
-  lucide-react@0.441.0:
-    resolution: {integrity: sha512-0vfExYtvSDhkC2lqg0zYVW1Uu9GsI4knuV9GP9by5z0Xhc4Zi5RejTxfz9LsjRmCyWVzHCJvxGKZWcRyvQCWVg==}
-    peerDependencies:
-      react: ^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc
-
   lz-string@1.5.0:
     resolution: {integrity: sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==}
     hasBin: true
@@ -10125,7 +10117,7 @@ snapshots:
       doctrine: 2.1.0
       eslint: 8.57.0
       eslint-import-resolver-node: 0.3.9
-      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.14.1(eslint@8.57.0)(typescript@5.5.2))(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
+      eslint-module-utils: 2.8.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-import-resolver-typescript@3.6.1(@typescript-eslint/parser@7.2.0(eslint@8.57.0)(typescript@5.4.5))(eslint-import-resolver-node@0.3.9)(eslint-plugin-import@2.29.1)(eslint@8.57.0))(eslint@8.57.0)
       hasown: 2.0.2
       is-core-module: 2.13.1
       is-glob: 4.0.3
@@ -11116,10 +11108,6 @@ snapshots:
     dependencies:
       yallist: 3.1.1
 
-  lucide-react@0.441.0(react@19.0.0-rc-f994737d14-20240522):
-    dependencies:
-      react: 19.0.0-rc-f994737d14-20240522
-
   lz-string@1.5.0: {}
 
   magic-string@0.30.10:
@@ -11292,7 +11280,7 @@ snapshots:
 
   node-abi@3.63.0:
     dependencies:
-      semver: 7.6.2
+      semver: 7.6.3
 
   node-addon-api@6.1.0: {}
 
@@ -11934,8 +11922,7 @@ snapshots:
 
   semver@7.6.2: {}
 
-  semver@7.6.3:
-    optional: true
+  semver@7.6.3: {}
 
   send@0.18.0:
     dependencies:

From c66e4278261194ee12daa3db2baae8fe7fd62a8b Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Thu, 3 Oct 2024 14:01:33 +0100
Subject: [PATCH 30/43] get rid of enum, add some DID types to things

---
 .../frontpage/app/(app)/_components/post-card.tsx |  6 +++---
 .../app/(app)/_components/report-button.tsx       |  6 +++---
 packages/frontpage/app/(app)/moderation/page.tsx  |  6 +++---
 .../post/[postAuthor]/[postRkey]/_lib/actions.tsx |  6 +++---
 .../frontpage/lib/components/user-hover-card.tsx  | 10 ++++++----
 packages/frontpage/lib/data/db/moderation.ts      |  5 +++--
 packages/frontpage/lib/data/db/report.ts          | 15 ++++++---------
 packages/frontpage/lib/data/db/user.ts            |  2 +-
 packages/frontpage/lib/data/user.ts               |  2 +-
 9 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index cef2573b..e3cf8210 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -8,7 +8,7 @@ import { PostCollection, deletePost } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
-import { ReportReason, createReport } from "@/lib/data/db/report";
+import { ReportReasonType, createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
 import { revalidatePath } from "next/cache";
 import { ReportButton } from "./report-button";
@@ -159,7 +159,7 @@ export async function ReportPostAction(
   const user = await ensureUser();
 
   const creatorComment = formData.get("creatorComment") as string;
-  const reportReason = formData.get("reportReason") as ReportReason;
+  const reportReason = formData.get("reportReason") as ReportReasonType;
 
   if (
     typeof creatorComment !== "string" ||
@@ -174,7 +174,7 @@ export async function ReportPostAction(
     subjectCollection: PostCollection,
     subjectRkey: input.rkey,
     subjectCid: input.cid,
-    createdBy: user.did,
+    createdBy: user.did as DID,
     createdAt: new Date(),
     creatorComment,
     reportReason,
diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
index 364f92b4..f4e93dc2 100644
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -24,7 +24,7 @@ import {
   SelectValue,
 } from "@/lib/components/ui/select";
 import { useState } from "react";
-import { ReportReason } from "@/lib/data/db/report";
+import { ReportReasons } from "@/lib/data/db/report";
 
 interface ReportButtonProps {
   reportAction: (formData: FormData) => Promise<void>;
@@ -69,7 +69,7 @@ export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
               <SelectValue placeholder="Please select one" />
             </SelectTrigger>
             <SelectContent>
-              {Object.keys(ReportReason).map((reason) => (
+              {ReportReasons.map((reason) => (
                 <SelectItem key={reason} value={reason}>
                   {reason}
                 </SelectItem>
@@ -143,7 +143,7 @@ export function ReportButton({ reportAction }: ReportButtonProps) {
               <SelectValue placeholder="Please select one" />
             </SelectTrigger>
             <SelectContent>
-              {Object.keys(ReportReason).map((reason) => (
+              {ReportReasons.map((reason) => (
                 <SelectItem key={reason} value={reason}>
                   {reason}
                 </SelectItem>
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index a3c6fab9..84179f1f 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -43,8 +43,8 @@ export async function performModerationAction(
 
   const newModEvent: ModerationEventDTO = {
     subjectUri: report.subjectUri,
-    subjectDid: report.subjectDid,
-    createdBy: user.did,
+    subjectDid: report.subjectDid as DID,
+    createdBy: user.did as DID,
     createdAt: new Date(),
     labelsAdded: report.reportReason,
     creatorReportReason: report.creatorComment,
@@ -83,7 +83,7 @@ export async function performModerationAction(
         return await moderateUser({
           userDid: report.subjectDid as DID,
           hide: input.status === "accepted",
-          label: report.reportReason ?? "",
+          label: report.reportReason,
         });
     }
   };
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index 11c38a58..aa9aaa97 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -9,7 +9,7 @@ import { DID } from "@/lib/data/atproto/did";
 import { createVote, deleteVote } from "@/lib/data/atproto/vote";
 import { getComment, uncached_doesCommentExist } from "@/lib/data/db/comment";
 import { getPost } from "@/lib/data/db/post";
-import { ReportReason, createReport } from "@/lib/data/db/report";
+import { ReportReasonType, createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
 import { revalidatePath } from "next/cache";
@@ -79,7 +79,7 @@ export async function reportCommentAction(
 ) {
   const user = await ensureUser();
   const creatorComment = formData.get("creatorComment") as string;
-  const reportReason = formData.get("reportReason") as ReportReason;
+  const reportReason = formData.get("reportReason") as ReportReasonType;
 
   if (
     typeof creatorComment !== "string" ||
@@ -97,7 +97,7 @@ export async function reportCommentAction(
     subjectCollection: CommentCollection,
     subjectRkey: input.rkey,
     subjectCid: input.cid,
-    createdBy: user.did,
+    createdBy: user.did as DID,
     createdAt: new Date(),
     creatorComment: creatorComment,
     reportReason: reportReason,
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 3413fbcc..67a6a203 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -4,7 +4,7 @@ import { DID } from "../data/atproto/did";
 import { getVerifiedHandle } from "../data/atproto/identity";
 import { UserHoverCardClient } from "./user-hover-card-client";
 import { ensureUser } from "../data/user";
-import { ReportReason, createReport } from "../data/db/report";
+import { ReportReasonType, createReport } from "../data/db/report";
 
 type Props = {
   did: DID;
@@ -40,20 +40,22 @@ export async function reportUserAction(
   const user = await ensureUser();
 
   const creatorComment = formData.get("creatorComment") as string;
-  const reportReason = formData.get("reportReason") as ReportReason;
+  const reportReason = formData.get("reportReason") as ReportReasonType;
 
   if (
     typeof creatorComment !== "string" ||
     !reportReason ||
     creatorComment.length >= 250
   ) {
-    throw new Error("Missing creatorComment or reportReason");
+    throw new Error(
+      "Missing creatorComment or reportReason or comment length > 250",
+    );
   }
 
   await createReport({
     subjectUri: `at://${input.did}`,
     subjectDid: input.did,
-    createdBy: user.did,
+    createdBy: user.did as DID,
     createdAt: new Date(),
     creatorComment,
     reportReason,
diff --git a/packages/frontpage/lib/data/db/moderation.ts b/packages/frontpage/lib/data/db/moderation.ts
index d96081c3..8545343a 100644
--- a/packages/frontpage/lib/data/db/moderation.ts
+++ b/packages/frontpage/lib/data/db/moderation.ts
@@ -1,14 +1,15 @@
 import "server-only";
 import { db } from "@/lib/db";
 import * as schema from "@/lib/schema";
+import { DID } from "../atproto/did";
 
 export type ModerationEventDTO = {
   subjectUri: string;
-  subjectDid: string;
+  subjectDid: DID;
   subjectCollection?: string | null;
   subjectRkey?: string | null;
   subjectCid?: string | null;
-  createdBy: string;
+  createdBy: DID;
   createdAt: Date;
   labelsAdded?: string | null;
   labelsRemoved?: string | null;
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 84072b16..28a0bb2e 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -5,26 +5,23 @@ import * as schema from "@/lib/schema";
 import { cache } from "react";
 import { InferSelectModel, eq } from "drizzle-orm";
 import { sendDiscordMessage } from "@/lib/discord";
+import { DID } from "../atproto/did";
 
-export enum ReportReason {
-  SPAM = "spam",
-  MISLEADING = "misleading",
-  SEXUAL = "sexual",
-  OTHER = "other",
-}
+export const ReportReasons = ["spam", "misleading", "sexual", "other"] as const;
+export type ReportReasonType = (typeof ReportReasons)[number];
 
 export type ReportDTO = {
   actionedAt?: Date | null;
   actionedBy?: string | null;
   subjectUri: string;
-  subjectDid: string;
+  subjectDid: DID;
   subjectCollection?: string | null;
   subjectRkey?: string | null;
   subjectCid?: string | null;
-  createdBy: string;
+  createdBy: DID;
   createdAt: Date;
   creatorComment?: string | null;
-  reportReason?: ReportReason | null;
+  reportReason?: ReportReasonType | null;
   status?: "pending" | "accepted" | "rejected" | null;
 };
 
diff --git a/packages/frontpage/lib/data/db/user.ts b/packages/frontpage/lib/data/db/user.ts
index b11ca55a..097739b3 100644
--- a/packages/frontpage/lib/data/db/user.ts
+++ b/packages/frontpage/lib/data/db/user.ts
@@ -5,7 +5,7 @@ import * as schema from "@/lib/schema";
 type ModerateUserInput = {
   userDid: DID;
   hide: boolean;
-  label?: string;
+  label?: string | null;
 };
 
 export async function moderateUser({
diff --git a/packages/frontpage/lib/data/user.ts b/packages/frontpage/lib/data/user.ts
index f1e53f7d..b1b85548 100644
--- a/packages/frontpage/lib/data/user.ts
+++ b/packages/frontpage/lib/data/user.ts
@@ -65,7 +65,7 @@ export const isBetaUser = cache(async () => {
 });
 
 export const isAdmin = cache(async () => {
-  const user = await getUser();
+  const user = await ensureUser();
   if (!user) {
     return false;
   }

From c3fa5449f2ca0811dacad15bbddcc84525ae9827 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Thu, 3 Oct 2024 14:53:17 +0100
Subject: [PATCH 31/43] remove scroll area, enforce admin for sensitive actions

---
 .../frontpage/app/(app)/moderation/page.tsx   |  1 -
 .../lib/components/ui/scroll-area.tsx         | 48 -------------------
 packages/frontpage/lib/data/db/comment.ts     |  8 +++-
 packages/frontpage/lib/data/db/moderation.ts  |  7 +++
 packages/frontpage/lib/data/db/post.ts        | 41 ++++++++--------
 packages/frontpage/lib/data/db/report.ts      | 31 ++++++++++++
 packages/frontpage/lib/data/db/user.ts        |  7 +++
 packages/frontpage/lib/schema.ts              |  2 +
 packages/frontpage/package.json               |  1 -
 pnpm-lock.yaml                                | 33 -------------
 10 files changed, 75 insertions(+), 104 deletions(-)
 delete mode 100644 packages/frontpage/lib/components/ui/scroll-area.tsx

diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index 84179f1f..f5ca1c77 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -1,4 +1,3 @@
-"use server";
 import {
   Card,
   CardContent,
diff --git a/packages/frontpage/lib/components/ui/scroll-area.tsx b/packages/frontpage/lib/components/ui/scroll-area.tsx
deleted file mode 100644
index 0b4a48d8..00000000
--- a/packages/frontpage/lib/components/ui/scroll-area.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-"use client"
-
-import * as React from "react"
-import * as ScrollAreaPrimitive from "@radix-ui/react-scroll-area"
-
-import { cn } from "@/lib/utils"
-
-const ScrollArea = React.forwardRef<
-  React.ElementRef<typeof ScrollAreaPrimitive.Root>,
-  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.Root>
->(({ className, children, ...props }, ref) => (
-  <ScrollAreaPrimitive.Root
-    ref={ref}
-    className={cn("relative overflow-hidden", className)}
-    {...props}
-  >
-    <ScrollAreaPrimitive.Viewport className="h-full w-full rounded-[inherit]">
-      {children}
-    </ScrollAreaPrimitive.Viewport>
-    <ScrollBar />
-    <ScrollAreaPrimitive.Corner />
-  </ScrollAreaPrimitive.Root>
-))
-ScrollArea.displayName = ScrollAreaPrimitive.Root.displayName
-
-const ScrollBar = React.forwardRef<
-  React.ElementRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>,
-  React.ComponentPropsWithoutRef<typeof ScrollAreaPrimitive.ScrollAreaScrollbar>
->(({ className, orientation = "vertical", ...props }, ref) => (
-  <ScrollAreaPrimitive.ScrollAreaScrollbar
-    ref={ref}
-    orientation={orientation}
-    className={cn(
-      "flex touch-none select-none transition-colors",
-      orientation === "vertical" &&
-        "h-full w-2.5 border-l border-l-transparent p-[1px]",
-      orientation === "horizontal" &&
-        "h-2.5 flex-col border-t border-t-transparent p-[1px]",
-      className
-    )}
-    {...props}
-  >
-    <ScrollAreaPrimitive.ScrollAreaThumb className="relative flex-1 rounded-full bg-border" />
-  </ScrollAreaPrimitive.ScrollAreaScrollbar>
-))
-ScrollBar.displayName = ScrollAreaPrimitive.ScrollAreaScrollbar.displayName
-
-export { ScrollArea, ScrollBar }
diff --git a/packages/frontpage/lib/data/db/comment.ts b/packages/frontpage/lib/data/db/comment.ts
index 03e4fd9a..ca2c3380 100644
--- a/packages/frontpage/lib/data/db/comment.ts
+++ b/packages/frontpage/lib/data/db/comment.ts
@@ -11,7 +11,7 @@ import {
   isNotNull,
 } from "drizzle-orm";
 import * as schema from "@/lib/schema";
-import { getUser } from "../user";
+import { getUser, isAdmin } from "../user";
 import { DID } from "../atproto/did";
 import { Prettify } from "@/lib/utils";
 
@@ -255,6 +255,12 @@ export async function moderateComment({
   cid,
   hide,
 }: ModerateCommentInput) {
+  const adminUser = await isAdmin();
+
+  if (!adminUser) {
+    throw new Error("User is not an admin");
+  }
+
   console.log(`Moderating comment, setting hidden to ${hide}`);
   await db
     .update(schema.Comment)
diff --git a/packages/frontpage/lib/data/db/moderation.ts b/packages/frontpage/lib/data/db/moderation.ts
index 8545343a..0466633c 100644
--- a/packages/frontpage/lib/data/db/moderation.ts
+++ b/packages/frontpage/lib/data/db/moderation.ts
@@ -2,6 +2,7 @@ import "server-only";
 import { db } from "@/lib/db";
 import * as schema from "@/lib/schema";
 import { DID } from "../atproto/did";
+import { isAdmin } from "../user";
 
 export type ModerationEventDTO = {
   subjectUri: string;
@@ -19,6 +20,12 @@ export type ModerationEventDTO = {
 export async function createModerationEvent(
   moderationEvent: ModerationEventDTO,
 ) {
+  const adminUser = await isAdmin();
+
+  if (!adminUser) {
+    throw new Error("User is not an admin");
+  }
+
   await db.insert(schema.ModerationEvent).values(moderationEvent);
   return;
 }
diff --git a/packages/frontpage/lib/data/db/post.ts b/packages/frontpage/lib/data/db/post.ts
index 77331807..105308f2 100644
--- a/packages/frontpage/lib/data/db/post.ts
+++ b/packages/frontpage/lib/data/db/post.ts
@@ -4,7 +4,7 @@ import { cache } from "react";
 import { db } from "@/lib/db";
 import { eq, sql, count, desc, and, isNull, or } from "drizzle-orm";
 import * as schema from "@/lib/schema";
-import { getBlueskyProfile, getUser } from "../user";
+import { getBlueskyProfile, getUser, isAdmin } from "../user";
 import * as atprotoPost from "../atproto/post";
 import { DID } from "../atproto/did";
 import { sendDiscordMessage } from "@/lib/discord";
@@ -289,6 +289,11 @@ export async function moderatePost({
   cid,
   hide,
 }: ModeratePostInput) {
+  const adminUser = await isAdmin();
+
+  if (!adminUser) {
+    throw new Error("User is not an admin");
+  }
   console.log(`Moderating post, setting hidden to ${hide}`);
   await db
     .update(schema.Post)
@@ -302,24 +307,20 @@ export async function moderatePost({
     );
 }
 
-export async function getPostFromComment({
-  rkey,
-  did,
-}: {
-  rkey: string;
-  did: DID;
-}) {
-  const [join] = await db
-    .select()
-    .from(schema.Comment)
-    .where(
-      and(eq(schema.Comment.rkey, rkey), eq(schema.Comment.authorDid, did)),
-    )
-    .leftJoin(schema.Post, eq(schema.Comment.postId, schema.Post.id));
+export const getPostFromComment = cache(
+  async ({ did, rkey }: { did: DID; rkey: string }) => {
+    const [join] = await db
+      .select()
+      .from(schema.Comment)
+      .where(
+        and(eq(schema.Comment.rkey, rkey), eq(schema.Comment.authorDid, did)),
+      )
+      .leftJoin(schema.Post, eq(schema.Comment.postId, schema.Post.id));
 
-  if (!join || !join.posts) {
-    return null;
-  }
+    if (!join || !join.posts) {
+      return null;
+    }
 
-  return { postRkey: join.posts.rkey, postAuthor: join.posts.authorDid };
-}
+    return { postRkey: join.posts.rkey, postAuthor: join.posts.authorDid };
+  },
+);
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 28a0bb2e..5950277f 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -6,6 +6,7 @@ import { cache } from "react";
 import { InferSelectModel, eq } from "drizzle-orm";
 import { sendDiscordMessage } from "@/lib/discord";
 import { DID } from "../atproto/did";
+import { ensureUser, isAdmin } from "../user";
 
 export const ReportReasons = ["spam", "misleading", "sexual", "other"] as const;
 export type ReportReasonType = (typeof ReportReasons)[number];
@@ -29,6 +30,12 @@ export type Report = InferSelectModel<typeof schema.Report>;
 
 export const getReport = cache(
   async (reportId: number): Promise<Report | null> => {
+    const adminUser = await isAdmin();
+
+    if (!adminUser) {
+      throw new Error("User is not an admin");
+    }
+
     const [report] = await db
       .select()
       .from(schema.Report)
@@ -39,6 +46,12 @@ export const getReport = cache(
 );
 
 export const getModeratorReportStats = cache(async () => {
+  const adminUser = await isAdmin();
+
+  if (!adminUser) {
+    throw new Error("User is not an admin");
+  }
+
   const reports = await db.select().from(schema.Report);
 
   return {
@@ -53,6 +66,12 @@ export const getReports = cache(
   async (
     status: "pending" | "accepted" | "rejected" | null,
   ): Promise<Report[]> => {
+    const adminUser = await isAdmin();
+
+    if (!adminUser) {
+      throw new Error("User is not an admin");
+    }
+
     if (status) {
       return await db
         .select()
@@ -69,6 +88,12 @@ export const updateReport = async (
   status: "pending" | "accepted" | "rejected",
   actionedBy?: string,
 ) => {
+  const adminUser = await isAdmin();
+
+  if (!adminUser) {
+    throw new Error("User is not an admin");
+  }
+
   await db
     .update(schema.Report)
     .set({ status, actionedBy, actionedAt: new Date() })
@@ -78,6 +103,12 @@ export const updateReport = async (
 };
 
 export const createReport = async (report: ReportDTO) => {
+  const user = await ensureUser();
+
+  if (!user) {
+    throw new Error("The user is not authenticated");
+  }
+
   await db.insert(schema.Report).values(report);
 
   await sendDiscordMessage({
diff --git a/packages/frontpage/lib/data/db/user.ts b/packages/frontpage/lib/data/db/user.ts
index 097739b3..a95a43e6 100644
--- a/packages/frontpage/lib/data/db/user.ts
+++ b/packages/frontpage/lib/data/db/user.ts
@@ -1,6 +1,7 @@
 import { db } from "@/lib/db";
 import { DID } from "../atproto/did";
 import * as schema from "@/lib/schema";
+import { isAdmin } from "../user";
 
 type ModerateUserInput = {
   userDid: DID;
@@ -13,6 +14,12 @@ export async function moderateUser({
   hide,
   label,
 }: ModerateUserInput) {
+  const adminUser = await isAdmin();
+
+  if (!adminUser) {
+    throw new Error("User is not an admin");
+  }
+
   console.log(`Moderating user, setting hidden to ${hide}`);
   await db
     .insert(schema.LabelledProfile)
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index 4592f422..99455b40 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -180,6 +180,8 @@ export const LabelledProfile = sqliteTable("labelled_profiles", {
   did: text("did").notNull().unique(),
   isHidden: integer("is_hidden", { mode: "boolean" }).notNull().default(false),
   labels: text("labels"),
+  createdAt: dateIsoText("created_at").notNull(),
+  updatedAt: dateIsoText("updated_at").notNull(),
 });
 
 export const Report = sqliteTable("reports", {
diff --git a/packages/frontpage/package.json b/packages/frontpage/package.json
index efd29297..d7024bfb 100644
--- a/packages/frontpage/package.json
+++ b/packages/frontpage/package.json
@@ -26,7 +26,6 @@
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-label": "^2.1.0",
     "@radix-ui/react-popover": "^1.1.1",
-    "@radix-ui/react-scroll-area": "^1.1.0",
     "@radix-ui/react-select": "^2.1.1",
     "@radix-ui/react-separator": "^1.1.0",
     "@radix-ui/react-slot": "^1.1.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15bd366d..5ec8ad4e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -147,9 +147,6 @@ importers:
       '@radix-ui/react-popover':
         specifier: ^1.1.1
         version: 1.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-scroll-area':
-        specifier: ^1.1.0
-        version: 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
       '@radix-ui/react-select':
         specifier: ^2.1.1
         version: 2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
@@ -2049,19 +2046,6 @@ packages:
       '@types/react-dom':
         optional: true
 
-  '@radix-ui/react-scroll-area@1.1.0':
-    resolution: {integrity: sha512-9ArIZ9HWhsrfqS765h+GZuLoxaRHD/j0ZWOWilsCvYTpYJp8XwCqNG7Dt9Nu/TItKOdgLGkOPCodQvDc+UMwYg==}
-    peerDependencies:
-      '@types/react': '*'
-      '@types/react-dom': '*'
-      react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-      react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc
-    peerDependenciesMeta:
-      '@types/react':
-        optional: true
-      '@types/react-dom':
-        optional: true
-
   '@radix-ui/react-select@2.1.1':
     resolution: {integrity: sha512-8iRDfyLtzxlprOo9IicnzvpsO1wNCkuwzzCM+Z5Rb5tNOpCdMvcc2AkzX0Fz+Tz9v6NJ5B/7EEgyZveo4FBRfQ==}
     peerDependencies:
@@ -8089,23 +8073,6 @@ snapshots:
       '@types/react': 18.3.10
       '@types/react-dom': 18.3.0
 
-  '@radix-ui/react-scroll-area@1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
-    dependencies:
-      '@radix-ui/number': 1.1.0
-      '@radix-ui/primitive': 1.1.0
-      '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-context': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-direction': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-presence': 1.1.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-primitive': 2.0.0(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-callback-ref': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
-      '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.10)(react@19.0.0-rc-f994737d14-20240522)
-      react: 19.0.0-rc-f994737d14-20240522
-      react-dom: 19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522)
-    optionalDependencies:
-      '@types/react': 18.3.10
-      '@types/react-dom': 18.3.0
-
   '@radix-ui/react-select@2.1.1(@types/react-dom@18.3.0)(@types/react@18.3.10)(react-dom@19.0.0-rc-f994737d14-20240522(react@19.0.0-rc-f994737d14-20240522))(react@19.0.0-rc-f994737d14-20240522)':
     dependencies:
       '@radix-ui/number': 1.1.0

From 47a6aea38eff3ea67aba80ea314894f50a0174c8 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Thu, 3 Oct 2024 21:52:37 +0100
Subject: [PATCH 32/43] make suggested changes, add migration for times to
 labelled profiles

---
 .../app/(app)/_components/post-card.tsx       |  13 +-
 .../app/(app)/_components/report-button.tsx   |   2 +-
 .../moderation/_components/report-card.tsx    |   6 +-
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  |   3 +-
 .../drizzle/0005_remarkable_mister_fear.sql   |  14 +
 .../frontpage/drizzle/meta/0005_snapshot.json | 907 ++++++++++++++++++
 packages/frontpage/drizzle/meta/_journal.json |   7 +
 .../lib/components/user-hover-card.tsx        |   5 +-
 packages/frontpage/lib/data/db/moderation.ts  |  28 +-
 .../frontpage/lib/data/db/report-shared.ts    |   2 +
 packages/frontpage/lib/data/db/report.ts      |  41 +-
 packages/frontpage/lib/data/db/user.ts        |  10 +-
 packages/frontpage/lib/schema.ts              |   9 +-
 13 files changed, 1014 insertions(+), 33 deletions(-)
 create mode 100644 packages/frontpage/drizzle/0005_remarkable_mister_fear.sql
 create mode 100644 packages/frontpage/drizzle/meta/0005_snapshot.json
 create mode 100644 packages/frontpage/lib/data/db/report-shared.ts

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index e3cf8210..550acce6 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -8,7 +8,8 @@ import { PostCollection, deletePost } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
-import { ReportReasonType, createReport } from "@/lib/data/db/report";
+import { ReportReasonType } from "@/lib/data/db/report-shared";
+import { createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
 import { revalidatePath } from "next/cache";
 import { ReportButton } from "./report-button";
@@ -119,7 +120,7 @@ export async function PostCard({
             <div className="ml-auto">
               <EllipsisDropdown>
                 <ReportButton
-                  reportAction={ReportPostAction.bind(null, {
+                  reportAction={reportPostAction.bind(null, {
                     rkey,
                     cid,
                     author,
@@ -127,7 +128,7 @@ export async function PostCard({
                 />
                 {user?.did === author ? (
                   <DeleteButton
-                    deleteAction={DeletePostAction.bind(null, rkey)}
+                    deleteAction={deletePostAction.bind(null, rkey)}
                   />
                 ) : null}
               </EllipsisDropdown>
@@ -139,7 +140,7 @@ export async function PostCard({
   );
 }
 
-export async function DeletePostAction(rkey: string) {
+export async function deletePostAction(rkey: string) {
   "use server";
   await ensureUser();
   await deletePost(rkey);
@@ -147,7 +148,7 @@ export async function DeletePostAction(rkey: string) {
   revalidatePath("/");
 }
 
-export async function ReportPostAction(
+export async function reportPostAction(
   input: {
     rkey: string;
     cid: string;
@@ -172,8 +173,6 @@ export async function ReportPostAction(
     subjectUri: `at://${input.author}/${PostCollection}/${input.rkey}`,
     subjectDid: input.author,
     subjectCollection: PostCollection,
-    subjectRkey: input.rkey,
-    subjectCid: input.cid,
     createdBy: user.did as DID,
     createdAt: new Date(),
     creatorComment,
diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
index f4e93dc2..5d50132e 100644
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -24,7 +24,7 @@ import {
   SelectValue,
 } from "@/lib/components/ui/select";
 import { useState } from "react";
-import { ReportReasons } from "@/lib/data/db/report";
+import { ReportReasons } from "@/lib/data/db/report-shared";
 
 interface ReportButtonProps {
   reportAction: (formData: FormData) => Promise<void>;
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index c3a663c7..8a1adc24 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -26,7 +26,7 @@ const createLink = async (
       return `/post/${author}/${rkey}/`;
 
     case CommentCollection:
-      const { postRkey, postAuthor } = (await getPostFromComment({
+      const { postAuthor, postRkey } = (await getPostFromComment({
         rkey: rkey!,
         did: author!,
       }))!;
@@ -62,9 +62,7 @@ export async function ReportCard({ report }: { report: Report }) {
         <div className="flex flex-col mb-4 gap-1 flex-wrap">
           <p>
             <strong>Reported User: </strong>
-            {!report.subjectCollection ? (
-              <UserHandle key={report.id} userDid={report.subjectDid as DID} />
-            ) : null}
+            <UserHandle key={report.id} userDid={report.subjectDid as DID} />
           </p>
           <p>
             <strong className="mr-2">Reason:</strong>
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index aa9aaa97..f5638238 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -9,7 +9,8 @@ import { DID } from "@/lib/data/atproto/did";
 import { createVote, deleteVote } from "@/lib/data/atproto/vote";
 import { getComment, uncached_doesCommentExist } from "@/lib/data/db/comment";
 import { getPost } from "@/lib/data/db/post";
-import { ReportReasonType, createReport } from "@/lib/data/db/report";
+import { ReportReasonType } from "@/lib/data/db/report-shared";
+import { createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
 import { revalidatePath } from "next/cache";
diff --git a/packages/frontpage/drizzle/0005_remarkable_mister_fear.sql b/packages/frontpage/drizzle/0005_remarkable_mister_fear.sql
new file mode 100644
index 00000000..d3adba11
--- /dev/null
+++ b/packages/frontpage/drizzle/0005_remarkable_mister_fear.sql
@@ -0,0 +1,14 @@
+DROP TABLE `labelled_profiles`;
+--> statement-breakpoint
+
+CREATE TABLE `labelled_profiles` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`did` text NOT NULL,
+	`is_hidden` integer DEFAULT false NOT NULL,
+	`labels` text,
+	`created_at` text DEFAULT (current_timestamp) NOT NULL,
+	`updated_at` text DEFAULT (current_timestamp) NOT NULL
+);
+--> statement-breakpoint
+
+CREATE UNIQUE INDEX `labelled_profiles_did_unique` ON `labelled_profiles` (`did`);
diff --git a/packages/frontpage/drizzle/meta/0005_snapshot.json b/packages/frontpage/drizzle/meta/0005_snapshot.json
new file mode 100644
index 00000000..78bf5f9e
--- /dev/null
+++ b/packages/frontpage/drizzle/meta/0005_snapshot.json
@@ -0,0 +1,907 @@
+{
+  "version": "6",
+  "dialect": "sqlite",
+  "id": "dc6cb016-67f0-4897-bc3e-ffc446bc034e",
+  "prevId": "4b487ed2-7950-4a44-b051-057460b6f589",
+  "tables": {
+    "admin_users": {
+      "name": "admin_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "admin_users_did_unique": {
+          "name": "admin_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "beta_users": {
+      "name": "beta_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "beta_users_did_unique": {
+          "name": "beta_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comments": {
+      "name": "comments",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "body": {
+          "name": "body",
+          "type": "text(10000)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        },
+        "parent_comment_id": {
+          "name": "parent_comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comments_cid_unique": {
+          "name": "comments_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comments_author_did_rkey_unique": {
+          "name": "comments_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comments_post_id_posts_id_fk": {
+          "name": "comments_post_id_posts_id_fk",
+          "tableFrom": "comments",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        },
+        "parent_comment_id_fkey": {
+          "name": "parent_comment_id_fkey",
+          "tableFrom": "comments",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "parent_comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "comment_votes": {
+      "name": "comment_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "comment_id": {
+          "name": "comment_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "comment_votes_cid_unique": {
+          "name": "comment_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_rkey_unique": {
+          "name": "comment_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "comment_votes_author_did_comment_id_unique": {
+          "name": "comment_votes_author_did_comment_id_unique",
+          "columns": [
+            "author_did",
+            "comment_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "comment_votes_comment_id_comments_id_fk": {
+          "name": "comment_votes_comment_id_comments_id_fk",
+          "tableFrom": "comment_votes",
+          "tableTo": "comments",
+          "columnsFrom": [
+            "comment_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "consumed_offsets": {
+      "name": "consumed_offsets",
+      "columns": {
+        "offset": {
+          "name": "offset",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "labelled_profiles": {
+      "name": "labelled_profiles",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "is_hidden": {
+          "name": "is_hidden",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": false
+        },
+        "labels": {
+          "name": "labels",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        }
+      },
+      "indexes": {
+        "labelled_profiles_did_unique": {
+          "name": "labelled_profiles_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "moderation_events": {
+      "name": "moderation_events",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "labels_added": {
+          "name": "labels_added",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "labels_removed": {
+          "name": "labels_removed",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_type": {
+          "name": "report_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_auth_requests": {
+      "name": "oauth_auth_requests",
+      "columns": {
+        "state": {
+          "name": "state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "nonce": {
+          "name": "nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "pkce_verifier": {
+          "name": "pkce_verifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "oauth_auth_requests_state_unique": {
+          "name": "oauth_auth_requests_state_unique",
+          "columns": [
+            "state"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "oauth_sessions": {
+      "name": "oauth_sessions",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "username": {
+          "name": "username",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "iss": {
+          "name": "iss",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_nonce": {
+          "name": "dpop_nonce",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_private_jwk": {
+          "name": "dpop_private_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "dpop_public_jwk": {
+          "name": "dpop_public_jwk",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "posts": {
+      "name": "posts",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "title": {
+          "name": "title",
+          "type": "text(300)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "url": {
+          "name": "url",
+          "type": "text(255)",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'live'"
+        }
+      },
+      "indexes": {
+        "posts_cid_unique": {
+          "name": "posts_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "posts_author_did_rkey_unique": {
+          "name": "posts_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "post_votes": {
+      "name": "post_votes",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "post_id": {
+          "name": "post_id",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "author_did": {
+          "name": "author_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "cid": {
+          "name": "cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "rkey": {
+          "name": "rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "post_votes_cid_unique": {
+          "name": "post_votes_cid_unique",
+          "columns": [
+            "cid"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_rkey_unique": {
+          "name": "post_votes_author_did_rkey_unique",
+          "columns": [
+            "author_did",
+            "rkey"
+          ],
+          "isUnique": true
+        },
+        "post_votes_author_did_post_id_unique": {
+          "name": "post_votes_author_did_post_id_unique",
+          "columns": [
+            "author_did",
+            "post_id"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {
+        "post_votes_post_id_posts_id_fk": {
+          "name": "post_votes_post_id_posts_id_fk",
+          "tableFrom": "post_votes",
+          "tableTo": "posts",
+          "columnsFrom": [
+            "post_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "no action",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
+    "reports": {
+      "name": "reports",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "actioned_at": {
+          "name": "actioned_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "actioned_by": {
+          "name": "actioned_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_uri": {
+          "name": "subject_uri",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_did": {
+          "name": "subject_did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "subject_collection": {
+          "name": "subject_collection",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_rkey": {
+          "name": "subject_rkey",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "subject_cid": {
+          "name": "subject_cid",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "created_by": {
+          "name": "created_by",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "creator_comment": {
+          "name": "creator_comment",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "report_reason": {
+          "name": "report_reason",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'pending'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    }
+  },
+  "enums": {},
+  "_meta": {
+    "schemas": {},
+    "tables": {},
+    "columns": {}
+  },
+  "internal": {
+    "indexes": {}
+  }
+}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index 755e7859..d4241021 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -36,6 +36,13 @@
       "when": 1727472551203,
       "tag": "0004_jittery_random",
       "breakpoints": true
+    },
+    {
+      "idx": 5,
+      "version": "6",
+      "when": 1727983880995,
+      "tag": "0005_remarkable_mister_fear",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 67a6a203..67c55d27 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -4,7 +4,8 @@ import { DID } from "../data/atproto/did";
 import { getVerifiedHandle } from "../data/atproto/identity";
 import { UserHoverCardClient } from "./user-hover-card-client";
 import { ensureUser } from "../data/user";
-import { ReportReasonType, createReport } from "../data/db/report";
+import { ReportReasonType } from "../data/db/report-shared";
+import { createReport } from "../data/db/report";
 
 type Props = {
   did: DID;
@@ -57,8 +58,6 @@ export async function reportUserAction(
     subjectDid: input.did,
     createdBy: user.did as DID,
     createdAt: new Date(),
-    creatorComment,
-    reportReason,
     status: "pending",
   });
 }
diff --git a/packages/frontpage/lib/data/db/moderation.ts b/packages/frontpage/lib/data/db/moderation.ts
index 0466633c..b2c17083 100644
--- a/packages/frontpage/lib/data/db/moderation.ts
+++ b/packages/frontpage/lib/data/db/moderation.ts
@@ -17,15 +17,35 @@ export type ModerationEventDTO = {
   creatorReportReason?: string | null;
 };
 
-export async function createModerationEvent(
-  moderationEvent: ModerationEventDTO,
-) {
+export async function createModerationEvent({
+  subjectUri,
+  subjectDid,
+  subjectCollection,
+  subjectRkey,
+  subjectCid,
+  createdBy,
+  createdAt,
+  labelsAdded,
+  labelsRemoved,
+  creatorReportReason,
+}: ModerationEventDTO) {
   const adminUser = await isAdmin();
 
   if (!adminUser) {
     throw new Error("User is not an admin");
   }
 
-  await db.insert(schema.ModerationEvent).values(moderationEvent);
+  await db.insert(schema.ModerationEvent).values({
+    subjectUri,
+    subjectDid,
+    subjectCollection,
+    subjectRkey,
+    subjectCid,
+    createdBy,
+    createdAt,
+    labelsAdded,
+    labelsRemoved,
+    creatorReportReason,
+  });
   return;
 }
diff --git a/packages/frontpage/lib/data/db/report-shared.ts b/packages/frontpage/lib/data/db/report-shared.ts
new file mode 100644
index 00000000..eaf1d162
--- /dev/null
+++ b/packages/frontpage/lib/data/db/report-shared.ts
@@ -0,0 +1,2 @@
+export const ReportReasons = ["spam", "misleading", "sexual", "other"] as const;
+export type ReportReasonType = (typeof ReportReasons)[number];
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 5950277f..2a11c888 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -7,9 +7,7 @@ import { InferSelectModel, eq } from "drizzle-orm";
 import { sendDiscordMessage } from "@/lib/discord";
 import { DID } from "../atproto/did";
 import { ensureUser, isAdmin } from "../user";
-
-export const ReportReasons = ["spam", "misleading", "sexual", "other"] as const;
-export type ReportReasonType = (typeof ReportReasons)[number];
+import { ReportReasonType } from "./report-shared";
 
 export type ReportDTO = {
   actionedAt?: Date | null;
@@ -102,25 +100,50 @@ export const updateReport = async (
   return;
 };
 
-export const createReport = async (report: ReportDTO) => {
+export const createReport = async ({
+  actionedAt,
+  actionedBy,
+  subjectUri,
+  subjectDid,
+  subjectCollection,
+  subjectRkey,
+  subjectCid,
+  createdBy,
+  createdAt,
+  creatorComment,
+  reportReason,
+  status,
+}: ReportDTO) => {
   const user = await ensureUser();
 
   if (!user) {
     throw new Error("The user is not authenticated");
   }
 
-  await db.insert(schema.Report).values(report);
+  await db.insert(schema.Report).values({
+    actionedAt,
+    actionedBy,
+    subjectUri,
+    subjectDid,
+    subjectCollection,
+    subjectRkey,
+    subjectCid,
+    createdBy,
+    createdAt,
+    creatorComment,
+    reportReason,
+    status,
+  });
 
   await sendDiscordMessage({
     embeds: [
       {
         title: "New report on Frontpage",
-        description:
-          report.creatorComment ?? report.reportReason ?? "No reason provided",
-        url: report.subjectUri,
+        description: creatorComment ?? reportReason ?? "No reason provided",
+        url: subjectUri,
         color: 10181046,
         author: {
-          name: report.createdBy,
+          name: createdBy,
           icon_url: "",
           url: "",
         },
diff --git a/packages/frontpage/lib/data/db/user.ts b/packages/frontpage/lib/data/db/user.ts
index a95a43e6..f82d6a6a 100644
--- a/packages/frontpage/lib/data/db/user.ts
+++ b/packages/frontpage/lib/data/db/user.ts
@@ -23,9 +23,15 @@ export async function moderateUser({
   console.log(`Moderating user, setting hidden to ${hide}`);
   await db
     .insert(schema.LabelledProfile)
-    .values({ did: userDid, isHidden: hide, labels: label })
+    .values({
+      did: userDid,
+      isHidden: hide,
+      labels: label,
+      createdAt: new Date(),
+      updatedAt: new Date(),
+    })
     .onConflictDoUpdate({
       target: schema.LabelledProfile.did,
-      set: { isHidden: hide, labels: label },
+      set: { isHidden: hide, labels: label, updatedAt: new Date() },
     });
 }
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index 99455b40..eb8f0bef 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -12,6 +12,7 @@ import {
   MAX_POST_TITLE_LENGTH,
   MAX_POST_URL_LENGTH,
 } from "./data/db/constants";
+import { sql } from "drizzle-orm";
 
 const did = customType<{ data: DID }>({
   dataType() {
@@ -180,8 +181,12 @@ export const LabelledProfile = sqliteTable("labelled_profiles", {
   did: text("did").notNull().unique(),
   isHidden: integer("is_hidden", { mode: "boolean" }).notNull().default(false),
   labels: text("labels"),
-  createdAt: dateIsoText("created_at").notNull(),
-  updatedAt: dateIsoText("updated_at").notNull(),
+  createdAt: dateIsoText("created_at")
+    .notNull()
+    .default(sql`(current_timestamp)`),
+  updatedAt: dateIsoText("updated_at")
+    .notNull()
+    .default(sql`(current_timestamp)`),
 });
 
 export const Report = sqliteTable("reports", {

From 2ae8ef1a1f8043e4b4a43238a172a7a0af45efc5 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 4 Oct 2024 02:10:41 +0100
Subject: [PATCH 33/43] styling tweaks, re-add missing rkey and cid

---
 .../app/(app)/_components/post-card.tsx       |   3 +
 .../moderation/_components/report-card.tsx    |  24 ++--
 .../frontpage/app/(app)/moderation/page.tsx   | 126 +++++++++---------
 .../app/(app)/profile/[user]/page.tsx         |  10 +-
 .../lib/components/user-hover-card.tsx        |   2 +
 5 files changed, 84 insertions(+), 81 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 550acce6..f4125aba 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -169,10 +169,13 @@ export async function reportPostAction(
   ) {
     throw new Error("Missing creatorComment or reportReason or length > 250");
   }
+
   await createReport({
     subjectUri: `at://${input.author}/${PostCollection}/${input.rkey}`,
     subjectDid: input.author,
     subjectCollection: PostCollection,
+    subjectRkey: input.rkey,
+    subjectCid: input.cid,
     createdBy: user.did as DID,
     createdAt: new Date(),
     creatorComment,
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index 8a1adc24..c4e17716 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -39,12 +39,15 @@ const createLink = async (
 
 export async function ReportCard({ report }: { report: Report }) {
   return (
-    <Card className="dark:bg-gray-700 border-gray-600 mb-4">
-      <CardHeader className="pb-2">
-        <CardTitle className="text-lg flex items-center justify-between text-blue-400">
-          <p>Reported {report.subjectCollection ?? "User"}</p>
-          <p
-            className={`px-2 py-1 rounded-full text-xs 
+    <Card className="mb-2 flex flex-col">
+      <CardHeader>
+        <CardTitle className="text-blue-400">
+          {report.subjectCollection ?? "Reported User"}
+        </CardTitle>
+      </CardHeader>
+      <CardContent>
+        <p
+          className={`px-2 py-1 mb-2 rounded-full text-xs inline-flex
               ${cn({
                 "bg-yellow-500 text-destructive-foreground":
                   report.status === "pending",
@@ -53,12 +56,9 @@ export async function ReportCard({ report }: { report: Report }) {
                 "bg-destructive text-destructive-foreground":
                   report.status === "rejected",
               })}`}
-          >
-            {report.status}
-          </p>
-        </CardTitle>
-      </CardHeader>
-      <CardContent>
+        >
+          {report.status}
+        </p>
         <div className="flex flex-col mb-4 gap-1 flex-wrap">
           <p>
             <strong>Reported User: </strong>
diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index f5ca1c77..d71c0191 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -26,7 +26,6 @@ import { moderatePost } from "@/lib/data/db/post";
 import { DID } from "@/lib/data/atproto/did";
 import { moderateComment } from "@/lib/data/db/comment";
 import { moderateUser } from "@/lib/data/db/user";
-import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
 
 export async function performModerationAction(
   input: { reportId: number; status: "accepted" | "rejected" },
@@ -117,76 +116,73 @@ export default async function Moderation({
   if (await isAdmin()) {
     return (
       <>
-        <Card className="bg-gray-800 border-gray-700 mb-6">
-          <CardHeader>
-            <CardTitle className="text-2xl font-bold flex items-center gap-2 text-blue-300">
-              <ExclamationTriangleIcon className="scale-150 mr-1" />
+        <Card className="mb-4">
+          <CardHeader className="flex justify-evenly text-center">
+            <CardTitle className="text-2xl font-bold text-blue-300">
               Moderation Dashboard
             </CardTitle>
             <CardDescription className="text-gray-300">
               Review and take action on reported content
             </CardDescription>
           </CardHeader>
-          <CardContent>
-            <div className="grid grid-cols-1 md:grid-cols-4 gap-4 mb-6">
-              <Link href="/moderation">
-                <Card className="bg-gray-700 border-gray-600">
-                  <CardHeader className="pb-2">
-                    <CardTitle className="text-sm font-medium text-gray-400">
-                      Total Reports
-                    </CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <div className="text-2xl font-bold text-blue-300">
-                      {stats.total}
-                    </div>
-                  </CardContent>
-                </Card>
-              </Link>
-              <Link href="/moderation?status=pending">
-                <Card className="bg-gray-700 border-gray-600">
-                  <CardHeader className="pb-2">
-                    <CardTitle className="text-sm font-medium text-gray-400">
-                      Pending
-                    </CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <div className="text-2xl font-bold text-yellow-300">
-                      {stats.pending}
-                    </div>
-                  </CardContent>
-                </Card>
-              </Link>
-              <Link href="/moderation?status=accepted">
-                <Card className="bg-gray-700 border-gray-600">
-                  <CardHeader className="pb-2">
-                    <CardTitle className="text-sm font-medium text-gray-400">
-                      Accepted
-                    </CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <div className="text-2xl font-bold text-green-300">
-                      {stats.accepted}
-                    </div>
-                  </CardContent>
-                </Card>
-              </Link>
-
-              <Link href="/moderation?status=rejected">
-                <Card className={`bg-gray-700 border-gray-600 `}>
-                  <CardHeader className="pb-2">
-                    <CardTitle className="text-sm font-medium text-gray-400">
-                      Rejected
-                    </CardTitle>
-                  </CardHeader>
-                  <CardContent>
-                    <div className="text-2xl font-bold text-red-300">
-                      {stats.rejected}
-                    </div>
-                  </CardContent>
-                </Card>
-              </Link>
-            </div>
+          <CardContent className="flex flex-wrap">
+            <Link href="/moderation" className="flex-1">
+              <Card className="text-center">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-sm font-medium text-gray-400">
+                    Total Reports
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <div className="text-2xl font-bold text-blue-300">
+                    {stats.total}
+                  </div>
+                </CardContent>
+              </Card>
+            </Link>
+            <Link href="/moderation?status=pending" className="flex-1">
+              <Card className="text-center">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-sm font-medium text-gray-400">
+                    Pending
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <div className="text-2xl font-bold text-yellow-300">
+                    {stats.pending}
+                  </div>
+                </CardContent>
+              </Card>
+            </Link>
+            <Link href="/moderation?status=accepted" className="flex-1">
+              <Card className="text-center">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-sm font-medium text-gray-400">
+                    Accepted
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <div className="text-2xl font-bold text-green-300">
+                    {stats.accepted}
+                  </div>
+                </CardContent>
+              </Card>
+            </Link>
+
+            <Link href="/moderation?status=rejected" className="flex-1">
+              <Card className="text-center">
+                <CardHeader className="pb-2">
+                  <CardTitle className="text-sm font-medium text-gray-400">
+                    Rejected
+                  </CardTitle>
+                </CardHeader>
+                <CardContent>
+                  <div className="text-2xl font-bold text-red-300">
+                    {stats.rejected}
+                  </div>
+                </CardContent>
+              </Card>
+            </Link>
           </CardContent>
         </Card>
         {reports.map((report) => (
diff --git a/packages/frontpage/app/(app)/profile/[user]/page.tsx b/packages/frontpage/app/(app)/profile/[user]/page.tsx
index 20581ab3..1f27cc0f 100644
--- a/packages/frontpage/app/(app)/profile/[user]/page.tsx
+++ b/packages/frontpage/app/(app)/profile/[user]/page.tsx
@@ -51,10 +51,12 @@ export default async function Profile({ params }: { params: Params }) {
     <>
       <div className="flex items-center space-x-4 mb-4">
         <UserAvatar did={did} size="medium" />
-        <h1 className="text-2xl font-bold">{bskyProfile.handle}</h1>
-        <EllipsisDropdown>
-          <ReportButton reportAction={reportUserAction.bind(null, { did })} />
-        </EllipsisDropdown>
+        <div className="flex flex-wrap items-center gap-2">
+          <h1 className="md:text-2xl font-bold">{bskyProfile.handle}</h1>
+          <EllipsisDropdown>
+            <ReportButton reportAction={reportUserAction.bind(null, { did })} />
+          </EllipsisDropdown>
+        </div>
       </div>
       <Tabs defaultValue="overview">
         <TabsList>
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 67c55d27..0429599a 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -58,6 +58,8 @@ export async function reportUserAction(
     subjectDid: input.did,
     createdBy: user.did as DID,
     createdAt: new Date(),
+    creatorComment: creatorComment,
+    reportReason: reportReason,
     status: "pending",
   });
 }

From e7842b428db24e16c680578724357a6583027302 Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 18:10:21 +0100
Subject: [PATCH 34/43] Lazy load admin button

---
 packages/frontpage/app/(app)/layout.tsx | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/frontpage/app/(app)/layout.tsx b/packages/frontpage/app/(app)/layout.tsx
index 4281f408..6209fad4 100644
--- a/packages/frontpage/app/(app)/layout.tsx
+++ b/packages/frontpage/app/(app)/layout.tsx
@@ -123,13 +123,17 @@ async function LoginOrLogout() {
               Profile
             </Link>
           </DropdownMenuItem>
-          {(await isAdmin()) ? (
-            <DropdownMenuItem asChild>
-              <Link href="/moderation" className="cursor-pointer">
-                Moderation
-              </Link>
-            </DropdownMenuItem>
-          ) : null}
+          <Suspense fallback={null}>
+            {isAdmin().then((isAdmin) =>
+              isAdmin ? (
+                <DropdownMenuItem asChild>
+                  <Link href="/moderation" className="cursor-pointer">
+                    Moderation
+                  </Link>
+                </DropdownMenuItem>
+              ) : null,
+            )}
+          </Suspense>
           <DropdownMenuSeparator />
           <form
             action={async () => {

From ee144574834aca795b03468600a105d3f0db2b4b Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 18:13:23 +0100
Subject: [PATCH 35/43] Early return

---
 .../frontpage/app/(app)/moderation/page.tsx   | 160 +++++++++---------
 1 file changed, 80 insertions(+), 80 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/page.tsx b/packages/frontpage/app/(app)/moderation/page.tsx
index d71c0191..fe4d873a 100644
--- a/packages/frontpage/app/(app)/moderation/page.tsx
+++ b/packages/frontpage/app/(app)/moderation/page.tsx
@@ -103,6 +103,10 @@ export default async function Moderation({
 }: {
   searchParams: { status: string };
 }) {
+  if (!(await isAdmin())) {
+    redirect("/");
+  }
+
   const status = (searchParams.status as StatusTypes) ?? null;
 
   const reportList = await getReports(status);
@@ -113,84 +117,80 @@ export default async function Moderation({
 
   const stats = await getModeratorReportStats();
 
-  if (await isAdmin()) {
-    return (
-      <>
-        <Card className="mb-4">
-          <CardHeader className="flex justify-evenly text-center">
-            <CardTitle className="text-2xl font-bold text-blue-300">
-              Moderation Dashboard
-            </CardTitle>
-            <CardDescription className="text-gray-300">
-              Review and take action on reported content
-            </CardDescription>
-          </CardHeader>
-          <CardContent className="flex flex-wrap">
-            <Link href="/moderation" className="flex-1">
-              <Card className="text-center">
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-sm font-medium text-gray-400">
-                    Total Reports
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <div className="text-2xl font-bold text-blue-300">
-                    {stats.total}
-                  </div>
-                </CardContent>
-              </Card>
-            </Link>
-            <Link href="/moderation?status=pending" className="flex-1">
-              <Card className="text-center">
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-sm font-medium text-gray-400">
-                    Pending
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <div className="text-2xl font-bold text-yellow-300">
-                    {stats.pending}
-                  </div>
-                </CardContent>
-              </Card>
-            </Link>
-            <Link href="/moderation?status=accepted" className="flex-1">
-              <Card className="text-center">
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-sm font-medium text-gray-400">
-                    Accepted
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <div className="text-2xl font-bold text-green-300">
-                    {stats.accepted}
-                  </div>
-                </CardContent>
-              </Card>
-            </Link>
-
-            <Link href="/moderation?status=rejected" className="flex-1">
-              <Card className="text-center">
-                <CardHeader className="pb-2">
-                  <CardTitle className="text-sm font-medium text-gray-400">
-                    Rejected
-                  </CardTitle>
-                </CardHeader>
-                <CardContent>
-                  <div className="text-2xl font-bold text-red-300">
-                    {stats.rejected}
-                  </div>
-                </CardContent>
-              </Card>
-            </Link>
-          </CardContent>
-        </Card>
-        {reports.map((report) => (
-          <ReportCard key={report.id} report={report} />
-        ))}
-      </>
-    );
-  } else {
-    redirect("/");
-  }
+  return (
+    <>
+      <Card className="mb-4">
+        <CardHeader className="flex justify-evenly text-center">
+          <CardTitle className="text-2xl font-bold text-blue-300">
+            Moderation Dashboard
+          </CardTitle>
+          <CardDescription className="text-gray-300">
+            Review and take action on reported content
+          </CardDescription>
+        </CardHeader>
+        <CardContent className="flex flex-wrap">
+          <Link href="/moderation" className="flex-1">
+            <Card className="text-center">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Total Reports
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-blue-300">
+                  {stats.total}
+                </div>
+              </CardContent>
+            </Card>
+          </Link>
+          <Link href="/moderation?status=pending" className="flex-1">
+            <Card className="text-center">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Pending
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-yellow-300">
+                  {stats.pending}
+                </div>
+              </CardContent>
+            </Card>
+          </Link>
+          <Link href="/moderation?status=accepted" className="flex-1">
+            <Card className="text-center">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Accepted
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-green-300">
+                  {stats.accepted}
+                </div>
+              </CardContent>
+            </Card>
+          </Link>
+
+          <Link href="/moderation?status=rejected" className="flex-1">
+            <Card className="text-center">
+              <CardHeader className="pb-2">
+                <CardTitle className="text-sm font-medium text-gray-400">
+                  Rejected
+                </CardTitle>
+              </CardHeader>
+              <CardContent>
+                <div className="text-2xl font-bold text-red-300">
+                  {stats.rejected}
+                </div>
+              </CardContent>
+            </Card>
+          </Link>
+        </CardContent>
+      </Card>
+      {reports.map((report) => (
+        <ReportCard key={report.id} report={report} />
+      ))}
+    </>
+  );
 }

From 68959134b384abb5681cb84c742c7168e93f0133 Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 18:15:44 +0100
Subject: [PATCH 36/43] Promise.all

---
 packages/frontpage/app/(app)/_components/post-card.tsx      | 6 ++++--
 .../app/(app)/moderation/_components/report-card.tsx        | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index f4125aba..a69ec9a1 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -40,9 +40,11 @@ export async function PostCard({
   cid,
   isUpvoted,
 }: PostProps) {
-  const handle = await getVerifiedHandle(author);
+  const [handle, user] = await Promise.all([
+    getVerifiedHandle(author),
+    getUser(),
+  ]);
   const postHref = `/post/${handle}/${rkey}`;
-  const user = await getUser();
 
   return (
     // TODO: Make article route to postHref via onClick on card except innser links or buttons
diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index c4e17716..69cd895c 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -1,4 +1,3 @@
-"use server";
 import { Button } from "@/lib/components/ui/button";
 import {
   Card,

From 45f19836b419ed02dfe61e14f3107b702615fe8c Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 4 Oct 2024 19:06:48 +0100
Subject: [PATCH 37/43] update schema datetimes and discord webhook fields

---
 .../moderation/_components/report-card.tsx    |  7 +++---
 packages/frontpage/lib/data/db/report.ts      |  9 ++++---
 packages/frontpage/lib/data/db/shared.ts      | 25 +++++++++++++++++++
 packages/frontpage/lib/schema.ts              |  8 ++++--
 4 files changed, 39 insertions(+), 10 deletions(-)
 create mode 100644 packages/frontpage/lib/data/db/shared.ts

diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index 69cd895c..45fc6133 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -9,11 +9,11 @@ import { DID } from "@/lib/data/atproto/did";
 import { Report } from "@/lib/data/db/report";
 import { performModerationAction } from "../page";
 import { UserHandle } from "./user-handle";
-import { PostCollection } from "@/lib/data/atproto/post";
-import { CommentCollection } from "@/lib/data/atproto/comment";
 import Link from "next/link";
-import { getPostFromComment } from "@/lib/data/db/post";
 import { cn } from "@/lib/utils";
+import { CommentCollection } from "@/lib/data/atproto/comment";
+import { PostCollection } from "@/lib/data/atproto/post";
+import { getPostFromComment } from "@/lib/data/db/post";
 
 const createLink = async (
   collection?: string | null,
@@ -34,7 +34,6 @@ const createLink = async (
     default:
       return `/profile/${author}/`;
   }
-};
 
 export async function ReportCard({ report }: { report: Report }) {
   return (
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 2a11c888..d0ba5127 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -8,6 +8,7 @@ import { sendDiscordMessage } from "@/lib/discord";
 import { DID } from "../atproto/did";
 import { ensureUser, isAdmin } from "../user";
 import { ReportReasonType } from "./report-shared";
+import { createLink } from "./shared";
 
 export type ReportDTO = {
   actionedAt?: Date | null;
@@ -140,17 +141,17 @@ export const createReport = async ({
       {
         title: "New report on Frontpage",
         description: creatorComment ?? reportReason ?? "No reason provided",
-        url: subjectUri,
+        url: "https://frontpage.fyi/moderation?status=pending",
         color: 10181046,
         author: {
           name: createdBy,
           icon_url: "",
-          url: "",
+          url: `https://frontpage.fyi/profile/${createdBy}`,
         },
         fields: [
           {
-            name: "Link",
-            value: "https://frontpage.fyi/moderation",
+            name: "Link to post/comment/user",
+            value: `${await createLink(subjectCollection, subjectDid, subjectRkey)}`,
           },
         ],
       },
diff --git a/packages/frontpage/lib/data/db/shared.ts b/packages/frontpage/lib/data/db/shared.ts
new file mode 100644
index 00000000..c7569c1d
--- /dev/null
+++ b/packages/frontpage/lib/data/db/shared.ts
@@ -0,0 +1,25 @@
+import { CommentCollection } from "../atproto/comment";
+import { DID } from "../atproto/did";
+import { PostCollection } from "../atproto/post";
+import { getPostFromComment } from "./post";
+
+export const createLink = async (
+  collection?: string | null,
+  author?: DID | null,
+  rkey?: string | null,
+) => {
+  switch (collection) {
+    case PostCollection:
+      return `/post/${author}/${rkey}/`;
+
+    case CommentCollection:
+      const { postAuthor, postRkey } = (await getPostFromComment({
+        rkey: rkey!,
+        did: author!,
+      }))!;
+      return `/post/${postAuthor}/${postRkey}/${author}/${rkey}/`;
+
+    default:
+      return `/profile/${author}/`;
+  }
+};
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index eb8f0bef..8f14d005 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -170,7 +170,9 @@ export const ModerationEvent = sqliteTable("moderation_events", {
   subjectRkey: text("subject_rkey"),
   subjectCid: text("subject_cid"),
   createdBy: text("created_by").notNull(),
-  createdAt: dateIsoText("created_at").notNull(),
+  createdAt: dateIsoText("created_at")
+    .notNull()
+    .default(sql`(current_timestamp)`),
   labelsAdded: text("labels_added"),
   labelsRemoved: text("labels_removed"),
   creatorReportReason: text("report_type"),
@@ -199,7 +201,9 @@ export const Report = sqliteTable("reports", {
   subjectRkey: text("subject_rkey"),
   subjectCid: text("subject_cid"),
   createdBy: text("created_by").notNull(),
-  createdAt: dateIsoText("created_at").notNull(),
+  createdAt: dateIsoText("created_at")
+    .notNull()
+    .default(sql`(current_timestamp)`),
   creatorComment: text("creator_comment"),
   reportReason: text("report_reason"),
   status: text("status", {

From b813a1effcf06991031a28e5c47332eebc7882b1 Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 4 Oct 2024 21:19:17 +0100
Subject: [PATCH 38/43] get rooturl based on env

---
 .../(app)/moderation/_components/report-card.tsx   |  1 +
 packages/frontpage/lib/data/db/report.ts           | 10 ++++++----
 packages/frontpage/lib/data/db/shared.ts           | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
index 45fc6133..25aa0f6c 100644
--- a/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
+++ b/packages/frontpage/app/(app)/moderation/_components/report-card.tsx
@@ -34,6 +34,7 @@ const createLink = async (
     default:
       return `/profile/${author}/`;
   }
+};
 
 export async function ReportCard({ report }: { report: Report }) {
   return (
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index d0ba5127..11ad3218 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -8,7 +8,7 @@ import { sendDiscordMessage } from "@/lib/discord";
 import { DID } from "../atproto/did";
 import { ensureUser, isAdmin } from "../user";
 import { ReportReasonType } from "./report-shared";
-import { createLink } from "./shared";
+import { createFrontPageLink, getRootUrl } from "./shared";
 
 export type ReportDTO = {
   actionedAt?: Date | null;
@@ -136,22 +136,24 @@ export const createReport = async ({
     status,
   });
 
+  const rootUrl = getRootUrl();
+
   await sendDiscordMessage({
     embeds: [
       {
         title: "New report on Frontpage",
         description: creatorComment ?? reportReason ?? "No reason provided",
-        url: "https://frontpage.fyi/moderation?status=pending",
+        url: `${rootUrl}/moderation?status=pending`,
         color: 10181046,
         author: {
           name: createdBy,
           icon_url: "",
-          url: `https://frontpage.fyi/profile/${createdBy}`,
+          url: `${rootUrl}/profile/${createdBy}`,
         },
         fields: [
           {
             name: "Link to post/comment/user",
-            value: `${await createLink(subjectCollection, subjectDid, subjectRkey)}`,
+            value: `${rootUrl}${await createFrontPageLink(subjectCollection, subjectDid, subjectRkey)}`,
           },
         ],
       },
diff --git a/packages/frontpage/lib/data/db/shared.ts b/packages/frontpage/lib/data/db/shared.ts
index c7569c1d..c3e6a049 100644
--- a/packages/frontpage/lib/data/db/shared.ts
+++ b/packages/frontpage/lib/data/db/shared.ts
@@ -1,9 +1,21 @@
+import { headers } from "next/headers";
 import { CommentCollection } from "../atproto/comment";
 import { DID } from "../atproto/did";
 import { PostCollection } from "../atproto/post";
 import { getPostFromComment } from "./post";
 
-export const createLink = async (
+export const getRootUrl = () => {
+  const host =
+    process.env.NODE_ENV === "development"
+      ? headers().get("host")
+      : process.env.VERCEL_ENV === "production"
+        ? process.env.VERCEL_PROJECT_PRODUCTION_URL!
+        : process.env.VERCEL_BRANCH_URL!;
+
+  return `https://${host}`;
+};
+
+export const createFrontPageLink = async (
   collection?: string | null,
   author?: DID | null,
   rkey?: string | null,

From 22a863139037d243038ef667261b7c67c9a3ba8b Mon Sep 17 00:00:00 2001
From: WillCorrigan <wcorrigan90@gmail.com>
Date: Fri, 4 Oct 2024 21:33:28 +0100
Subject: [PATCH 39/43] redo schema for completeness

---
 ...iel_stane.sql => 0002_nifty_nick_fury.sql} |  18 +-
 .../drizzle/0003_superb_lilandra.sql          |   1 -
 .../frontpage/drizzle/0004_jittery_random.sql |   7 -
 .../drizzle/0005_remarkable_mister_fear.sql   |  14 -
 .../frontpage/drizzle/meta/0002_snapshot.json |  71 +-
 .../frontpage/drizzle/meta/0003_snapshot.json | 853 ----------------
 .../frontpage/drizzle/meta/0004_snapshot.json | 891 -----------------
 .../frontpage/drizzle/meta/0005_snapshot.json | 907 ------------------
 packages/frontpage/drizzle/meta/_journal.json |  25 +-
 packages/frontpage/lib/schema.ts              |   4 +-
 10 files changed, 87 insertions(+), 2704 deletions(-)
 rename packages/frontpage/drizzle/{0002_windy_ezekiel_stane.sql => 0002_nifty_nick_fury.sql} (61%)
 delete mode 100644 packages/frontpage/drizzle/0003_superb_lilandra.sql
 delete mode 100644 packages/frontpage/drizzle/0004_jittery_random.sql
 delete mode 100644 packages/frontpage/drizzle/0005_remarkable_mister_fear.sql
 delete mode 100644 packages/frontpage/drizzle/meta/0003_snapshot.json
 delete mode 100644 packages/frontpage/drizzle/meta/0004_snapshot.json
 delete mode 100644 packages/frontpage/drizzle/meta/0005_snapshot.json

diff --git a/packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql b/packages/frontpage/drizzle/0002_nifty_nick_fury.sql
similarity index 61%
rename from packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql
rename to packages/frontpage/drizzle/0002_nifty_nick_fury.sql
index dba1ce15..8e89b8a0 100644
--- a/packages/frontpage/drizzle/0002_windy_ezekiel_stane.sql
+++ b/packages/frontpage/drizzle/0002_nifty_nick_fury.sql
@@ -1,8 +1,16 @@
+CREATE TABLE `admin_users` (
+	`id` integer PRIMARY KEY NOT NULL,
+	`created_at` text DEFAULT (current_timestamp) NOT NULL,
+	`did` text NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE `labelled_profiles` (
 	`id` integer PRIMARY KEY NOT NULL,
 	`did` text NOT NULL,
 	`is_hidden` integer DEFAULT false NOT NULL,
-	`labels` text
+	`labels` text,
+	`created_at` text DEFAULT (current_timestamp) NOT NULL,
+	`updated_at` text DEFAULT (current_timestamp) NOT NULL
 );
 --> statement-breakpoint
 CREATE TABLE `moderation_events` (
@@ -13,7 +21,7 @@ CREATE TABLE `moderation_events` (
 	`subject_rkey` text,
 	`subject_cid` text,
 	`created_by` text NOT NULL,
-	`created_at` text NOT NULL,
+	`created_at` text DEFAULT (current_timestamp) NOT NULL,
 	`labels_added` text,
 	`labels_removed` text,
 	`report_type` text
@@ -29,9 +37,11 @@ CREATE TABLE `reports` (
 	`subject_rkey` text,
 	`subject_cid` text,
 	`created_by` text NOT NULL,
-	`created_at` text NOT NULL,
+	`created_at` text DEFAULT (current_timestamp) NOT NULL,
 	`creator_comment` text,
-	`report_reason` text
+	`report_reason` text,
+	`status` text DEFAULT 'pending'
 );
 --> statement-breakpoint
+CREATE UNIQUE INDEX `admin_users_did_unique` ON `admin_users` (`did`);--> statement-breakpoint
 CREATE UNIQUE INDEX `labelled_profiles_did_unique` ON `labelled_profiles` (`did`);
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/0003_superb_lilandra.sql b/packages/frontpage/drizzle/0003_superb_lilandra.sql
deleted file mode 100644
index bdb5f03c..00000000
--- a/packages/frontpage/drizzle/0003_superb_lilandra.sql
+++ /dev/null
@@ -1 +0,0 @@
-ALTER TABLE `reports` ADD `status` text DEFAULT 'pending';
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/0004_jittery_random.sql b/packages/frontpage/drizzle/0004_jittery_random.sql
deleted file mode 100644
index 8b3edc88..00000000
--- a/packages/frontpage/drizzle/0004_jittery_random.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-CREATE TABLE `admin_users` (
-	`id` integer PRIMARY KEY NOT NULL,
-	`created_at` text NOT NULL,
-	`did` text NOT NULL
-);
---> statement-breakpoint
-CREATE UNIQUE INDEX `admin_users_did_unique` ON `admin_users` (`did`);
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/0005_remarkable_mister_fear.sql b/packages/frontpage/drizzle/0005_remarkable_mister_fear.sql
deleted file mode 100644
index d3adba11..00000000
--- a/packages/frontpage/drizzle/0005_remarkable_mister_fear.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-DROP TABLE `labelled_profiles`;
---> statement-breakpoint
-
-CREATE TABLE `labelled_profiles` (
-	`id` integer PRIMARY KEY NOT NULL,
-	`did` text NOT NULL,
-	`is_hidden` integer DEFAULT false NOT NULL,
-	`labels` text,
-	`created_at` text DEFAULT (current_timestamp) NOT NULL,
-	`updated_at` text DEFAULT (current_timestamp) NOT NULL
-);
---> statement-breakpoint
-
-CREATE UNIQUE INDEX `labelled_profiles_did_unique` ON `labelled_profiles` (`did`);
diff --git a/packages/frontpage/drizzle/meta/0002_snapshot.json b/packages/frontpage/drizzle/meta/0002_snapshot.json
index 4bd598a0..ad6d719c 100644
--- a/packages/frontpage/drizzle/meta/0002_snapshot.json
+++ b/packages/frontpage/drizzle/meta/0002_snapshot.json
@@ -1,9 +1,48 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "0374b59d-b2ce-4b76-8dde-835281e84750",
+  "id": "d5fcf5e1-b731-4ff1-9811-4dbf5002f67e",
   "prevId": "dcb0c712-e046-420d-9fc3-bdcc9f58fa45",
   "tables": {
+    "admin_users": {
+      "name": "admin_users",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "integer",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        },
+        "did": {
+          "name": "did",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {
+        "admin_users_did_unique": {
+          "name": "admin_users_did_unique",
+          "columns": [
+            "did"
+          ],
+          "isUnique": true
+        }
+      },
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {}
+    },
     "beta_users": {
       "name": "beta_users",
       "columns": {
@@ -294,6 +333,22 @@
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "(current_timestamp)"
         }
       },
       "indexes": {
@@ -366,7 +421,8 @@
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": "(current_timestamp)"
         },
         "labels_added": {
           "name": "labels_added",
@@ -810,7 +866,8 @@
           "type": "text",
           "primaryKey": false,
           "notNull": true,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": "(current_timestamp)"
         },
         "creator_comment": {
           "name": "creator_comment",
@@ -825,6 +882,14 @@
           "primaryKey": false,
           "notNull": false,
           "autoincrement": false
+        },
+        "status": {
+          "name": "status",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false,
+          "default": "'pending'"
         }
       },
       "indexes": {},
diff --git a/packages/frontpage/drizzle/meta/0003_snapshot.json b/packages/frontpage/drizzle/meta/0003_snapshot.json
deleted file mode 100644
index ac4f6373..00000000
--- a/packages/frontpage/drizzle/meta/0003_snapshot.json
+++ /dev/null
@@ -1,853 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "568f232e-f6bf-4e4d-b3da-c7dc1fae9cc0",
-  "prevId": "0374b59d-b2ce-4b76-8dde-835281e84750",
-  "tables": {
-    "beta_users": {
-      "name": "beta_users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "beta_users_did_unique": {
-          "name": "beta_users_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comments": {
-      "name": "comments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "body": {
-          "name": "body",
-          "type": "text(10000)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        },
-        "parent_comment_id": {
-          "name": "parent_comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comments_cid_unique": {
-          "name": "comments_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comments_author_did_rkey_unique": {
-          "name": "comments_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comments_post_id_posts_id_fk": {
-          "name": "comments_post_id_posts_id_fk",
-          "tableFrom": "comments",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "parent_comment_id_fkey": {
-          "name": "parent_comment_id_fkey",
-          "tableFrom": "comments",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "parent_comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comment_votes": {
-      "name": "comment_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "comment_id": {
-          "name": "comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comment_votes_cid_unique": {
-          "name": "comment_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_rkey_unique": {
-          "name": "comment_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_comment_id_unique": {
-          "name": "comment_votes_author_did_comment_id_unique",
-          "columns": [
-            "author_did",
-            "comment_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comment_votes_comment_id_comments_id_fk": {
-          "name": "comment_votes_comment_id_comments_id_fk",
-          "tableFrom": "comment_votes",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "consumed_offsets": {
-      "name": "consumed_offsets",
-      "columns": {
-        "offset": {
-          "name": "offset",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "labelled_profiles": {
-      "name": "labelled_profiles",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "is_hidden": {
-          "name": "is_hidden",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "labels": {
-          "name": "labels",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "labelled_profiles_did_unique": {
-          "name": "labelled_profiles_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "moderation_events": {
-      "name": "moderation_events",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "labels_added": {
-          "name": "labels_added",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "labels_removed": {
-          "name": "labels_removed",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_type": {
-          "name": "report_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "oauth_auth_requests": {
-      "name": "oauth_auth_requests",
-      "columns": {
-        "state": {
-          "name": "state",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iss": {
-          "name": "iss",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "nonce": {
-          "name": "nonce",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "pkce_verifier": {
-          "name": "pkce_verifier",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_private_jwk": {
-          "name": "dpop_private_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_public_jwk": {
-          "name": "dpop_public_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "oauth_auth_requests_state_unique": {
-          "name": "oauth_auth_requests_state_unique",
-          "columns": [
-            "state"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "oauth_sessions": {
-      "name": "oauth_sessions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iss": {
-          "name": "iss",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "access_token": {
-          "name": "access_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "refresh_token": {
-          "name": "refresh_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_nonce": {
-          "name": "dpop_nonce",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_private_jwk": {
-          "name": "dpop_private_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_public_jwk": {
-          "name": "dpop_public_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "posts": {
-      "name": "posts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text(300)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        }
-      },
-      "indexes": {
-        "posts_cid_unique": {
-          "name": "posts_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "posts_author_did_rkey_unique": {
-          "name": "posts_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "post_votes": {
-      "name": "post_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "post_votes_cid_unique": {
-          "name": "post_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_rkey_unique": {
-          "name": "post_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_post_id_unique": {
-          "name": "post_votes_author_did_post_id_unique",
-          "columns": [
-            "author_did",
-            "post_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "post_votes_post_id_posts_id_fk": {
-          "name": "post_votes_post_id_posts_id_fk",
-          "tableFrom": "post_votes",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "reports": {
-      "name": "reports",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "actioned_at": {
-          "name": "actioned_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "actioned_by": {
-          "name": "actioned_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "creator_comment": {
-          "name": "creator_comment",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_reason": {
-          "name": "report_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'pending'"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/0004_snapshot.json b/packages/frontpage/drizzle/meta/0004_snapshot.json
deleted file mode 100644
index a726bee7..00000000
--- a/packages/frontpage/drizzle/meta/0004_snapshot.json
+++ /dev/null
@@ -1,891 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "4b487ed2-7950-4a44-b051-057460b6f589",
-  "prevId": "568f232e-f6bf-4e4d-b3da-c7dc1fae9cc0",
-  "tables": {
-    "admin_users": {
-      "name": "admin_users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "admin_users_did_unique": {
-          "name": "admin_users_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "beta_users": {
-      "name": "beta_users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "beta_users_did_unique": {
-          "name": "beta_users_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comments": {
-      "name": "comments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "body": {
-          "name": "body",
-          "type": "text(10000)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        },
-        "parent_comment_id": {
-          "name": "parent_comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comments_cid_unique": {
-          "name": "comments_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comments_author_did_rkey_unique": {
-          "name": "comments_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comments_post_id_posts_id_fk": {
-          "name": "comments_post_id_posts_id_fk",
-          "tableFrom": "comments",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "parent_comment_id_fkey": {
-          "name": "parent_comment_id_fkey",
-          "tableFrom": "comments",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "parent_comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comment_votes": {
-      "name": "comment_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "comment_id": {
-          "name": "comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comment_votes_cid_unique": {
-          "name": "comment_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_rkey_unique": {
-          "name": "comment_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_comment_id_unique": {
-          "name": "comment_votes_author_did_comment_id_unique",
-          "columns": [
-            "author_did",
-            "comment_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comment_votes_comment_id_comments_id_fk": {
-          "name": "comment_votes_comment_id_comments_id_fk",
-          "tableFrom": "comment_votes",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "consumed_offsets": {
-      "name": "consumed_offsets",
-      "columns": {
-        "offset": {
-          "name": "offset",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "labelled_profiles": {
-      "name": "labelled_profiles",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "is_hidden": {
-          "name": "is_hidden",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "labels": {
-          "name": "labels",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "labelled_profiles_did_unique": {
-          "name": "labelled_profiles_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "moderation_events": {
-      "name": "moderation_events",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "labels_added": {
-          "name": "labels_added",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "labels_removed": {
-          "name": "labels_removed",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_type": {
-          "name": "report_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "oauth_auth_requests": {
-      "name": "oauth_auth_requests",
-      "columns": {
-        "state": {
-          "name": "state",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iss": {
-          "name": "iss",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "nonce": {
-          "name": "nonce",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "pkce_verifier": {
-          "name": "pkce_verifier",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_private_jwk": {
-          "name": "dpop_private_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_public_jwk": {
-          "name": "dpop_public_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "oauth_auth_requests_state_unique": {
-          "name": "oauth_auth_requests_state_unique",
-          "columns": [
-            "state"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "oauth_sessions": {
-      "name": "oauth_sessions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iss": {
-          "name": "iss",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "access_token": {
-          "name": "access_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "refresh_token": {
-          "name": "refresh_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_nonce": {
-          "name": "dpop_nonce",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_private_jwk": {
-          "name": "dpop_private_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_public_jwk": {
-          "name": "dpop_public_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "posts": {
-      "name": "posts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text(300)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        }
-      },
-      "indexes": {
-        "posts_cid_unique": {
-          "name": "posts_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "posts_author_did_rkey_unique": {
-          "name": "posts_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "post_votes": {
-      "name": "post_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "post_votes_cid_unique": {
-          "name": "post_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_rkey_unique": {
-          "name": "post_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_post_id_unique": {
-          "name": "post_votes_author_did_post_id_unique",
-          "columns": [
-            "author_did",
-            "post_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "post_votes_post_id_posts_id_fk": {
-          "name": "post_votes_post_id_posts_id_fk",
-          "tableFrom": "post_votes",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "reports": {
-      "name": "reports",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "actioned_at": {
-          "name": "actioned_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "actioned_by": {
-          "name": "actioned_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "creator_comment": {
-          "name": "creator_comment",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_reason": {
-          "name": "report_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'pending'"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/0005_snapshot.json b/packages/frontpage/drizzle/meta/0005_snapshot.json
deleted file mode 100644
index 78bf5f9e..00000000
--- a/packages/frontpage/drizzle/meta/0005_snapshot.json
+++ /dev/null
@@ -1,907 +0,0 @@
-{
-  "version": "6",
-  "dialect": "sqlite",
-  "id": "dc6cb016-67f0-4897-bc3e-ffc446bc034e",
-  "prevId": "4b487ed2-7950-4a44-b051-057460b6f589",
-  "tables": {
-    "admin_users": {
-      "name": "admin_users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "admin_users_did_unique": {
-          "name": "admin_users_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "beta_users": {
-      "name": "beta_users",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "beta_users_did_unique": {
-          "name": "beta_users_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comments": {
-      "name": "comments",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "body": {
-          "name": "body",
-          "type": "text(10000)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        },
-        "parent_comment_id": {
-          "name": "parent_comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comments_cid_unique": {
-          "name": "comments_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comments_author_did_rkey_unique": {
-          "name": "comments_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comments_post_id_posts_id_fk": {
-          "name": "comments_post_id_posts_id_fk",
-          "tableFrom": "comments",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        },
-        "parent_comment_id_fkey": {
-          "name": "parent_comment_id_fkey",
-          "tableFrom": "comments",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "parent_comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "comment_votes": {
-      "name": "comment_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "comment_id": {
-          "name": "comment_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "comment_votes_cid_unique": {
-          "name": "comment_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_rkey_unique": {
-          "name": "comment_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "comment_votes_author_did_comment_id_unique": {
-          "name": "comment_votes_author_did_comment_id_unique",
-          "columns": [
-            "author_did",
-            "comment_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "comment_votes_comment_id_comments_id_fk": {
-          "name": "comment_votes_comment_id_comments_id_fk",
-          "tableFrom": "comment_votes",
-          "tableTo": "comments",
-          "columnsFrom": [
-            "comment_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "consumed_offsets": {
-      "name": "consumed_offsets",
-      "columns": {
-        "offset": {
-          "name": "offset",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "labelled_profiles": {
-      "name": "labelled_profiles",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "is_hidden": {
-          "name": "is_hidden",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": false
-        },
-        "labels": {
-          "name": "labels",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(current_timestamp)"
-        },
-        "updated_at": {
-          "name": "updated_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false,
-          "default": "(current_timestamp)"
-        }
-      },
-      "indexes": {
-        "labelled_profiles_did_unique": {
-          "name": "labelled_profiles_did_unique",
-          "columns": [
-            "did"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "moderation_events": {
-      "name": "moderation_events",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "labels_added": {
-          "name": "labels_added",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "labels_removed": {
-          "name": "labels_removed",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_type": {
-          "name": "report_type",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "oauth_auth_requests": {
-      "name": "oauth_auth_requests",
-      "columns": {
-        "state": {
-          "name": "state",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iss": {
-          "name": "iss",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "nonce": {
-          "name": "nonce",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "pkce_verifier": {
-          "name": "pkce_verifier",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_private_jwk": {
-          "name": "dpop_private_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_public_jwk": {
-          "name": "dpop_public_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "oauth_auth_requests_state_unique": {
-          "name": "oauth_auth_requests_state_unique",
-          "columns": [
-            "state"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "oauth_sessions": {
-      "name": "oauth_sessions",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "did": {
-          "name": "did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "username": {
-          "name": "username",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "iss": {
-          "name": "iss",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "access_token": {
-          "name": "access_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "refresh_token": {
-          "name": "refresh_token",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_nonce": {
-          "name": "dpop_nonce",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_private_jwk": {
-          "name": "dpop_private_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "dpop_public_jwk": {
-          "name": "dpop_public_jwk",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "expires_at": {
-          "name": "expires_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "posts": {
-      "name": "posts",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "title": {
-          "name": "title",
-          "type": "text(300)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "url": {
-          "name": "url",
-          "type": "text(255)",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'live'"
-        }
-      },
-      "indexes": {
-        "posts_cid_unique": {
-          "name": "posts_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "posts_author_did_rkey_unique": {
-          "name": "posts_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "post_votes": {
-      "name": "post_votes",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "post_id": {
-          "name": "post_id",
-          "type": "integer",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "author_did": {
-          "name": "author_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "cid": {
-          "name": "cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "rkey": {
-          "name": "rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        }
-      },
-      "indexes": {
-        "post_votes_cid_unique": {
-          "name": "post_votes_cid_unique",
-          "columns": [
-            "cid"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_rkey_unique": {
-          "name": "post_votes_author_did_rkey_unique",
-          "columns": [
-            "author_did",
-            "rkey"
-          ],
-          "isUnique": true
-        },
-        "post_votes_author_did_post_id_unique": {
-          "name": "post_votes_author_did_post_id_unique",
-          "columns": [
-            "author_did",
-            "post_id"
-          ],
-          "isUnique": true
-        }
-      },
-      "foreignKeys": {
-        "post_votes_post_id_posts_id_fk": {
-          "name": "post_votes_post_id_posts_id_fk",
-          "tableFrom": "post_votes",
-          "tableTo": "posts",
-          "columnsFrom": [
-            "post_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "no action",
-          "onUpdate": "no action"
-        }
-      },
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    },
-    "reports": {
-      "name": "reports",
-      "columns": {
-        "id": {
-          "name": "id",
-          "type": "integer",
-          "primaryKey": true,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "actioned_at": {
-          "name": "actioned_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "actioned_by": {
-          "name": "actioned_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_uri": {
-          "name": "subject_uri",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_did": {
-          "name": "subject_did",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "subject_collection": {
-          "name": "subject_collection",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_rkey": {
-          "name": "subject_rkey",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "subject_cid": {
-          "name": "subject_cid",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "created_by": {
-          "name": "created_by",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "created_at": {
-          "name": "created_at",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": true,
-          "autoincrement": false
-        },
-        "creator_comment": {
-          "name": "creator_comment",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "report_reason": {
-          "name": "report_reason",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false
-        },
-        "status": {
-          "name": "status",
-          "type": "text",
-          "primaryKey": false,
-          "notNull": false,
-          "autoincrement": false,
-          "default": "'pending'"
-        }
-      },
-      "indexes": {},
-      "foreignKeys": {},
-      "compositePrimaryKeys": {},
-      "uniqueConstraints": {}
-    }
-  },
-  "enums": {},
-  "_meta": {
-    "schemas": {},
-    "tables": {},
-    "columns": {}
-  },
-  "internal": {
-    "indexes": {}
-  }
-}
\ No newline at end of file
diff --git a/packages/frontpage/drizzle/meta/_journal.json b/packages/frontpage/drizzle/meta/_journal.json
index d4241021..97078121 100644
--- a/packages/frontpage/drizzle/meta/_journal.json
+++ b/packages/frontpage/drizzle/meta/_journal.json
@@ -19,29 +19,8 @@
     {
       "idx": 2,
       "version": "6",
-      "when": 1727293406638,
-      "tag": "0002_windy_ezekiel_stane",
-      "breakpoints": true
-    },
-    {
-      "idx": 3,
-      "version": "6",
-      "when": 1727320432120,
-      "tag": "0003_superb_lilandra",
-      "breakpoints": true
-    },
-    {
-      "idx": 4,
-      "version": "6",
-      "when": 1727472551203,
-      "tag": "0004_jittery_random",
-      "breakpoints": true
-    },
-    {
-      "idx": 5,
-      "version": "6",
-      "when": 1727983880995,
-      "tag": "0005_remarkable_mister_fear",
+      "when": 1728073629189,
+      "tag": "0002_nifty_nick_fury",
       "breakpoints": true
     }
   ]
diff --git a/packages/frontpage/lib/schema.ts b/packages/frontpage/lib/schema.ts
index 8f14d005..08ac4e12 100644
--- a/packages/frontpage/lib/schema.ts
+++ b/packages/frontpage/lib/schema.ts
@@ -127,7 +127,9 @@ export const BetaUser = sqliteTable("beta_users", {
 
 export const AdminUser = sqliteTable("admin_users", {
   id: integer("id").primaryKey(),
-  createdAt: dateIsoText("created_at").notNull(),
+  createdAt: dateIsoText("created_at")
+    .notNull()
+    .default(sql`(current_timestamp)`),
   did: did("did").notNull().unique(),
 });
 

From 79f5ecccf3968eb03e76fea0b5dab388fb5305bd Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 21:55:44 +0100
Subject: [PATCH 40/43] Improve createReport input

---
 .../app/(app)/_components/post-card.tsx       |  5 +--
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  |  5 +--
 .../lib/components/user-hover-card.tsx        |  5 +--
 packages/frontpage/lib/data/db/report.ts      | 42 +++++++------------
 packages/frontpage/lib/data/db/shared.ts      |  6 +--
 5 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index a69ec9a1..4fc1605a 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -159,7 +159,7 @@ export async function reportPostAction(
   formData: FormData,
 ) {
   "use server";
-  const user = await ensureUser();
+  await ensureUser();
 
   const creatorComment = formData.get("creatorComment") as string;
   const reportReason = formData.get("reportReason") as ReportReasonType;
@@ -178,11 +178,8 @@ export async function reportPostAction(
     subjectCollection: PostCollection,
     subjectRkey: input.rkey,
     subjectCid: input.cid,
-    createdBy: user.did as DID,
-    createdAt: new Date(),
     creatorComment,
     reportReason,
-    status: "pending",
   });
   revalidatePath("/");
 }
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index f5638238..5cb48c4d 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -78,7 +78,7 @@ export async function reportCommentAction(
   },
   formData: FormData,
 ) {
-  const user = await ensureUser();
+  await ensureUser();
   const creatorComment = formData.get("creatorComment") as string;
   const reportReason = formData.get("reportReason") as ReportReasonType;
 
@@ -98,11 +98,8 @@ export async function reportCommentAction(
     subjectCollection: CommentCollection,
     subjectRkey: input.rkey,
     subjectCid: input.cid,
-    createdBy: user.did as DID,
-    createdAt: new Date(),
     creatorComment: creatorComment,
     reportReason: reportReason,
-    status: "pending",
   });
 }
 
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 0429599a..33c8a139 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -38,7 +38,7 @@ export async function reportUserAction(
   formData: FormData,
 ) {
   "use server";
-  const user = await ensureUser();
+  await ensureUser();
 
   const creatorComment = formData.get("creatorComment") as string;
   const reportReason = formData.get("reportReason") as ReportReasonType;
@@ -56,10 +56,7 @@ export async function reportUserAction(
   await createReport({
     subjectUri: `at://${input.did}`,
     subjectDid: input.did,
-    createdBy: user.did as DID,
-    createdAt: new Date(),
     creatorComment: creatorComment,
     reportReason: reportReason,
-    status: "pending",
   });
 }
diff --git a/packages/frontpage/lib/data/db/report.ts b/packages/frontpage/lib/data/db/report.ts
index 11ad3218..371abd4d 100644
--- a/packages/frontpage/lib/data/db/report.ts
+++ b/packages/frontpage/lib/data/db/report.ts
@@ -10,21 +10,6 @@ import { ensureUser, isAdmin } from "../user";
 import { ReportReasonType } from "./report-shared";
 import { createFrontPageLink, getRootUrl } from "./shared";
 
-export type ReportDTO = {
-  actionedAt?: Date | null;
-  actionedBy?: string | null;
-  subjectUri: string;
-  subjectDid: DID;
-  subjectCollection?: string | null;
-  subjectRkey?: string | null;
-  subjectCid?: string | null;
-  createdBy: DID;
-  createdAt: Date;
-  creatorComment?: string | null;
-  reportReason?: ReportReasonType | null;
-  status?: "pending" | "accepted" | "rejected" | null;
-};
-
 export type Report = InferSelectModel<typeof schema.Report>;
 
 export const getReport = cache(
@@ -101,39 +86,44 @@ export const updateReport = async (
   return;
 };
 
+type CreateReportOptions = {
+  subjectUri: string;
+  creatorComment: string;
+  reportReason: ReportReasonType;
+  subjectDid: DID;
+  subjectCollection?: string;
+  subjectRkey?: string;
+  subjectCid?: string;
+};
+
 export const createReport = async ({
-  actionedAt,
-  actionedBy,
   subjectUri,
   subjectDid,
   subjectCollection,
   subjectRkey,
   subjectCid,
-  createdBy,
-  createdAt,
   creatorComment,
   reportReason,
-  status,
-}: ReportDTO) => {
+}: CreateReportOptions) => {
   const user = await ensureUser();
 
   if (!user) {
     throw new Error("The user is not authenticated");
   }
 
+  const createdBy = user.did;
+
   await db.insert(schema.Report).values({
-    actionedAt,
-    actionedBy,
     subjectUri,
     subjectDid,
     subjectCollection,
     subjectRkey,
     subjectCid,
     createdBy,
-    createdAt,
+    createdAt: new Date(),
     creatorComment,
     reportReason,
-    status,
+    status: "pending",
   });
 
   const rootUrl = getRootUrl();
@@ -153,7 +143,7 @@ export const createReport = async ({
         fields: [
           {
             name: "Link to post/comment/user",
-            value: `${rootUrl}${await createFrontPageLink(subjectCollection, subjectDid, subjectRkey)}`,
+            value: `${rootUrl}${await createFrontPageLink(subjectDid, subjectCollection, subjectRkey)}`,
           },
         ],
       },
diff --git a/packages/frontpage/lib/data/db/shared.ts b/packages/frontpage/lib/data/db/shared.ts
index c3e6a049..07e81e18 100644
--- a/packages/frontpage/lib/data/db/shared.ts
+++ b/packages/frontpage/lib/data/db/shared.ts
@@ -16,9 +16,9 @@ export const getRootUrl = () => {
 };
 
 export const createFrontPageLink = async (
-  collection?: string | null,
-  author?: DID | null,
-  rkey?: string | null,
+  author: DID,
+  collection?: string,
+  rkey?: string,
 ) => {
   switch (collection) {
     case PostCollection:

From b97ce7e7ec1cc443f3567a09c7fc4e5c5c6e052f Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 22:05:27 +0100
Subject: [PATCH 41/43] Type safe form

---
 .../app/(app)/_components/post-card.tsx       | 17 ++++--------
 .../[postAuthor]/[postRkey]/_lib/actions.tsx  | 19 ++++---------
 .../lib/components/user-hover-card.tsx        | 19 ++++---------
 .../frontpage/lib/data/db/report-shared.ts    | 27 +++++++++++++++++--
 4 files changed, 40 insertions(+), 42 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 4fc1605a..5d8662ed 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -8,7 +8,7 @@ import { PostCollection, deletePost } from "@/lib/data/atproto/post";
 import { getVerifiedHandle } from "@/lib/data/atproto/identity";
 import { UserHoverCard } from "@/lib/components/user-hover-card";
 import type { DID } from "@/lib/data/atproto/did";
-import { ReportReasonType } from "@/lib/data/db/report-shared";
+import { parseReportForm } from "@/lib/data/db/report-shared";
 import { createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
 import { revalidatePath } from "next/cache";
@@ -161,25 +161,18 @@ export async function reportPostAction(
   "use server";
   await ensureUser();
 
-  const creatorComment = formData.get("creatorComment") as string;
-  const reportReason = formData.get("reportReason") as ReportReasonType;
-
-  if (
-    typeof creatorComment !== "string" ||
-    !reportReason ||
-    creatorComment.length >= 250
-  ) {
-    throw new Error("Missing creatorComment or reportReason or length > 250");
+  const formResult = parseReportForm(formData);
+  if (!formResult.success) {
+    throw new Error("Invalid form data");
   }
 
   await createReport({
+    ...formResult.data,
     subjectUri: `at://${input.author}/${PostCollection}/${input.rkey}`,
     subjectDid: input.author,
     subjectCollection: PostCollection,
     subjectRkey: input.rkey,
     subjectCid: input.cid,
-    creatorComment,
-    reportReason,
   });
   revalidatePath("/");
 }
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
index 5cb48c4d..6e6b3137 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/actions.tsx
@@ -9,7 +9,7 @@ import { DID } from "@/lib/data/atproto/did";
 import { createVote, deleteVote } from "@/lib/data/atproto/vote";
 import { getComment, uncached_doesCommentExist } from "@/lib/data/db/comment";
 import { getPost } from "@/lib/data/db/post";
-import { ReportReasonType } from "@/lib/data/db/report-shared";
+import { parseReportForm } from "@/lib/data/db/report-shared";
 import { createReport } from "@/lib/data/db/report";
 import { getVoteForComment } from "@/lib/data/db/vote";
 import { ensureUser } from "@/lib/data/user";
@@ -79,27 +79,18 @@ export async function reportCommentAction(
   formData: FormData,
 ) {
   await ensureUser();
-  const creatorComment = formData.get("creatorComment") as string;
-  const reportReason = formData.get("reportReason") as ReportReasonType;
-
-  if (
-    typeof creatorComment !== "string" ||
-    !reportReason ||
-    creatorComment.length >= 250
-  ) {
-    throw new Error(
-      "Missing creatorComment or reportReason or comment length > 250",
-    );
+  const formResult = parseReportForm(formData);
+  if (!formResult.success) {
+    throw new Error("Invalid form data");
   }
 
   await createReport({
+    ...formResult.data,
     subjectUri: `at://${input.authorDid}/${CommentCollection}/${input.rkey}`,
     subjectDid: input.authorDid,
     subjectCollection: CommentCollection,
     subjectRkey: input.rkey,
     subjectCid: input.cid,
-    creatorComment: creatorComment,
-    reportReason: reportReason,
   });
 }
 
diff --git a/packages/frontpage/lib/components/user-hover-card.tsx b/packages/frontpage/lib/components/user-hover-card.tsx
index 33c8a139..b6403cad 100644
--- a/packages/frontpage/lib/components/user-hover-card.tsx
+++ b/packages/frontpage/lib/components/user-hover-card.tsx
@@ -4,7 +4,7 @@ import { DID } from "../data/atproto/did";
 import { getVerifiedHandle } from "../data/atproto/identity";
 import { UserHoverCardClient } from "./user-hover-card-client";
 import { ensureUser } from "../data/user";
-import { ReportReasonType } from "../data/db/report-shared";
+import { parseReportForm } from "../data/db/report-shared";
 import { createReport } from "../data/db/report";
 
 type Props = {
@@ -40,23 +40,14 @@ export async function reportUserAction(
   "use server";
   await ensureUser();
 
-  const creatorComment = formData.get("creatorComment") as string;
-  const reportReason = formData.get("reportReason") as ReportReasonType;
-
-  if (
-    typeof creatorComment !== "string" ||
-    !reportReason ||
-    creatorComment.length >= 250
-  ) {
-    throw new Error(
-      "Missing creatorComment or reportReason or comment length > 250",
-    );
+  const formResult = parseReportForm(formData);
+  if (!formResult.success) {
+    throw new Error("Invalid form data");
   }
 
   await createReport({
+    ...formResult.data,
     subjectUri: `at://${input.did}`,
     subjectDid: input.did,
-    creatorComment: creatorComment,
-    reportReason: reportReason,
   });
 }
diff --git a/packages/frontpage/lib/data/db/report-shared.ts b/packages/frontpage/lib/data/db/report-shared.ts
index eaf1d162..dd6dfab5 100644
--- a/packages/frontpage/lib/data/db/report-shared.ts
+++ b/packages/frontpage/lib/data/db/report-shared.ts
@@ -1,2 +1,25 @@
-export const ReportReasons = ["spam", "misleading", "sexual", "other"] as const;
-export type ReportReasonType = (typeof ReportReasons)[number];
+import { z } from "zod";
+
+const ReportReason = z.union([
+  z.literal("spam"),
+  z.literal("misleading"),
+  z.literal("sexual"),
+  z.literal("other"),
+]);
+
+const ReportForm = z.object({
+  creatorComment: z
+    .string()
+    .max(250, "Comment cannot be longer than 250 characters."),
+  reportReason: ReportReason,
+});
+
+export function parseReportForm(formData: FormData) {
+  return ReportForm.safeParse({
+    creatorComment: formData.get("creatorComment"),
+    reportReason: formData.get("reportReason"),
+  });
+}
+
+export const ReportReasons = ReportReason.options.map((r) => r.value);
+export type ReportReasonType = z.infer<typeof ReportReason>;

From 49d264946b2278c91d85a7d38af0f94d85946c88 Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 22:16:57 +0100
Subject: [PATCH 42/43] No need for state

---
 packages/frontpage/app/(app)/_components/report-button.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
index 5d50132e..d7becaa8 100644
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ b/packages/frontpage/app/(app)/_components/report-button.tsx
@@ -23,7 +23,6 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/lib/components/ui/select";
-import { useState } from "react";
 import { ReportReasons } from "@/lib/data/db/report-shared";
 
 interface ReportButtonProps {
@@ -31,9 +30,8 @@ interface ReportButtonProps {
 }
 
 export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
-  const [open, setOpen] = useState(false);
   return (
-    <AlertDialog open={open} onOpenChange={setOpen}>
+    <AlertDialog>
       <AlertDialogTrigger asChild>
         <Button size="icon" variant="outline">
           <ExclamationTriangleIcon className="h-4 w-4 text-red-500" />
@@ -61,7 +59,6 @@ export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
               title: "Report submitted",
               type: "foreground",
             });
-            setOpen(false);
           }}
         >
           <Select name="reportReason">

From fcb2f6715bbfadca148bd7ee0b9e3130c513b160 Mon Sep 17 00:00:00 2001
From: Tom Sherman <the.tomsherman@gmail.com>
Date: Fri, 4 Oct 2024 22:39:47 +0100
Subject: [PATCH 43/43] Refactor report button

---
 .../app/(app)/_components/post-card.tsx       |   5 +-
 .../app/(app)/_components/report-button.tsx   | 172 ------------------
 .../app/(app)/_components/report-dialog.tsx   | 131 +++++++++++++
 .../[postRkey]/_lib/comment-client.tsx        |   4 +-
 .../app/(app)/profile/[user]/page.tsx         |   6 +-
 .../lib/components/user-hover-card-client.tsx |   4 +-
 6 files changed, 141 insertions(+), 181 deletions(-)
 delete mode 100644 packages/frontpage/app/(app)/_components/report-button.tsx
 create mode 100644 packages/frontpage/app/(app)/_components/report-dialog.tsx

diff --git a/packages/frontpage/app/(app)/_components/post-card.tsx b/packages/frontpage/app/(app)/_components/post-card.tsx
index 5d8662ed..48c7f1a4 100644
--- a/packages/frontpage/app/(app)/_components/post-card.tsx
+++ b/packages/frontpage/app/(app)/_components/post-card.tsx
@@ -12,7 +12,7 @@ import { parseReportForm } from "@/lib/data/db/report-shared";
 import { createReport } from "@/lib/data/db/report";
 import { EllipsisDropdown } from "./ellipsis-dropdown";
 import { revalidatePath } from "next/cache";
-import { ReportButton } from "./report-button";
+import { ReportDialogDropdownButton } from "./report-dialog";
 import { DeleteButton } from "./delete-button";
 
 type PostProps = {
@@ -121,7 +121,7 @@ export async function PostCard({
           {user ? (
             <div className="ml-auto">
               <EllipsisDropdown>
-                <ReportButton
+                <ReportDialogDropdownButton
                   reportAction={reportPostAction.bind(null, {
                     rkey,
                     cid,
@@ -174,5 +174,4 @@ export async function reportPostAction(
     subjectRkey: input.rkey,
     subjectCid: input.cid,
   });
-  revalidatePath("/");
 }
diff --git a/packages/frontpage/app/(app)/_components/report-button.tsx b/packages/frontpage/app/(app)/_components/report-button.tsx
deleted file mode 100644
index d7becaa8..00000000
--- a/packages/frontpage/app/(app)/_components/report-button.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-"use client";
-
-import {
-  AlertDialogHeader,
-  AlertDialogFooter,
-  AlertDialog,
-  AlertDialogTrigger,
-  AlertDialogContent,
-  AlertDialogTitle,
-  AlertDialogDescription,
-  AlertDialogCancel,
-} from "@/lib/components/ui/alert-dialog";
-import { Button } from "@/lib/components/ui/button";
-import { Textarea } from "@/lib/components/ui/textarea";
-import { toast } from "@/lib/components/ui/use-toast";
-import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
-import { useEllipsisDropdownContext } from "./ellipsis-dropdown";
-import { DropdownMenuItem } from "@/lib/components/ui/dropdown-menu";
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from "@/lib/components/ui/select";
-import { ReportReasons } from "@/lib/data/db/report-shared";
-
-interface ReportButtonProps {
-  reportAction: (formData: FormData) => Promise<void>;
-}
-
-export function ReportButtonIcon({ reportAction }: ReportButtonProps) {
-  return (
-    <AlertDialog>
-      <AlertDialogTrigger asChild>
-        <Button size="icon" variant="outline">
-          <ExclamationTriangleIcon className="h-4 w-4 text-red-500" />
-        </Button>
-      </AlertDialogTrigger>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-          <AlertDialogDescription>
-            This will report the entry. This action cannot be undone.
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <form
-          action={async (formData) => {
-            try {
-              await reportAction(formData);
-            } catch (_) {
-              toast({
-                title: "Something went wrong",
-                type: "foreground",
-              });
-              return;
-            }
-            toast({
-              title: "Report submitted",
-              type: "foreground",
-            });
-          }}
-        >
-          <Select name="reportReason">
-            <SelectTrigger className="w-44">
-              <SelectValue placeholder="Please select one" />
-            </SelectTrigger>
-            <SelectContent>
-              {ReportReasons.map((reason) => (
-                <SelectItem key={reason} value={reason}>
-                  {reason}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <Textarea
-            id="textArea"
-            name="creatorComment"
-            placeholder="Enter your report reason here..."
-            className="resize-y my-3"
-            maxLength={250}
-          />
-          <AlertDialogFooter>
-            <Button variant="success" type="submit">
-              Confirm
-            </Button>
-            <AlertDialogCancel type="button">Cancel</AlertDialogCancel>
-          </AlertDialogFooter>
-        </form>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}
-
-export function ReportButton({ reportAction }: ReportButtonProps) {
-  const ellipsisDropdownContext = useEllipsisDropdownContext();
-
-  return (
-    <AlertDialog>
-      <AlertDialogTrigger asChild>
-        <DropdownMenuItem
-          //this prevents the alert dialog from closing when the dropdown item is clicked
-          //alternatively wrap the whole dropdown in the dialog as per https://github.com/radix-ui/primitives/issues/1836
-          //but that defeats the purpose of this reusable component
-          onSelect={(e) => {
-            e.preventDefault();
-          }}
-        >
-          <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
-          Report
-        </DropdownMenuItem>
-      </AlertDialogTrigger>
-      <AlertDialogContent>
-        <AlertDialogHeader>
-          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
-          <AlertDialogDescription>
-            This will report the entry. This action cannot be undone.
-          </AlertDialogDescription>
-        </AlertDialogHeader>
-        <form
-          action={async (formData) => {
-            try {
-              await reportAction(formData);
-            } catch (_) {
-              toast({
-                title: "Something went wrong",
-                type: "foreground",
-              });
-              return;
-            }
-            toast({
-              title: "Report submitted",
-              type: "foreground",
-            });
-            ellipsisDropdownContext.close();
-          }}
-        >
-          <Select name="reportReason">
-            <SelectTrigger className="w-44">
-              <SelectValue placeholder="Please select one" />
-            </SelectTrigger>
-            <SelectContent>
-              {ReportReasons.map((reason) => (
-                <SelectItem key={reason} value={reason}>
-                  {reason}
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-          <Textarea
-            id="textArea"
-            name="creatorComment"
-            placeholder="Enter your report reason here..."
-            className="resize-y my-3"
-            maxLength={250}
-          />
-          <AlertDialogFooter>
-            <Button variant="success" type="submit">
-              Confirm
-            </Button>
-            <AlertDialogCancel
-              type="button"
-              onClick={() => ellipsisDropdownContext.close()}
-            >
-              Cancel
-            </AlertDialogCancel>
-          </AlertDialogFooter>
-        </form>
-      </AlertDialogContent>
-    </AlertDialog>
-  );
-}
diff --git a/packages/frontpage/app/(app)/_components/report-dialog.tsx b/packages/frontpage/app/(app)/_components/report-dialog.tsx
new file mode 100644
index 00000000..7f24aee1
--- /dev/null
+++ b/packages/frontpage/app/(app)/_components/report-dialog.tsx
@@ -0,0 +1,131 @@
+"use client";
+
+import {
+  AlertDialogHeader,
+  AlertDialogFooter,
+  AlertDialog,
+  AlertDialogTrigger,
+  AlertDialogContent,
+  AlertDialogTitle,
+  AlertDialogDescription,
+  AlertDialogCancel,
+} from "@/lib/components/ui/alert-dialog";
+import { Button } from "@/lib/components/ui/button";
+import { Textarea } from "@/lib/components/ui/textarea";
+import { toast } from "@/lib/components/ui/use-toast";
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from "@/lib/components/ui/select";
+import { ReportReasons } from "@/lib/data/db/report-shared";
+import { ReactNode, useState } from "react";
+import { ExclamationTriangleIcon } from "@radix-ui/react-icons";
+import { useEllipsisDropdownContext } from "./ellipsis-dropdown";
+import { DropdownMenuItem } from "@/lib/components/ui/dropdown-menu";
+
+type ReportDialogProps = {
+  reportAction: (formData: FormData) => Promise<void>;
+  children: ReactNode;
+};
+
+function ReportDialog({ reportAction, children }: ReportDialogProps) {
+  const [open, setOpen] = useState(false);
+  return (
+    <AlertDialog open={open} onOpenChange={setOpen}>
+      <AlertDialogTrigger asChild>{children}</AlertDialogTrigger>
+      <AlertDialogContent>
+        <AlertDialogHeader>
+          <AlertDialogTitle>Are you absolutely sure?</AlertDialogTitle>
+          <AlertDialogDescription>
+            This will report the entry. This action cannot be undone.
+          </AlertDialogDescription>
+        </AlertDialogHeader>
+        <form
+          action={async (formData) => {
+            try {
+              await reportAction(formData);
+            } catch (_) {
+              toast({
+                title: "Something went wrong",
+                type: "foreground",
+              });
+              return;
+            }
+            toast({
+              title: "Report submitted",
+              type: "foreground",
+            });
+            setOpen(false);
+          }}
+        >
+          <Select name="reportReason">
+            <SelectTrigger className="w-44">
+              <SelectValue placeholder="Please select one" />
+            </SelectTrigger>
+            <SelectContent>
+              {ReportReasons.map((reason) => (
+                <SelectItem key={reason} value={reason}>
+                  {reason}
+                </SelectItem>
+              ))}
+            </SelectContent>
+          </Select>
+          <Textarea
+            id="textArea"
+            name="creatorComment"
+            placeholder="Enter your report reason here..."
+            className="resize-y my-3"
+            maxLength={250}
+          />
+          <AlertDialogFooter>
+            <Button variant="success" type="submit">
+              Confirm
+            </Button>
+            <AlertDialogCancel type="button">Cancel</AlertDialogCancel>
+          </AlertDialogFooter>
+        </form>
+      </AlertDialogContent>
+    </AlertDialog>
+  );
+}
+
+export function ReportDialogIcon({
+  reportAction,
+}: Pick<ReportDialogProps, "reportAction">) {
+  return (
+    <ReportDialog reportAction={reportAction}>
+      <Button size="icon" variant="outline">
+        <ExclamationTriangleIcon className="h-4 w-4 text-red-500" />
+      </Button>
+    </ReportDialog>
+  );
+}
+
+export function ReportDialogDropdownButton({
+  reportAction,
+}: Pick<ReportDialogProps, "reportAction">) {
+  const ellipsisDropdownContext = useEllipsisDropdownContext();
+  return (
+    <ReportDialog
+      reportAction={async (formData: FormData) => {
+        await reportAction(formData);
+        ellipsisDropdownContext.close();
+      }}
+    >
+      <DropdownMenuItem
+        //this prevents the alert dialog from closing when the dropdown item is clicked
+        //alternatively wrap the whole dropdown in the dialog as per https://github.com/radix-ui/primitives/issues/1836
+        //but that defeats the purpose of this reusable component
+        onSelect={(e) => {
+          e.preventDefault();
+        }}
+      >
+        <ExclamationTriangleIcon className="mr-2 h-4 w-4" />
+        Report
+      </DropdownMenuItem>
+    </ReportDialog>
+  );
+}
diff --git a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
index 726e62f9..e95e57cd 100644
--- a/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
+++ b/packages/frontpage/app/(app)/post/[postAuthor]/[postRkey]/_lib/comment-client.tsx
@@ -39,7 +39,7 @@ import { InputLengthIndicator } from "@/lib/components/input-length-indicator";
 import { MAX_COMMENT_LENGTH } from "@/lib/data/db/constants";
 import type { CommentModel } from "@/lib/data/db/comment";
 import { EllipsisDropdown } from "@/app/(app)/_components/ellipsis-dropdown";
-import { ReportButton } from "@/app/(app)/_components/report-button";
+import { ReportDialogDropdownButton } from "@/app/(app)/_components/report-dialog";
 import { DeleteButton } from "@/app/(app)/_components/delete-button";
 
 export type CommentClientProps = Pick<
@@ -98,7 +98,7 @@ export function CommentClientWrapperWithToolbar({
           </SimpleTooltip>
           <SimpleTooltip content="action-menu" side="bottom">
             <EllipsisDropdown>
-              <ReportButton
+              <ReportDialogDropdownButton
                 reportAction={reportCommentAction.bind(null, {
                   authorDid: authorDid,
                   cid: cid,
diff --git a/packages/frontpage/app/(app)/profile/[user]/page.tsx b/packages/frontpage/app/(app)/profile/[user]/page.tsx
index 1f27cc0f..11cc01b6 100644
--- a/packages/frontpage/app/(app)/profile/[user]/page.tsx
+++ b/packages/frontpage/app/(app)/profile/[user]/page.tsx
@@ -16,7 +16,7 @@ import { Comment } from "../../post/[postAuthor]/[postRkey]/_lib/comment";
 import { Suspense } from "react";
 import { getDidFromHandleOrDid } from "@/lib/data/atproto/identity";
 import { EllipsisDropdown } from "../../_components/ellipsis-dropdown";
-import { ReportButton } from "../../_components/report-button";
+import { ReportDialogDropdownButton } from "../../_components/report-dialog";
 import { reportUserAction } from "@/lib/components/user-hover-card";
 
 type Params = {
@@ -54,7 +54,9 @@ export default async function Profile({ params }: { params: Params }) {
         <div className="flex flex-wrap items-center gap-2">
           <h1 className="md:text-2xl font-bold">{bskyProfile.handle}</h1>
           <EllipsisDropdown>
-            <ReportButton reportAction={reportUserAction.bind(null, { did })} />
+            <ReportDialogDropdownButton
+              reportAction={reportUserAction.bind(null, { did })}
+            />
           </EllipsisDropdown>
         </div>
       </div>
diff --git a/packages/frontpage/lib/components/user-hover-card-client.tsx b/packages/frontpage/lib/components/user-hover-card-client.tsx
index 432e18e8..64df63cd 100644
--- a/packages/frontpage/lib/components/user-hover-card-client.tsx
+++ b/packages/frontpage/lib/components/user-hover-card-client.tsx
@@ -9,7 +9,7 @@ import { ChatBubbleIcon, Link1Icon } from "@radix-ui/react-icons";
 import { ApiRouteResponse } from "../api-route";
 import type { GET as GetHoverCardContent } from "@/app/api/hover-card-content/route";
 import Link from "next/link";
-import { ReportButtonIcon } from "@/app/(app)/_components/report-button";
+import { ReportDialogIcon } from "@/app/(app)/_components/report-dialog";
 import { Separator } from "./ui/separator";
 
 type Props = {
@@ -52,7 +52,7 @@ export function UserHoverCardClient({
         </div>
         <Separator className="my-2" />
         <div>
-          <ReportButtonIcon reportAction={reportAction} />
+          <ReportDialogIcon reportAction={reportAction} />
         </div>
       </HoverCardContent>
     </>