Add passthrough mode to /api/v1/moderate (#131)

s3ththompson · web-flow · commit ce5510843221 · 2025-04-23T17:52:25.000-04:00
diff --git a/app/api/v1/moderate/route.ts b/app/api/v1/moderate/route.ts
@@ -29,18 +29,18 @@ export async function POST(req: NextRequest) {
     );
   }
 
+  const passthrough = data.passthrough;
+
   let userRecord: typeof schema.userRecords.$inferSelect | undefined;
   if (data.user) {
     userRecord = await createOrUpdateUserRecord({
       clerkOrganizationId,
       clientId: data.user.clientId,
       clientUrl: data.user.clientUrl,
-      email: data.user.email,
-      name: data.user.name,
-      username: data.user.username,
       initialProtected: data.user.protected,
       stripeAccountId: data.user.stripeAccountId,
       metadata: data.user.metadata,
+      ...(passthrough ? {} : { email: data.user.email, name: data.user.name, username: data.user.username }),
     });
   }
 
@@ -49,13 +49,13 @@ export async function POST(req: NextRequest) {
   const record = await createOrUpdateRecord({
     clerkOrganizationId,
     clientId: data.clientId,
-    name: data.name,
     entity: data.entity,
-    text: content.text,
-    imageUrls: content.imageUrls,
     clientUrl: data.clientUrl,
     userRecordId: userRecord?.id,
     metadata: data.metadata,
+    ...(passthrough
+      ? {}
+      : { name: data.name, text: content.text, imageUrls: content.imageUrls, externalUrls: content.externalUrls }),
   });
 
   if (record.protected) {
@@ -71,6 +71,14 @@ export async function POST(req: NextRequest) {
   const result = await moderate({
     clerkOrganizationId,
     recordId: record.id,
+    passthroughContext: passthrough
+      ? {
+          name: data.name,
+          text: content.text,
+          imageUrls: content.imageUrls ?? [],
+          externalUrls: content.externalUrls ?? [],
+        }
+      : undefined,
   });
 
   const moderation = await createModeration({
diff --git a/app/api/v1/moderate/schema.ts b/app/api/v1/moderate/schema.ts
@@ -33,6 +33,7 @@ export const ModerateRequestData = z
         metadata: MetadataSchema.optional(),
       })
       .optional(),
+    passthrough: z.boolean().optional().default(false),
   })
   .strict();
 
diff --git a/app/appeal/page.tsx b/app/appeal/page.tsx
@@ -11,6 +11,7 @@ import { Separator } from "@/components/ui/separator";
 import { findOrCreateOrganization } from "@/services/organizations";
 import { formatRecordStatus, formatUserActionStatus } from "@/lib/badges";
 import { desc, eq, and, isNull } from "drizzle-orm";
+import { formatRecord } from "@/lib/record";
 
 // Ensure page is never cached
 export const dynamic = "force-dynamic";
@@ -135,7 +136,7 @@ export default async function Page(props: { searchParams: Promise<{ [key: string
                 return (
                   <TableRow key={record.id}>
                     <TableCell>
-                      <div className="font-medium">{record.name}</div>
+                      <div className="font-medium">{formatRecord(record)}</div>
                     </TableCell>
                     <TableCell className="hidden sm:table-cell">
                       <Badge variant="secondary">
diff --git a/app/dashboard/@sheet/(.)records/[recordId]/moderations/[moderationId]/page.tsx b/app/dashboard/@sheet/(.)records/[recordId]/moderations/[moderationId]/page.tsx
@@ -1,11 +1,12 @@
 import { authWithOrgSubscription } from "@/app/dashboard/auth";
 import { ModerationDetail } from "@/app/dashboard/records/[recordId]/moderations/[moderationId]/moderation";
-import { redirect, notFound } from "next/navigation";
+import { notFound } from "next/navigation";
 import { RouterSheet } from "@/components/router-sheet";
 import { Metadata } from "next";
 import db from "@/db";
 import * as schema from "@/db/schema";
 import { and, eq } from "drizzle-orm";
+import { formatRecord } from "@/lib/record";
 
 export async function generateMetadata({ params }: { params: Promise<{ moderationId: string }> }): Promise<Metadata> {
   const { orgId } = await authWithOrgSubscription();
@@ -24,7 +25,7 @@ export async function generateMetadata({ params }: { params: Promise<{ moderatio
   }
 
   return {
-    title: `${moderation.record.name} | Moderation | Iffy`,
+    title: `${formatRecord(moderation.record)} | Moderation | Iffy`,
   };
 }
 
diff --git a/app/dashboard/@sheet/(.)records/[recordId]/page.tsx b/app/dashboard/@sheet/(.)records/[recordId]/page.tsx
@@ -7,6 +7,7 @@ import { and, eq } from "drizzle-orm";
 import { notFound } from "next/navigation";
 import { Metadata } from "next";
 import { authWithOrgSubscription } from "@/app/dashboard/auth";
+import { formatRecord } from "@/lib/record";
 
 export async function generateMetadata({ params }: { params: Promise<{ recordId: string }> }): Promise<Metadata> {
   const { orgId } = await authWithOrgSubscription();
@@ -22,7 +23,7 @@ export async function generateMetadata({ params }: { params: Promise<{ recordId:
   }
 
   return {
-    title: `Record ${record.name} (${record.entity}) | Iffy`,
+    title: `Record ${formatRecord(record)} (${record.entity}) | Iffy`,
   };
 }
 
diff --git a/app/dashboard/inbox/appeal.tsx b/app/dashboard/inbox/appeal.tsx
@@ -49,6 +49,7 @@ import { createAppealAction } from "./actions";
 import { trpc } from "@/lib/trpc";
 import Link from "next/link";
 import { useToast } from "@/hooks/use-toast";
+import { formatRecord } from "@/lib/record";
 
 function makeAppealTimeline(
   actions: AppealAction[],
@@ -92,7 +93,7 @@ const ModerationItem = ({ item }: { item: AppealTimelineModeration; userRecord:
   <div className="text-sm text-gray-950 dark:text-white/80">
     {item.data.record.entity}{" "}
     <Link href={`/dashboard/records/${item.data.record.id}`} className="font-bold">
-      {item.data.record.name}
+      {formatRecord(item.data.record)}
     </Link>{" "}
     marked {formatModerationStatus(item.data)} via {formatVia(item.data)}
   </div>
diff --git a/app/dashboard/records/[recordId]/moderations/[moderationId]/moderation.tsx b/app/dashboard/records/[recordId]/moderations/[moderationId]/moderation.tsx
@@ -11,6 +11,7 @@ import * as schema from "@/db/schema";
 import { eq, and } from "drizzle-orm";
 import db from "@/db";
 import { notFound } from "next/navigation";
+import { formatRecord } from "@/lib/record";
 
 export async function ModerationDetail({ clerkOrganizationId, id }: { clerkOrganizationId: string; id: string }) {
   const moderation = await db.query.moderations.findFirst({
@@ -41,7 +42,7 @@ export async function ModerationDetail({ clerkOrganizationId, id }: { clerkOrgan
         <HeaderContent>
           <HeaderPrimary>
             <Link href={`/dashboard/records/${moderation.record.id}`} className="hover:underline">
-              {moderation.record.name}
+              {formatRecord(moderation.record)}
             </Link>
           </HeaderPrimary>
           <HeaderSecondary>{moderation.record.entity}</HeaderSecondary>
diff --git a/app/dashboard/records/[recordId]/moderations/[moderationId]/page.tsx b/app/dashboard/records/[recordId]/moderations/[moderationId]/page.tsx
@@ -5,6 +5,7 @@ import { ModerationDetail } from "./moderation";
 import db from "@/db";
 import * as schema from "@/db/schema";
 import { and, eq } from "drizzle-orm";
+import { formatRecord } from "@/lib/record";
 
 export async function generateMetadata({ params }: { params: Promise<{ moderationId: string }> }): Promise<Metadata> {
   const { orgId } = await authWithOrgSubscription();
@@ -23,7 +24,7 @@ export async function generateMetadata({ params }: { params: Promise<{ moderatio
   }
 
   return {
-    title: `${moderation.record.name} | Moderation | Iffy`,
+    title: `${formatRecord(moderation.record)} | Moderation | Iffy`,
   };
 }
 
diff --git a/app/dashboard/records/[recordId]/page.tsx b/app/dashboard/records/[recordId]/page.tsx
@@ -1,10 +1,11 @@
-import { notFound, redirect } from "next/navigation";
+import { notFound } from "next/navigation";
 import { RecordDetail } from "./record";
 import { authWithOrgSubscription } from "@/app/dashboard/auth";
 import { Metadata } from "next";
 import db from "@/db";
 import * as schema from "@/db/schema";
 import { and, eq } from "drizzle-orm";
+import { formatRecord } from "@/lib/record";
 
 export async function generateMetadata({ params }: { params: Promise<{ recordId: string }> }): Promise<Metadata> {
   const { orgId } = await authWithOrgSubscription();
@@ -20,7 +21,7 @@ export async function generateMetadata({ params }: { params: Promise<{ recordId:
   }
 
   return {
-    title: `${record.name} (${record.entity}) | Iffy`,
+    title: `${formatRecord(record)} (${record.entity}) | Iffy`,
   };
 }
 
diff --git a/app/dashboard/records/[recordId]/record.tsx b/app/dashboard/records/[recordId]/record.tsx
@@ -20,6 +20,7 @@ import * as schema from "@/db/schema";
 import { eq, desc, and } from "drizzle-orm";
 import db from "@/db";
 import { parseMetadata } from "@/services/metadata";
+import { formatRecord } from "@/lib/record";
 
 export async function RecordDetail({ clerkOrganizationId, id }: { clerkOrganizationId: string; id: string }) {
   const record = await db.query.records.findFirst({
@@ -53,7 +54,7 @@ export async function RecordDetail({ clerkOrganizationId, id }: { clerkOrganizat
     <div>
       <Header>
         <HeaderContent>
-          <HeaderPrimary className={cn(record.deletedAt && "line-through")}>{record.name}</HeaderPrimary>
+          <HeaderPrimary className={cn(record.deletedAt && "line-through")}>{formatRecord(record)}</HeaderPrimary>
           <HeaderSecondary>{record.entity}</HeaderSecondary>
         </HeaderContent>
         <HeaderActions className="flex items-center gap-4">
@@ -188,29 +189,33 @@ export async function RecordDetail({ clerkOrganizationId, id }: { clerkOrganizat
         </>
       )}
       <Separator className="my-2" />
-      <Section>
-        <SectionTitle>Content</SectionTitle>
-        <SectionContent className="grid gap-3">
-          <dl className="grid gap-3">
-            {record.externalUrls && record.externalUrls.length > 0 && (
-              <div className="grid grid-cols-2 gap-4">
-                <dt className="text-stone-500 dark:text-zinc-500">External Links</dt>
-                <dd>
-                  {record.externalUrls.map((url, index) => (
-                    <Button key={index} asChild variant="link" className="text-md -mx-4 -my-2 font-normal">
-                      <Link href={url} target="_blank" rel="noopener noreferrer">
-                        {formatLink(url)} <ExternalLink className="h-4 w-4" />
-                      </Link>
-                    </Button>
-                  ))}
-                </dd>
-              </div>
-            )}
-          </dl>
-          <Code>{record.text}</Code>
-          {record.imageUrls.length > 0 ? <RecordImages imageUrls={record.imageUrls} /> : null}
-        </SectionContent>
-      </Section>
+      {record.externalUrls.length > 0 ||
+        record.text ||
+        (record.imageUrls.length > 0 && (
+          <Section>
+            <SectionTitle>Content</SectionTitle>
+            <SectionContent className="grid gap-3">
+              <dl className="grid gap-3">
+                {record.externalUrls.length > 0 && (
+                  <div className="grid grid-cols-2 gap-4">
+                    <dt className="text-stone-500 dark:text-zinc-500">External Links</dt>
+                    <dd>
+                      {record.externalUrls.map((url, index) => (
+                        <Button key={index} asChild variant="link" className="text-md -mx-4 -my-2 font-normal">
+                          <Link href={url} target="_blank" rel="noopener noreferrer">
+                            {formatLink(url)} <ExternalLink className="h-4 w-4" />
+                          </Link>
+                        </Button>
+                      ))}
+                    </dd>
+                  </div>
+                )}
+              </dl>
+              {record.text && <Code>{record.text}</Code>}
+              {record.imageUrls.length > 0 ? <RecordImages imageUrls={record.imageUrls} /> : null}
+            </SectionContent>
+          </Section>
+        ))}
       {record.moderations.length > 0 && (
         <>
           <Separator className="my-2" />
diff --git a/app/dashboard/records/action-menu.tsx b/app/dashboard/records/action-menu.tsx
@@ -17,6 +17,7 @@ import { trpc } from "@/lib/trpc";
 import * as schema from "@/db/schema";
 import { createModerations, moderateMany, setRecordProtectedMany } from "./actions";
 import { toast } from "@/hooks/use-toast";
+import { isRecordWithContent } from "@/lib/record";
 
 type Record = typeof schema.records.$inferSelect;
 
@@ -42,7 +43,10 @@ export const BulkActionMenu = ({ records }: { records: Record[] }) => {
   const hideFlag = records.length === 1 && records[0]?.moderationStatus === "Flagged";
   const hideUnflag = records.length === 1 && records[0]?.moderationStatus === "Compliant";
 
-  const disableRemoderateAndFlag = records.length === 1 && records[0]?.protected;
+  const disableRemoderate =
+    (records.length === 1 && records[0]?.protected) ||
+    (records.length === 1 && records[0] && !isRecordWithContent(records[0]));
+  const disableFlag = records.length === 1 && records[0]?.protected;
 
   const hideProtect = records.length === 1 && records[0]?.protected;
   const hideUnprotect = records.length === 1 && !records[0]?.protected;
@@ -102,7 +106,7 @@ export const BulkActionMenu = ({ records }: { records: Record[] }) => {
         </DropdownMenuTrigger>
         <DropdownMenuContent align="end">
           <DropdownMenuItem
-            disabled={disableRemoderateAndFlag}
+            disabled={disableRemoderate}
             onClick={async (event) => {
               try {
                 event.stopPropagation();
@@ -132,7 +136,7 @@ export const BulkActionMenu = ({ records }: { records: Record[] }) => {
           )}
           {!hideFlag && (
             <DropdownMenuItem
-              disabled={disableRemoderateAndFlag}
+              disabled={disableFlag}
               onClick={(event) => {
                 event.stopPropagation();
                 setActionType("flag");
diff --git a/app/dashboard/users/[userId]/records-table.tsx b/app/dashboard/users/[userId]/records-table.tsx
@@ -11,6 +11,7 @@ import { TooltipProvider, Tooltip, TooltipTrigger, TooltipContent } from "@/comp
 import { FlaskConical } from "lucide-react";
 import { Date } from "@/components/date";
 import { ActionMenu } from "../../records/action-menu";
+import { formatRecord } from "@/lib/record";
 
 export function RecordsTable({
   clerkOrganizationId,
@@ -85,7 +86,7 @@ export function RecordsTable({
                           variant="link"
                           className="text-md -mx-4 -my-2 block w-full truncate font-normal"
                         >
-                          <Link href={`/dashboard/records/${record.id}`}>{record.name}</Link>
+                          <Link href={`/dashboard/records/${record.id}`}>{formatRecord(record)}</Link>
                         </Button>
                         {record.moderations[0]?.testMode && (
                           <TooltipProvider>
diff --git a/db/tables.ts b/db/tables.ts
@@ -506,9 +506,9 @@ export const records = pgTable(
     clerkOrganizationId: text("clerk_organization_id").notNull(),
     clientId: text("client_id").notNull().unique(),
     clientUrl: text("client_url"),
-    name: text().notNull(),
+    name: text(),
     entity: text().notNull(),
-    text: text().notNull(),
+    text: text(),
     imageUrls: text("image_urls").array().notNull().default([]),
     externalUrls: text("external_urls").array().notNull().default([]),
     protected: boolean("protected").default(false).notNull(),
diff --git a/inngest/functions/moderations.ts b/inngest/functions/moderations.ts
@@ -152,7 +152,7 @@ const sendModerationWebhook = inngest.createFunction(
             id: record.id,
             clientId: record.clientId,
             clientUrl: record.clientUrl ?? undefined,
-            name: record.name,
+            name: record.name ?? undefined,
             entity: record.entity,
             protected: record.protected,
             metadata: record.metadata ? parseMetadata(record.metadata) : undefined,
diff --git a/lib/record.ts b/lib/record.ts
@@ -0,0 +1,16 @@
+import * as schema from "@/db/schema";
+
+export type Record = typeof schema.records.$inferSelect;
+export type RecordWithContent = Record & {
+  name: string;
+  text: string;
+};
+
+export function formatRecord(record: Record) {
+  let name = record.clientId;
+  if (record.name) name = record.name;
+  return name;
+}
+export const isRecordWithContent = (record: typeof schema.records.$inferSelect): record is RecordWithContent => {
+  return record.name != null && record.text != null;
+};
diff --git a/lib/user-record.ts b/lib/user-record.ts
diff --git a/services/moderations.ts b/services/moderations.ts
diff --git a/services/records.ts b/services/records.ts
diff --git a/services/webhook.ts b/services/webhook.ts

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import { and, eq } from "drizzle-orm";`
`7`	`7`	`import { notFound } from "next/navigation";`
`8`	`8`	`import { Metadata } from "next";`
`9`	`9`	`import { authWithOrgSubscription } from "@/app/dashboard/auth";`
	`10`	`+import { formatRecord } from "@/lib/record";`
`10`	`11`
`11`	`12`	`export async function generateMetadata({ params }: { params: Promise<{ recordId: string }> }): Promise<Metadata> {`
`12`	`13`	`const { orgId } = await authWithOrgSubscription();`
`@@ -22,7 +23,7 @@ export async function generateMetadata({ params }: { params: Promise<{ recordId:`
`22`	`23`	`}`
`23`	`24`
`24`	`25`	`return {`
`25`		- title: `Record ${record.name} (${record.entity}) \| Iffy`,
	`26`	+ title: `Record ${formatRecord(record)} (${record.entity}) \| Iffy`,
`26`	`27`	`};`
`27`	`28`	`}`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ import { ModerationDetail } from "./moderation";`
`5`	`5`	`import db from "@/db";`
`6`	`6`	`import * as schema from "@/db/schema";`
`7`	`7`	`import { and, eq } from "drizzle-orm";`
	`8`	`+import { formatRecord } from "@/lib/record";`
`8`	`9`
`9`	`10`	`export async function generateMetadata({ params }: { params: Promise<{ moderationId: string }> }): Promise<Metadata> {`
`10`	`11`	`const { orgId } = await authWithOrgSubscription();`
`@@ -23,7 +24,7 @@ export async function generateMetadata({ params }: { params: Promise<{ moderatio`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`return {`
`26`		- title: `${moderation.record.name} \| Moderation \| Iffy`,
	`27`	+ title: `${formatRecord(moderation.record)} \| Moderation \| Iffy`,
`27`	`28`	`};`
`28`	`29`	`}`
`29`	`30`