From 6a73b60c483e4cb30b7dee253a80067e6ff7dee5 Mon Sep 17 00:00:00 2001
From: gunshiz <spsshop1047@gmail.com>
Date: Fri, 31 Jul 2026 00:54:15 +0700
Subject: [PATCH] feat: schedule automatic form closure

---
 .gitignore                           |   4 +
 app/actions/submissions.ts           |   5 +-
 app/admin/form/[id]/client.tsx       |  52 +-
 app/admin/form/[id]/layout.tsx       |   3 +-
 app/admin/form/[id]/page.tsx         |   8 +-
 app/admin/form/[id]/preview/page.tsx |   2 +-
 app/admin/form/actions.ts            |  12 +-
 app/admin/form/page.tsx              |  21 +-
 app/form/[id]/page.tsx               |   7 +-
 app/form/client.tsx                  |  67 ++-
 app/form/page.tsx                    |   6 +-
 components/date-time-picker.tsx      | 152 ++++++
 components/ui/input-group.tsx        | 158 ++++++
 db/schema/form.ts                    |   1 +
 drizzle/0015_form_closes_at.sql      |   1 +
 drizzle/meta/0015_snapshot.json      | 693 +++++++++++++++++++++++++++
 drizzle/meta/_journal.json           |   7 +
 lib/admin-dashboard.ts               |  11 +-
 lib/form-availability.test.ts        |  37 ++
 lib/form-availability.ts             |  14 +
 20 files changed, 1226 insertions(+), 35 deletions(-)
 create mode 100644 components/date-time-picker.tsx
 create mode 100644 components/ui/input-group.tsx
 create mode 100644 drizzle/0015_form_closes_at.sql
 create mode 100644 drizzle/meta/0015_snapshot.json
 create mode 100644 lib/form-availability.test.ts
 create mode 100644 lib/form-availability.ts

diff --git a/.gitignore b/.gitignore
index 019d9c0..ec22680 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,3 +46,7 @@ drizzle/*
 !drizzle/0012_clammy_the_stranger.sql
 !drizzle/0013_regular_unus.sql
 !drizzle/0014_lethal_pepper_potts.sql
+!drizzle/0015_form_closes_at.sql
+!drizzle/meta/
+drizzle/meta/*
+!drizzle/meta/0015_snapshot.json
diff --git a/app/actions/submissions.ts b/app/actions/submissions.ts
index 0ceee68..17c2008 100644
--- a/app/actions/submissions.ts
+++ b/app/actions/submissions.ts
@@ -14,6 +14,7 @@ import {
   type StoredAnswerSnapshot,
 } from "@/lib/submission-intake";
 import { submissionWebhookMessage } from "@/lib/submission-webhook";
+import { isFormAcceptingSubmissions } from "@/lib/form-availability";
 
 function getSubmissionResultLink(formId: string, submissionId: string) {
   const baseUrl = process.env.BASE_URL || process.env.NEXTAUTH_URL;
@@ -32,7 +33,9 @@ export async function submitForm(
   const discordId = await requireDiscordId();
   const userName = session.user.name ?? null;
   const form = await requireFormAccess(formId, discordId);
-  if (!form.isOpen) throw new Error("This form is disabled for now");
+  if (!isFormAcceptingSubmissions(form)) {
+    throw new Error("This form is closed for submissions");
+  }
 
   const questionsList = await db.query.questions.findMany({
     where: (question, { eq }) => eq(question.formId, formId),
diff --git a/app/admin/form/[id]/client.tsx b/app/admin/form/[id]/client.tsx
index de395ac..5672f37 100644
--- a/app/admin/form/[id]/client.tsx
+++ b/app/admin/form/[id]/client.tsx
@@ -20,6 +20,8 @@ import {
 } from "@/app/actions/questions";
 import { Plus, Trash, ArrowUp, ArrowDown, Loader2, Image as ImageIcon, X, Check, GripVertical, AlertCircle } from "lucide-react";
 import Image from 'next/image';
+import { format, parseISO } from "date-fns";
+import { DateTimePicker } from "@/components/date-time-picker";
 import { RichTextEditor } from "@/components/rich-text-editor";
 import { getErrorMessage } from "@/lib/utils";
 import {
@@ -66,6 +68,8 @@ import {
   FieldDescription,
   FieldGroup,
   FieldLabel,
+  FieldLegend,
+  FieldSet,
 } from "@/components/ui/field";
 
 interface Question {
@@ -87,16 +91,28 @@ interface FormEditorClientProps {
     title: string;
     description: string | null;
     isOpen: boolean;
+    closesAt: string | null;
     allowMultipleSubmissions: boolean;
   };
   initialQuestions: Question[];
 }
 
+function toDateTimeLocalValue(value: string | null) {
+  if (!value) return "";
+
+  const date = new Date(value);
+  const localDate = new Date(date.getTime() - date.getTimezoneOffset() * 60_000);
+  return localDate.toISOString().slice(0, 16);
+}
+
 export default function FormEditorClient({ form, initialQuestions }: FormEditorClientProps) {
   const router = useRouter();
   const [formTitle, setFormTitle] = useState(form.title);
   const [formDescription, setFormDescription] = useState(form.description || "");
   const [formIsOpen, setFormIsOpen] = useState(form.isOpen);
+  const [closesAt, setClosesAt] = useState(
+    toDateTimeLocalValue(form.closesAt)
+  );
   const [allowMultipleSubmissions, setAllowMultipleSubmissions] = useState(
     form.allowMultipleSubmissions
   );
@@ -108,6 +124,7 @@ export default function FormEditorClient({ form, initialQuestions }: FormEditorC
   const formTitleRef = useRef(formTitle);
   const formDescriptionRef = useRef(formDescription);
   const formIsOpenRef = useRef(formIsOpen);
+  const closesAtRef = useRef(closesAt);
   const allowMultipleSubmissionsRef = useRef(allowMultipleSubmissions);
   const questionsRef = useRef(questions);
 
@@ -115,9 +132,10 @@ export default function FormEditorClient({ form, initialQuestions }: FormEditorC
     formTitleRef.current = formTitle;
     formDescriptionRef.current = formDescription;
     formIsOpenRef.current = formIsOpen;
+    closesAtRef.current = closesAt;
     allowMultipleSubmissionsRef.current = allowMultipleSubmissions;
     questionsRef.current = questions;
-  }, [allowMultipleSubmissions, formDescription, formIsOpen, formTitle, questions]);
+  }, [allowMultipleSubmissions, closesAt, formDescription, formIsOpen, formTitle, questions]);
 
   const saveForm = useCallback(async () => {
       const title = formTitleRef.current;
@@ -128,6 +146,9 @@ export default function FormEditorClient({ form, initialQuestions }: FormEditorC
         title: title.trim(),
         description: formDescriptionRef.current,
         isOpen: formIsOpenRef.current,
+        closesAt: closesAtRef.current
+          ? new Date(closesAtRef.current).toISOString()
+          : null,
         allowMultipleSubmissions: allowMultipleSubmissionsRef.current,
       });
       router.refresh();
@@ -169,6 +190,14 @@ export default function FormEditorClient({ form, initialQuestions }: FormEditorC
     formAutoSave.schedule();
   };
 
+  const handleClosesAtChange = (val: string) => {
+    closesAtRef.current = val;
+    setClosesAt(val);
+    formAutoSave.schedule();
+  };
+
+  const selectedCloseDateTime = closesAt ? parseISO(closesAt) : undefined;
+
   const handleAllowMultipleSubmissionsChange = (val: boolean) => {
     allowMultipleSubmissionsRef.current = val;
     setAllowMultipleSubmissions(val);
@@ -389,6 +418,27 @@ export default function FormEditorClient({ form, initialQuestions }: FormEditorC
               Accepting Submissions
             </FieldLabel>
           </Field>
+          <FieldSet className="gap-3">
+            <FieldLegend variant="label">
+              Automatically close submissions
+            </FieldLegend>
+            <Field>
+              <FieldLabel htmlFor="form-close-date">Date and time</FieldLabel>
+              <DateTimePicker
+                id="form-close-date"
+                value={selectedCloseDateTime}
+                onChange={(date) =>
+                  handleClosesAtChange(
+                    date ? format(date, "yyyy-MM-dd'T'HH:mm") : ""
+                  )
+                }
+              />
+            </Field>
+            <FieldDescription>
+              Changes are saved automatically. Leave blank for no deadline.
+              The selected date and time use your device&apos;s time zone.
+            </FieldDescription>
+          </FieldSet>
           <Field orientation="horizontal">
             <Switch
               id="allow-multiple-submissions"
diff --git a/app/admin/form/[id]/layout.tsx b/app/admin/form/[id]/layout.tsx
index 2a2a8c9..beef327 100644
--- a/app/admin/form/[id]/layout.tsx
+++ b/app/admin/form/[id]/layout.tsx
@@ -7,6 +7,7 @@ import { getSessionDiscordId } from "@/lib/auth";
 import { getDiscordMemberProfile } from "@/lib/discord";
 import { db } from "@/db";
 import { notFound } from "next/navigation";
+import { isFormAcceptingSubmissions } from "@/lib/form-availability";
 
 export const metadata: Metadata = {
   title: {
@@ -45,7 +46,7 @@ export default async function AdminFormLayout(
         <FormAdminSidebar
           formId={params.id}
           formTitle={form.title}
-          isOpen={form.isOpen}
+          isOpen={isFormAcceptingSubmissions(form)}
           userName={session?.user?.name || ""}
           userImage={session?.user?.image || ""}
           profile={profile}
diff --git a/app/admin/form/[id]/page.tsx b/app/admin/form/[id]/page.tsx
index a664d08..d5eee1c 100644
--- a/app/admin/form/[id]/page.tsx
+++ b/app/admin/form/[id]/page.tsx
@@ -28,7 +28,13 @@ export default async function AdminDashboardPage(
     <>
       <RealtimeRefresh topic="forms" formId={form.id} />
       <div className="mx-auto w-full max-w-6xl p-4 pb-12 md:p-6">
-        <FormEditorClient form={form} initialQuestions={questionsList} />
+        <FormEditorClient
+          form={{
+            ...form,
+            closesAt: form.closesAt?.toISOString() ?? null,
+          }}
+          initialQuestions={questionsList}
+        />
       </div>
     </>
   );
diff --git a/app/admin/form/[id]/preview/page.tsx b/app/admin/form/[id]/preview/page.tsx
index b120a07..aa17503 100644
--- a/app/admin/form/[id]/preview/page.tsx
+++ b/app/admin/form/[id]/preview/page.tsx
@@ -28,7 +28,7 @@ export default async function AdminFormPreviewPage({
         <Badge variant="secondary">Admin preview</Badge>
       </div>
       <FormFillerClient
-        form={{ ...form, isOpen: true }}
+        form={{ ...form, isOpen: true, closesAt: null }}
         questions={questions}
         totalAnswers={0}
         queueNumber={null}
diff --git a/app/admin/form/actions.ts b/app/admin/form/actions.ts
index 7db4b62..666c5c3 100644
--- a/app/admin/form/actions.ts
+++ b/app/admin/form/actions.ts
@@ -47,7 +47,7 @@ export async function createDefaultForm() {
   redirect(`/admin/form/${form.id}`);
 }
 
-export async function updateForm(id: string, data: { title?: string; description?: string | null; isOpen?: boolean; allowMultipleSubmissions?: boolean; discordWebhookUrl?: string | null; discordWebhookTemplate?: string | null; discordWebhookUpdateTemplate?: string | null; allowedRoles?: string[]; deniedRoles?: string[] }) {
+export async function updateForm(id: string, data: { title?: string; description?: string | null; isOpen?: boolean; closesAt?: string | null; allowMultipleSubmissions?: boolean; discordWebhookUrl?: string | null; discordWebhookTemplate?: string | null; discordWebhookUpdateTemplate?: string | null; allowedRoles?: string[]; deniedRoles?: string[] }) {
   await requireAdmin();
   if (data.title !== undefined && !data.title.trim()) {
     throw new Error("Form title is required.");
@@ -59,8 +59,18 @@ export async function updateForm(id: string, data: { title?: string; description
     throw new Error("Enter a valid Discord webhook URL.");
   }
 
+  const closesAt = data.closesAt === undefined
+    ? undefined
+    : data.closesAt === null
+      ? null
+      : new Date(data.closesAt);
+  if (closesAt instanceof Date && Number.isNaN(closesAt.getTime())) {
+    throw new Error("Enter a valid closing date and time.");
+  }
+
   const nextData = {
     ...data,
+    closesAt,
     description: data.description === undefined
       ? undefined
       : data.description
diff --git a/app/admin/form/page.tsx b/app/admin/form/page.tsx
index a24562d..9c5e61d 100644
--- a/app/admin/form/page.tsx
+++ b/app/admin/form/page.tsx
@@ -17,6 +17,7 @@ import { createDefaultForm } from "./actions";
 import { RealtimeRefresh } from "@/components/realtime-refresh";
 import { getFormSubmissionStats } from "@/lib/form-submission-stats";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
+import { isFormAcceptingSubmissions } from "@/lib/form-availability";
 
 export const dynamic = "force-dynamic";
 
@@ -67,7 +68,9 @@ export default async function AdminFormsPage() {
                   </TableCell>
                 </TableRow>
               ) : (
-                formsList.map((form) => (
+                formsList.map((form) => {
+                  const isAccepting = isFormAcceptingSubmissions(form);
+                  return (
                   <TableRow key={form.id} className="group hover:bg-muted/50 transition-colors">
                     <TableCell className="p-0 align-middle">
                       <Link href={`/admin/form/${form.id}`} className="flex items-center p-3 font-medium h-full w-full">
@@ -76,7 +79,7 @@ export default async function AdminFormsPage() {
                     </TableCell>
                     <TableCell className="p-0 align-middle">
                       <Link href={`/admin/form/${form.id}`} className="flex items-center p-3 h-full w-full">
-                        {form.isOpen ? (
+                        {isAccepting ? (
                           <Badge variant="default">Open</Badge>
                         ) : (
                           <Badge variant="secondary">Closed</Badge>
@@ -106,21 +109,24 @@ export default async function AdminFormsPage() {
                       </div>
                     </TableCell>
                   </TableRow>
-                ))
+                  );
+                })
               )}
             </TableBody>
           </Table>
         </div>
         <div className="flex flex-col gap-3 md:hidden">
-          {formsList.map((form) => (
+          {formsList.map((form) => {
+            const isAccepting = isFormAcceptingSubmissions(form);
+            return (
             <Card key={form.id}>
               <CardHeader>
                 <div className="flex items-start justify-between gap-3">
                   <CardTitle className="text-base">
                     <Link href={`/admin/form/${form.id}`}>{form.title}</Link>
                   </CardTitle>
-                  <Badge variant={form.isOpen ? "default" : "secondary"}>
-                    {form.isOpen ? "Open" : "Closed"}
+                  <Badge variant={isAccepting ? "default" : "secondary"}>
+                    {isAccepting ? "Open" : "Closed"}
                   </Badge>
                 </div>
               </CardHeader>
@@ -134,7 +140,8 @@ export default async function AdminFormsPage() {
                 <DeleteFormButton formId={form.id} />
               </CardContent>
             </Card>
-          ))}
+            );
+          })}
           {formsList.length === 0 && (
             <Card>
               <CardHeader>
diff --git a/app/form/[id]/page.tsx b/app/form/[id]/page.tsx
index 58639fc..517a11f 100644
--- a/app/form/[id]/page.tsx
+++ b/app/form/[id]/page.tsx
@@ -11,6 +11,7 @@ import {
   type FormAnswerValue,
 } from "@/lib/form-answer-values";
 import { getFormSubmissionStats } from "@/lib/form-submission-stats";
+import { isFormAcceptingSubmissions } from "@/lib/form-availability";
 
 export const dynamic = "force-dynamic";
 
@@ -98,7 +99,11 @@ export default async function FormsSubmitPage(
       <RealtimeRefresh topic="forms" formId={form.id} />
       <div className="mx-auto max-w-2xl">
         <FormFillerClient 
-          form={form} 
+          form={{
+            ...form,
+            isOpen: isFormAcceptingSubmissions(form),
+            closesAt: form.closesAt?.toISOString() ?? null,
+          }}
           questions={questionsList} 
           initialAnswers={initialAnswers} 
           hasSubmission={Boolean(existingSubmission)}
diff --git a/app/form/client.tsx b/app/form/client.tsx
index faa59ff..d02d62b 100644
--- a/app/form/client.tsx
+++ b/app/form/client.tsx
@@ -106,6 +106,7 @@ interface FormFillerClientProps {
     title: string;
     description: string | null;
     isOpen: boolean;
+    closesAt: string | null;
     allowMultipleSubmissions: boolean;
   };
   questions: Question[];
@@ -276,6 +277,40 @@ export function FormFillerClient({
   const [isDeleting, setIsDeleting] = useState(false);
   const [totalAnswers, setTotalAnswers] = useState(initialTotalAnswers);
   const [queueNumber, setQueueNumber] = useState(initialQueueNumber);
+  const closesAtTime = form.closesAt
+    ? new Date(form.closesAt).getTime()
+    : null;
+  const [reachedDeadline, setReachedDeadline] = useState<number | null>(null);
+  const deadlineReached =
+    closesAtTime !== null && reachedDeadline === closesAtTime;
+  const isAcceptingSubmissions =
+    preview || (form.isOpen && !deadlineReached);
+
+  useEffect(() => {
+    if (closesAtTime === null) return;
+
+    let timeoutId: number | undefined;
+    const checkDeadline = () => {
+      const remaining = closesAtTime - Date.now();
+      if (remaining <= 0) {
+        setReachedDeadline(closesAtTime);
+        return;
+      }
+      timeoutId = window.setTimeout(
+        checkDeadline,
+        Math.min(remaining, 2_147_483_647)
+      );
+    };
+
+    const remaining = closesAtTime - Date.now();
+    timeoutId = window.setTimeout(
+      checkDeadline,
+      Math.max(0, Math.min(remaining, 2_147_483_647))
+    );
+    return () => {
+      if (timeoutId !== undefined) window.clearTimeout(timeoutId);
+    };
+  }, [closesAtTime]);
 
   const methods = useForm<z.infer<typeof formSchema>>({
     resolver: zodResolver(formSchema),
@@ -332,7 +367,7 @@ export function FormFillerClient({
   }, [form.id, isUpdating, preview, questions, reset]);
 
   useEffect(() => {
-    if (preview || !draftReady || !form.isOpen) {
+    if (preview || !draftReady || !isAcceptingSubmissions) {
       return;
     }
 
@@ -348,7 +383,7 @@ export function FormFillerClient({
     } catch {
       queueMicrotask(() => setDraftSaved(false));
     }
-  }, [draftReady, form.id, form.isOpen, getValues, imageAnswers, otherValues, preview, watchedValues]);
+  }, [draftReady, form.id, getValues, imageAnswers, isAcceptingSubmissions, otherValues, preview, watchedValues]);
 
   const switchToSubmission = (submissionId: string | null) => {
     const submission = submissionId
@@ -432,7 +467,7 @@ export function FormFillerClient({
 
   const onSubmit = async (values: z.infer<typeof formSchema>) => {
     if (preview) return;
-    if (!form.isOpen) return;
+    if (!isAcceptingSubmissions) return;
 
     for (const question of questions) {
       const value = values[question.id] as FormAnswerValue | undefined;
@@ -519,7 +554,7 @@ export function FormFillerClient({
     }
   };
 
-  if (!form.isOpen && !isUpdating) {
+  if (!isAcceptingSubmissions && !isUpdating) {
     return (
       <Card className="mx-auto max-w-md">
         <CardHeader>
@@ -567,7 +602,7 @@ export function FormFillerClient({
               ช่องที่มีป้าย “จำเป็น” ต้องตอบให้ครบ
             </span>
           )}
-          {!form.isOpen && (
+          {!isAcceptingSubmissions && (
             <span className="text-sm text-muted-foreground">
               คุณยังดูหรือลบคำตอบเดิมได้ แต่บันทึกการแก้ไขไม่ได้
             </span>
@@ -699,7 +734,7 @@ export function FormFillerClient({
                                     value={(field.value as string) || ""}
                                     aria-labelledby={questionLabelId}
                                     aria-required={q.required}
-                                    disabled={!form.isOpen || isSubmitting}
+                                    disabled={!isAcceptingSubmissions || isSubmitting}
                                   />
                                 </FormControl>
                                 <FormMessage id={questionErrorId} />
@@ -720,7 +755,7 @@ export function FormFillerClient({
                                     aria-labelledby={questionLabelId}
                                     aria-required={q.required}
                                     className="min-h-32 resize-y"
-                                    disabled={!form.isOpen || isSubmitting}
+                                    disabled={!isAcceptingSubmissions || isSubmitting}
                                   />
                                 </FormControl>
                                 <FormMessage id={questionErrorId} />
@@ -743,7 +778,7 @@ export function FormFillerClient({
                                     aria-labelledby={questionLabelId}
                                     aria-required={q.required}
                                     className="flex flex-col gap-3"
-                                    disabled={!form.isOpen || isSubmitting}
+                                    disabled={!isAcceptingSubmissions || isSubmitting}
                                   >
                                     {q.options.map((option, optionIndex) => (
                                       <Field
@@ -797,7 +832,7 @@ export function FormFillerClient({
                                             }
                                             className="w-full max-w-xs sm:ml-6"
                                             placeholder="โปรดระบุ"
-                                            disabled={!form.isOpen || isSubmitting}
+                                            disabled={!isAcceptingSubmissions || isSubmitting}
                                           />
                                         )}
                                       </FieldGroup>
@@ -835,7 +870,7 @@ export function FormFillerClient({
                                           <Checkbox
                                             id={`${q.id}-${optionIndex}`}
                                             checked={isChecked}
-                                            disabled={!form.isOpen || isSubmitting}
+                                            disabled={!isAcceptingSubmissions || isSubmitting}
                                             onCheckedChange={(checked) => {
                                               const current = Array.isArray(field.value)
                                                 ? field.value
@@ -867,7 +902,7 @@ export function FormFillerClient({
                                               Array.isArray(field.value) &&
                                               field.value.includes("__OTHER__")
                                             }
-                                            disabled={!form.isOpen || isSubmitting}
+                                            disabled={!isAcceptingSubmissions || isSubmitting}
                                             onCheckedChange={(checked) => {
                                               const current = Array.isArray(field.value)
                                                 ? field.value
@@ -910,7 +945,7 @@ export function FormFillerClient({
                                               }
                                               className="w-full max-w-xs sm:ml-6"
                                               placeholder="โปรดระบุ"
-                                              disabled={!form.isOpen || isSubmitting}
+                                              disabled={!isAcceptingSubmissions || isSubmitting}
                                             />
                                           )}
                                       </FieldGroup>
@@ -939,7 +974,7 @@ export function FormFillerClient({
                                     }}
                                     type="file"
                                     accept="image/png,image/jpeg,image/webp,image/gif"
-                                    disabled={!form.isOpen || isSubmitting || uploadingAnswerId !== null}
+                                    disabled={!isAcceptingSubmissions || isSubmitting || uploadingAnswerId !== null}
                                     onChange={(event) => handleAnswerImageUpload(q.id, event)}
                                     className="max-w-sm"
                                     aria-invalid={Boolean(imageErrors[q.id])}
@@ -983,7 +1018,7 @@ export function FormFillerClient({
                                       type="button"
                                       variant="ghost"
                                       onClick={() => clearAnswerImage(q.id)}
-                                      disabled={!form.isOpen || isSubmitting}
+                                      disabled={!isAcceptingSubmissions || isSubmitting}
                                     >
                                       ลบรูป
                                     </Button>
@@ -1014,7 +1049,7 @@ export function FormFillerClient({
               <p className="text-sm text-muted-foreground" aria-live="polite">
                 {preview
                   ? "ตัวอย่างสำหรับผู้ดูแลระบบ — ไม่มีการส่งคำตอบ"
-                  : !form.isOpen
+                  : !isAcceptingSubmissions
                   ? "ปิดรับคำตอบแล้ว"
                   : draftSaved
                     ? "บันทึกฉบับร่างไว้ในอุปกรณ์นี้แล้ว"
@@ -1061,7 +1096,7 @@ export function FormFillerClient({
                     </AlertDialogContent>
                   </AlertDialog>
                 )}
-                {form.isOpen && (
+                {isAcceptingSubmissions && (
                   <Button
                     type="submit"
                     disabled={isSubmitting || questions.length === 0}
diff --git a/app/form/page.tsx b/app/form/page.tsx
index 68c4982..13e0337 100644
--- a/app/form/page.tsx
+++ b/app/form/page.tsx
@@ -17,7 +17,11 @@ export const dynamic = "force-dynamic";
 
 export default async function FormsListingPage() {
   const formsList = await db.query.forms.findMany({
-    where: (f, { eq }) => eq(f.isOpen, true),
+    where: (f, { and, eq, gt, isNull, or }) =>
+      and(
+        eq(f.isOpen, true),
+        or(isNull(f.closesAt), gt(f.closesAt, new Date()))
+      ),
     orderBy: (f, { desc }) => [desc(f.createdAt)],
   });
 
diff --git a/components/date-time-picker.tsx b/components/date-time-picker.tsx
new file mode 100644
index 0000000..0051949
--- /dev/null
+++ b/components/date-time-picker.tsx
@@ -0,0 +1,152 @@
+"use client";
+
+import { format } from "date-fns";
+import { CalendarDays, Clock2Icon, X } from "lucide-react";
+import { useId, useState } from "react";
+import { Button } from "@/components/ui/button";
+import { Calendar } from "@/components/ui/calendar";
+import {
+  Field,
+  FieldGroup,
+  FieldLabel,
+} from "@/components/ui/field";
+import {
+  InputGroup,
+  InputGroupAddon,
+  InputGroupInput,
+} from "@/components/ui/input-group";
+import {
+  Popover,
+  PopoverContent,
+  PopoverTrigger,
+} from "@/components/ui/popover";
+import { Separator } from "@/components/ui/separator";
+
+const TIME_PATTERN = /^(?:[01]\d|2[0-3]):[0-5]\d$/;
+
+function formatTimeInput(input: string) {
+  const digits = input.replace(/\D/g, "").slice(0, 4);
+  return digits.length > 2
+    ? `${digits.slice(0, 2)}:${digits.slice(2)}`
+    : digits;
+}
+
+export function DateTimePicker({
+  id,
+  value,
+  onChange,
+  placeholder = "Select date and time",
+}: {
+  id?: string;
+  value?: Date;
+  onChange: (value: Date | undefined) => void;
+  placeholder?: string;
+}) {
+  const generatedId = useId();
+  const timeInputId = `${id ?? generatedId}-time`;
+  const [open, setOpen] = useState(false);
+  const time = value ? format(value, "HH:mm") : "23:59";
+  const [timeInput, setTimeInput] = useState(time);
+
+  const handleDateChange = (date: Date | undefined) => {
+    if (!date) {
+      setTimeInput("23:59");
+      onChange(undefined);
+      return;
+    }
+
+    const next = new Date(date);
+    if (value) {
+      next.setHours(value.getHours(), value.getMinutes(), 0, 0);
+    } else {
+      next.setHours(23, 59, 0, 0);
+    }
+    setTimeInput(format(next, "HH:mm"));
+    onChange(next);
+  };
+
+  const handleTimeChange = (nextTime: string) => {
+    const formattedTime = formatTimeInput(nextTime);
+    setTimeInput(formattedTime);
+    if (!value || !TIME_PATTERN.test(formattedTime)) return;
+
+    const [hours, minutes] = formattedTime.split(":").map(Number);
+    const next = new Date(value);
+    next.setHours(hours, minutes, 0, 0);
+    onChange(next);
+  };
+
+  return (
+    <Popover open={open} onOpenChange={setOpen}>
+      <PopoverTrigger asChild>
+        <Button
+          id={id}
+          type="button"
+          variant="outline"
+          data-empty={!value}
+          className="w-full justify-start text-left font-normal data-[empty=true]:text-muted-foreground"
+        >
+          <CalendarDays data-icon="inline-start" />
+          {value ? format(value, "PPP 'at' HH:mm") : placeholder}
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent className="w-auto gap-0 p-0" align="start">
+        <Calendar
+          mode="single"
+          selected={value}
+          defaultMonth={value}
+          onSelect={handleDateChange}
+        />
+        <Separator />
+        <FieldGroup className="gap-3 p-3">
+          <Field data-disabled={!value || undefined}>
+            <FieldLabel htmlFor={timeInputId}>
+              Time (24-hour HH:mm)
+            </FieldLabel>
+            <InputGroup data-disabled={!value || undefined}>
+              <InputGroupInput
+                id={timeInputId}
+                type="text"
+                inputMode="numeric"
+                autoComplete="off"
+                maxLength={5}
+                pattern="(?:[01][0-9]|2[0-3]):[0-5][0-9]"
+                placeholder="23:59"
+                value={timeInput}
+                disabled={!value}
+                onChange={(event) => handleTimeChange(event.target.value)}
+                onBlur={() => setTimeInput(time)}
+              />
+              <InputGroupAddon align="inline-end">
+                <Clock2Icon />
+              </InputGroupAddon>
+            </InputGroup>
+          </Field>
+          <div className="flex justify-end gap-2">
+            <Button
+              type="button"
+              variant="ghost"
+              size="sm"
+              disabled={!value}
+              onClick={() => {
+                setTimeInput("23:59");
+                onChange(undefined);
+              }}
+            >
+              <X data-icon="inline-start" />
+              Clear
+            </Button>
+            <Button
+              type="button"
+              size="sm"
+              disabled={!value}
+              onClick={() => setOpen(false)}
+            >
+              Done
+            </Button>
+          </div>
+        </FieldGroup>
+      </PopoverContent>
+    </Popover>
+  );
+}
diff --git a/components/ui/input-group.tsx b/components/ui/input-group.tsx
new file mode 100644
index 0000000..55f311c
--- /dev/null
+++ b/components/ui/input-group.tsx
@@ -0,0 +1,158 @@
+"use client"
+
+import * as React from "react"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils"
+import { Button } from "@/components/ui/button"
+import { Input } from "@/components/ui/input"
+import { Textarea } from "@/components/ui/textarea"
+
+function InputGroup({ className, ...props }: React.ComponentProps<"div">) {
+  return (
+    <div
+      data-slot="input-group"
+      role="group"
+      className={cn(
+        "group/input-group relative flex h-9 w-full min-w-0 items-center rounded-4xl border border-input bg-input/30 transition-colors outline-none in-data-[slot=combobox-content]:focus-within:border-inherit in-data-[slot=combobox-content]:focus-within:ring-0 has-data-[align=block-end]:rounded-2xl has-data-[align=block-start]:rounded-2xl has-[[data-slot=input-group-control]:focus-visible]:border-ring has-[[data-slot=input-group-control]:focus-visible]:ring-[3px] has-[[data-slot=input-group-control]:focus-visible]:ring-ring/50 has-[[data-slot][aria-invalid=true]]:border-destructive has-[[data-slot][aria-invalid=true]]:ring-[3px] has-[[data-slot][aria-invalid=true]]:ring-destructive/20 has-[textarea]:rounded-xl has-[>[data-align=block-end]]:h-auto has-[>[data-align=block-end]]:flex-col has-[>[data-align=block-start]]:h-auto has-[>[data-align=block-start]]:flex-col has-[>textarea]:h-auto dark:has-[[data-slot][aria-invalid=true]]:ring-destructive/40 has-[>[data-align=block-end]]:[&>input]:pt-3 has-[>[data-align=block-start]]:[&>input]:pb-3 has-[>[data-align=inline-end]]:[&>input]:pr-1.5 has-[>[data-align=inline-start]]:[&>input]:pl-1.5",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+const inputGroupAddonVariants = cva(
+  "flex h-auto cursor-text items-center justify-center gap-2 py-2 text-sm font-medium text-muted-foreground select-none group-data-[disabled=true]/input-group:opacity-50 **:data-[slot=kbd]:rounded-4xl **:data-[slot=kbd]:bg-muted-foreground/10 **:data-[slot=kbd]:px-1.5 [&>svg:not([class*='size-'])]:size-4",
+  {
+    variants: {
+      align: {
+        "inline-start":
+          "order-first pl-3 has-[>button]:-ml-1 has-[>kbd]:ml-[-0.15rem]",
+        "inline-end":
+          "order-last pr-3 has-[>button]:-mr-1 has-[>kbd]:mr-[-0.15rem]",
+        "block-start":
+          "order-first w-full justify-start px-3 pt-3 group-has-[>input]/input-group:pt-3 [.border-b]:pb-3",
+        "block-end":
+          "order-last w-full justify-start px-3 pb-3 group-has-[>input]/input-group:pb-3 [.border-t]:pt-3",
+      },
+    },
+    defaultVariants: {
+      align: "inline-start",
+    },
+  }
+)
+
+function InputGroupAddon({
+  className,
+  align = "inline-start",
+  ...props
+}: React.ComponentProps<"div"> & VariantProps<typeof inputGroupAddonVariants>) {
+  return (
+    <div
+      role="group"
+      data-slot="input-group-addon"
+      data-align={align}
+      className={cn(inputGroupAddonVariants({ align }), className)}
+      onClick={(event) => {
+        if ((event.target as HTMLElement).closest("button")) {
+          return
+        }
+        event.currentTarget.parentElement?.querySelector("input")?.focus()
+      }}
+      {...props}
+    />
+  )
+}
+
+const inputGroupButtonVariants = cva(
+  "flex items-center gap-2 rounded-4xl text-sm shadow-none",
+  {
+    variants: {
+      size: {
+        xs: "h-6 gap-1 px-1.5 [&>svg:not([class*='size-'])]:size-3.5",
+        sm: "",
+        "icon-xs": "size-6 p-0 has-[>svg]:p-0",
+        "icon-sm": "size-8 p-0 has-[>svg]:p-0",
+      },
+    },
+    defaultVariants: {
+      size: "xs",
+    },
+  }
+)
+
+function InputGroupButton({
+  className,
+  type = "button",
+  variant = "ghost",
+  size = "xs",
+  ...props
+}: Omit<React.ComponentProps<typeof Button>, "size"> &
+  VariantProps<typeof inputGroupButtonVariants>) {
+  return (
+    <Button
+      type={type}
+      data-size={size}
+      variant={variant}
+      className={cn(inputGroupButtonVariants({ size }), className)}
+      {...props}
+    />
+  )
+}
+
+function InputGroupText({
+  className,
+  ...props
+}: React.ComponentProps<"span">) {
+  return (
+    <span
+      className={cn(
+        "flex items-center gap-2 text-sm text-muted-foreground [&_svg]:pointer-events-none [&_svg:not([class*='size-'])]:size-4",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function InputGroupInput({
+  className,
+  ...props
+}: React.ComponentProps<"input">) {
+  return (
+    <Input
+      data-slot="input-group-control"
+      className={cn(
+        "flex-1 rounded-none border-0 bg-transparent shadow-none ring-0 focus-visible:ring-0 aria-invalid:ring-0 dark:bg-transparent",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+function InputGroupTextarea({
+  className,
+  ...props
+}: React.ComponentProps<"textarea">) {
+  return (
+    <Textarea
+      data-slot="input-group-control"
+      className={cn(
+        "flex-1 resize-none rounded-none border-0 bg-transparent py-2 shadow-none ring-0 focus-visible:ring-0 aria-invalid:ring-0 dark:bg-transparent",
+        className
+      )}
+      {...props}
+    />
+  )
+}
+
+export {
+  InputGroup,
+  InputGroupAddon,
+  InputGroupButton,
+  InputGroupText,
+  InputGroupInput,
+  InputGroupTextarea,
+}
diff --git a/db/schema/form.ts b/db/schema/form.ts
index ac5b198..be8020f 100644
--- a/db/schema/form.ts
+++ b/db/schema/form.ts
@@ -31,6 +31,7 @@ export const forms = formSchema.table("form", {
   description: text("description"),
   createdAt: timestamp("created_at", { mode: "date" }).defaultNow().notNull(),
   isOpen: boolean("is_open").notNull().default(true),
+  closesAt: timestamp("closes_at", { mode: "date", withTimezone: true }),
   discordWebhookUrl: text("discord_webhook_url"),
   discordWebhookTemplate: text("discord_webhook_template"),
   discordWebhookUpdateTemplate: text("discord_webhook_update_template"),
diff --git a/drizzle/0015_form_closes_at.sql b/drizzle/0015_form_closes_at.sql
new file mode 100644
index 0000000..826d5ca
--- /dev/null
+++ b/drizzle/0015_form_closes_at.sql
@@ -0,0 +1 @@
+ALTER TABLE "form"."form" ADD COLUMN IF NOT EXISTS "closes_at" timestamp with time zone;
diff --git a/drizzle/meta/0015_snapshot.json b/drizzle/meta/0015_snapshot.json
new file mode 100644
index 0000000..8dc8ee5
--- /dev/null
+++ b/drizzle/meta/0015_snapshot.json
@@ -0,0 +1,693 @@
+{
+  "id": "fec233ea-49f6-439d-8512-cbb880c8b1d0",
+  "prevId": "21be4d8a-da67-4adc-9aef-771ad12a8852",
+  "version": "7",
+  "dialect": "postgresql",
+  "tables": {
+    "account.account": {
+      "name": "account",
+      "schema": "account",
+      "columns": {
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "provider": {
+          "name": "provider",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "providerAccountId": {
+          "name": "providerAccountId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "refresh_token": {
+          "name": "refresh_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "access_token": {
+          "name": "access_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "expires_at": {
+          "name": "expires_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "token_type": {
+          "name": "token_type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "scope": {
+          "name": "scope",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "id_token": {
+          "name": "id_token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "session_state": {
+          "name": "session_state",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "account_userId_user_id_fk": {
+          "name": "account_userId_user_id_fk",
+          "tableFrom": "account",
+          "tableTo": "user",
+          "schemaTo": "account",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {
+        "account_provider_providerAccountId_pk": {
+          "name": "account_provider_providerAccountId_pk",
+          "columns": [
+            "provider",
+            "providerAccountId"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "account.session": {
+      "name": "session",
+      "schema": "account",
+      "columns": {
+        "sessionToken": {
+          "name": "sessionToken",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "userId": {
+          "name": "userId",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "session_userId_user_id_fk": {
+          "name": "session_userId_user_id_fk",
+          "tableFrom": "session",
+          "tableTo": "user",
+          "schemaTo": "account",
+          "columnsFrom": [
+            "userId"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "account.user": {
+      "name": "user",
+      "schema": "account",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "email": {
+          "name": "email",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "emailVerified": {
+          "name": "emailVerified",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "image": {
+          "name": "image",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "discord_id": {
+          "name": "discord_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {
+        "user_email_unique": {
+          "name": "user_email_unique",
+          "nullsNotDistinct": false,
+          "columns": [
+            "email"
+          ]
+        }
+      },
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "account.verificationToken": {
+      "name": "verificationToken",
+      "schema": "account",
+      "columns": {
+        "identifier": {
+          "name": "identifier",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "token": {
+          "name": "token",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "expires": {
+          "name": "expires",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {
+        "verificationToken_identifier_token_pk": {
+          "name": "verificationToken_identifier_token_pk",
+          "columns": [
+            "identifier",
+            "token"
+          ]
+        }
+      },
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "form.answer": {
+      "name": "answer",
+      "schema": "form",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "submission_id": {
+          "name": "submission_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "question_id": {
+          "name": "question_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "value": {
+          "name": "value",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "''"
+        },
+        "image_cdn_id": {
+          "name": "image_cdn_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "answer_submission_id_submission_id_fk": {
+          "name": "answer_submission_id_submission_id_fk",
+          "tableFrom": "answer",
+          "tableTo": "submission",
+          "schemaTo": "form",
+          "columnsFrom": [
+            "submission_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "answer_question_id_question_id_fk": {
+          "name": "answer_question_id_question_id_fk",
+          "tableFrom": "answer",
+          "tableTo": "question",
+          "schemaTo": "form",
+          "columnsFrom": [
+            "question_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        },
+        "answer_image_cdn_id_cdn_id_fk": {
+          "name": "answer_image_cdn_id_cdn_id_fk",
+          "tableFrom": "answer",
+          "tableTo": "cdn",
+          "schemaTo": "form",
+          "columnsFrom": [
+            "image_cdn_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "set null",
+          "onUpdate": "cascade"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "form.cdn": {
+      "name": "cdn",
+      "schema": "form",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "data": {
+          "name": "data",
+          "type": "bytea",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "name": {
+          "name": "name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "size": {
+          "name": "size",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "owner_discord_id": {
+          "name": "owner_discord_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "form.form": {
+      "name": "form",
+      "schema": "form",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "title": {
+          "name": "title",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "description": {
+          "name": "description",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "created_at": {
+          "name": "created_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "is_open": {
+          "name": "is_open",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": true
+        },
+        "closes_at": {
+          "name": "closes_at",
+          "type": "timestamp with time zone",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "discord_webhook_url": {
+          "name": "discord_webhook_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "discord_webhook_template": {
+          "name": "discord_webhook_template",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "discord_webhook_update_template": {
+          "name": "discord_webhook_update_template",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "allowed_roles": {
+          "name": "allowed_roles",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "denied_roles": {
+          "name": "denied_roles",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "allow_multiple_submissions": {
+          "name": "allow_multiple_submissions",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "form.question": {
+      "name": "question",
+      "schema": "form",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "form_id": {
+          "name": "form_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "type": {
+          "name": "type",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'text'"
+        },
+        "label": {
+          "name": "label",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "image_url": {
+          "name": "image_url",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "display_order": {
+          "name": "display_order",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "default": 0
+        },
+        "required": {
+          "name": "required",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "options": {
+          "name": "options",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        },
+        "allow_other": {
+          "name": "allow_other",
+          "type": "boolean",
+          "primaryKey": false,
+          "notNull": true,
+          "default": false
+        },
+        "image_answer_mode": {
+          "name": "image_answer_mode",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "'none'"
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {
+        "question_form_id_form_id_fk": {
+          "name": "question_form_id_form_id_fk",
+          "tableFrom": "question",
+          "tableTo": "form",
+          "schemaTo": "form",
+          "columnsFrom": [
+            "form_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    },
+    "form.submission": {
+      "name": "submission",
+      "schema": "form",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true
+        },
+        "form_id": {
+          "name": "form_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": true
+        },
+        "user_discord_id": {
+          "name": "user_discord_id",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "user_name": {
+          "name": "user_name",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "admin_note": {
+          "name": "admin_note",
+          "type": "text",
+          "primaryKey": false,
+          "notNull": false
+        },
+        "submitted_at": {
+          "name": "submitted_at",
+          "type": "timestamp",
+          "primaryKey": false,
+          "notNull": true,
+          "default": "now()"
+        },
+        "edit_history": {
+          "name": "edit_history",
+          "type": "jsonb",
+          "primaryKey": false,
+          "notNull": false,
+          "default": "'[]'::jsonb"
+        }
+      },
+      "indexes": {
+        "submission_form_submitted_at_id_idx": {
+          "name": "submission_form_submitted_at_id_idx",
+          "columns": [
+            {
+              "expression": "form_id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "submitted_at",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            },
+            {
+              "expression": "id",
+              "isExpression": false,
+              "asc": true,
+              "nulls": "last"
+            }
+          ],
+          "isUnique": false,
+          "concurrently": false,
+          "method": "btree",
+          "with": {}
+        }
+      },
+      "foreignKeys": {
+        "submission_form_id_form_id_fk": {
+          "name": "submission_form_id_form_id_fk",
+          "tableFrom": "submission",
+          "tableTo": "form",
+          "schemaTo": "form",
+          "columnsFrom": [
+            "form_id"
+          ],
+          "columnsTo": [
+            "id"
+          ],
+          "onDelete": "cascade",
+          "onUpdate": "no action"
+        }
+      },
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "policies": {},
+      "checkConstraints": {},
+      "isRLSEnabled": false
+    }
+  },
+  "enums": {},
+  "schemas": {
+    "account": "account",
+    "form": "form"
+  },
+  "sequences": {},
+  "roles": {},
+  "policies": {},
+  "views": {},
+  "_meta": {
+    "columns": {},
+    "schemas": {},
+    "tables": {}
+  }
+}
\ No newline at end of file
diff --git a/drizzle/meta/_journal.json b/drizzle/meta/_journal.json
index cc14e8e..ad01250 100644
--- a/drizzle/meta/_journal.json
+++ b/drizzle/meta/_journal.json
@@ -106,6 +106,13 @@
       "when": 1785332675051,
       "tag": "0014_lethal_pepper_potts",
       "breakpoints": true
+    },
+    {
+      "idx": 15,
+      "version": "7",
+      "when": 1785431046640,
+      "tag": "0015_form_closes_at",
+      "breakpoints": true
     }
   ]
 }
\ No newline at end of file
diff --git a/lib/admin-dashboard.ts b/lib/admin-dashboard.ts
index 4f0a6eb..d462926 100644
--- a/lib/admin-dashboard.ts
+++ b/lib/admin-dashboard.ts
@@ -68,6 +68,9 @@ export async function getAdminDashboardData(
   const tomorrowStartSql = toPostgresTimestamp(tomorrowStart);
   const last7DaysStartSql = toPostgresTimestamp(last7DaysStart);
   const totalResponses = sql<number>`count(${submissions.id})::integer`;
+  const acceptingSubmissions = sql<boolean>`${forms.isOpen} and (
+    ${forms.closesAt} is null or ${forms.closesAt} > ${now}
+  )`;
   const responsesToday = sql<number>`count(${submissions.id}) filter (
     where ${submissions.submittedAt} >= ${todayStartSql}::timestamp
       and ${submissions.submittedAt} < ${tomorrowStartSql}::timestamp
@@ -82,8 +85,8 @@ export async function getAdminDashboardData(
       db
         .select({
           totalForms: sql<number>`count(*)::integer`,
-          openForms: sql<number>`count(*) filter (where ${forms.isOpen})::integer`,
-          closedForms: sql<number>`count(*) filter (where not ${forms.isOpen})::integer`,
+          openForms: sql<number>`count(*) filter (where ${acceptingSubmissions})::integer`,
+          closedForms: sql<number>`count(*) filter (where not (${acceptingSubmissions}))::integer`,
         })
         .from(forms),
       db
@@ -117,7 +120,7 @@ export async function getAdminDashboardData(
         .select({
           id: forms.id,
           title: forms.title,
-          isOpen: forms.isOpen,
+          isOpen: acceptingSubmissions,
           totalResponses,
           responsesToday,
           responsesLast7Days,
@@ -125,7 +128,7 @@ export async function getAdminDashboardData(
         })
         .from(forms)
         .leftJoin(submissions, eq(submissions.formId, forms.id))
-        .groupBy(forms.id, forms.title, forms.isOpen, forms.createdAt)
+        .groupBy(forms.id, forms.title, forms.isOpen, forms.closesAt, forms.createdAt)
         .orderBy(
           desc(responsesLast7Days),
           desc(totalResponses),
diff --git a/lib/form-availability.test.ts b/lib/form-availability.test.ts
new file mode 100644
index 0000000..20448df
--- /dev/null
+++ b/lib/form-availability.test.ts
@@ -0,0 +1,37 @@
+import { describe, expect, test } from "bun:test";
+import { isFormAcceptingSubmissions } from "@/lib/form-availability";
+
+const now = new Date("2026-07-30T12:00:00.000Z");
+
+describe("isFormAcceptingSubmissions", () => {
+  test("keeps a manually open form without a deadline open", () => {
+    expect(isFormAcceptingSubmissions({ isOpen: true }, now)).toBe(true);
+  });
+
+  test("keeps a form open before its deadline", () => {
+    expect(
+      isFormAcceptingSubmissions(
+        { isOpen: true, closesAt: "2026-07-30T12:00:01.000Z" },
+        now,
+      ),
+    ).toBe(true);
+  });
+
+  test("closes a form when its deadline is reached", () => {
+    expect(
+      isFormAcceptingSubmissions(
+        { isOpen: true, closesAt: "2026-07-30T12:00:00.000Z" },
+        now,
+      ),
+    ).toBe(false);
+  });
+
+  test("manual closure overrides a future deadline", () => {
+    expect(
+      isFormAcceptingSubmissions(
+        { isOpen: false, closesAt: "2026-08-01T12:00:00.000Z" },
+        now,
+      ),
+    ).toBe(false);
+  });
+});
diff --git a/lib/form-availability.ts b/lib/form-availability.ts
new file mode 100644
index 0000000..61ba953
--- /dev/null
+++ b/lib/form-availability.ts
@@ -0,0 +1,14 @@
+export type FormAvailability = {
+  isOpen: boolean;
+  closesAt?: Date | string | null;
+};
+
+export function isFormAcceptingSubmissions(
+  form: FormAvailability,
+  now = new Date(),
+) {
+  if (!form.isOpen) return false;
+  if (!form.closesAt) return true;
+
+  return new Date(form.closesAt).getTime() > now.getTime();
+}