refactor(lib): organize modules by feature

This commit is contained in:
2026-08-02 16:56:55 +07:00 Unverified
parent 6c3b1cab83
commit d513b47d09
58 changed files with 85 additions and 85 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
"use server";
import { requireAdmin } from "@/lib/auth";
import { getGuildRolesInternal, type DiscordRole } from "@/lib/discord";
import { requireAdmin } from "@/lib/auth/auth";
import { getGuildRolesInternal, type DiscordRole } from "@/lib/discord/discord";
export async function getGuildRoles(): Promise<DiscordRole[]> {
await requireAdmin();
+2 -2
View File
@@ -7,9 +7,9 @@ import { cdn, questions } from "@/db/schema";
import type { ImageAnswerMode, QuestionType } from "@/db/schema";
import { eq } from "drizzle-orm";
import { revalidatePath } from "next/cache";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
import { sanitizeHtml } from "@/lib/sanitize-html";
import { sse } from "@/lib/sse";
import { sse } from "@/lib/realtime/sse";
export async function createQuestion(
formId: string,
+7 -7
View File
@@ -5,16 +5,16 @@ import { submissions, answers } from "@/db/schema";
import { and, count, eq, lt, lte, or } from "drizzle-orm";
import { revalidatePath } from "next/cache";
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { requireAdmin, requireDiscordId, requireFormAccess } from "@/lib/auth";
import { sse } from "@/lib/sse";
import type { FormAnswerPayload } from "@/lib/form-answer-values";
import { authOptions } from "@/lib/auth/auth-options";
import { requireAdmin, requireDiscordId, requireFormAccess } from "@/lib/auth/auth";
import { sse } from "@/lib/realtime/sse";
import type { FormAnswerPayload } from "@/lib/form/form-answer-values";
import {
normalizeSubmissionAnswers,
type StoredAnswerSnapshot,
} from "@/lib/submission-intake";
import { submissionWebhookMessage } from "@/lib/submission-webhook";
import { isFormAcceptingSubmissions } from "@/lib/form-availability";
} from "@/lib/form/submission-intake";
import { submissionWebhookMessage } from "@/lib/form/submission-webhook";
import { isFormAcceptingSubmissions } from "@/lib/form/form-availability";
function getSubmissionResultLink(formId: string, submissionId: string) {
const baseUrl = process.env.BASE_URL || process.env.NEXTAUTH_URL;
+1 -1
View File
@@ -72,7 +72,7 @@ import {
getQuestionResponseSettings,
getQuestionResponseType,
type QuestionResponseType,
} from "@/lib/question-response-type";
} from "@/lib/form/question-response-type";
import {
SaveStatusIndicator,
SortableQuestion,
+2 -2
View File
@@ -11,7 +11,7 @@ import { toast } from "sonner";
import { testDiscordWebhook, updateForm } from "@/app/admin/form/actions";
import { Loader2, ChevronDown, Check, AlertCircle, Send } from "lucide-react";
import { getGuildRoles } from "@/app/actions/discord";
import type { DiscordRole } from "@/lib/discord";
import type { DiscordRole } from "@/lib/discord/discord";
import {
DropdownMenu,
DropdownMenuCheckboxItem,
@@ -23,7 +23,7 @@ import { getErrorMessage } from "@/lib/utils";
import {
isValidDiscordWebhookUrl,
previewWebhookTemplate,
} from "@/lib/discord-webhook-settings";
} from "@/lib/discord/discord-webhook-settings";
import {
useDebouncedAutoSave,
type AutoSaveStatus,
+4 -4
View File
@@ -2,14 +2,14 @@ import { SidebarProvider, SidebarTrigger } from "@/components/ui/sidebar";
import { FormAdminSidebar } from "@/components/form-admin-sidebar";
import { Metadata } from "next";
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { getSessionDiscordId } from "@/lib/auth";
import { getDiscordMemberProfile } from "@/lib/discord";
import { authOptions } from "@/lib/auth/auth-options";
import { getSessionDiscordId } from "@/lib/auth/auth";
import { getDiscordMemberProfile } from "@/lib/discord/discord";
import { db } from "@/db";
import { submissions } from "@/db/schema";
import { asc, eq } from "drizzle-orm";
import { notFound } from "next/navigation";
import { isFormAcceptingSubmissions } from "@/lib/form-availability";
import { isFormAcceptingSubmissions } from "@/lib/form/form-availability";
export const metadata: Metadata = {
title: {
@@ -42,8 +42,8 @@ import {
import Image from 'next/image';
import { stripHtml } from "@/lib/utils";
import { HtmlDisplay } from "@/components/html-display";
import { formatStoredAnswer } from "@/lib/form-answer-values";
import { normalizeStoredAnswerSnapshot } from "@/lib/submission-intake";
import { formatStoredAnswer } from "@/lib/form/form-answer-values";
import { normalizeStoredAnswerSnapshot } from "@/lib/form/submission-intake";
import { updateSubmissionAdminNote } from "@/app/admin/form/actions";
import {
useDebouncedAutoSave,
@@ -6,7 +6,7 @@ import { ArrowLeft, ArrowRight } from "lucide-react";
import SubmissionDetailClient from "./client";
import { DeleteSubmissionButton } from "@/components/delete-buttons";
import { RealtimeRefresh } from "@/components/realtime-refresh";
import { getDiscordMemberProfile } from "@/lib/discord";
import { getDiscordMemberProfile } from "@/lib/discord/discord";
interface SubmissionDetailPageProps {
params: Promise<{
+1 -1
View File
@@ -8,7 +8,7 @@ import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "@
import { Pagination, PaginationContent, PaginationItem, PaginationLink, PaginationNext, PaginationPrevious } from "@/components/ui/pagination";
import { DeleteAllSubmissionsButton, DeleteSubmissionButton } from "@/components/delete-buttons";
import { ResultsFilters } from "@/components/results-filters";
import type { DiscordMemberProfile } from "@/lib/discord";
import type { DiscordMemberProfile } from "@/lib/discord/discord";
const RESULTS_PAGE_SIZE = 25;
type ResultFilters = {
+3 -3
View File
@@ -2,12 +2,12 @@ import { NextResponse } from "next/server";
import { db } from "@/db";
import { answers } from "@/db/schema";
import { inArray } from "drizzle-orm";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
import {
getFilteredSubmissions,
parseResultFilters,
} from "@/lib/admin-form-results";
import { answerCellValue } from "@/lib/form-answer-values";
} from "@/lib/form/admin-form-results";
import { answerCellValue } from "@/lib/form/form-answer-values";
import { stripHtml } from "@/lib/utils";
function csvCell(value: unknown) {
+2 -2
View File
@@ -1,5 +1,5 @@
import { parseResultFilters, getFilteredSubmissions } from "@/lib/admin-form-results";
import { getDiscordMemberProfile } from "@/lib/discord";
import { parseResultFilters, getFilteredSubmissions } from "@/lib/form/admin-form-results";
import { getDiscordMemberProfile } from "@/lib/discord/discord";
import { RealtimeRefresh } from "@/components/realtime-refresh";
import ResultsClient from "./client";
+3 -3
View File
@@ -5,10 +5,10 @@ import { forms, submissions } from "@/db/schema";
import { and, eq } from "drizzle-orm";
import { revalidatePath } from "next/cache";
import { redirect } from "next/navigation";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
import { sanitizeHtml } from "@/lib/sanitize-html";
import { sse } from "@/lib/sse";
import { isValidDiscordWebhookUrl } from "@/lib/discord-webhook-settings";
import { sse } from "@/lib/realtime/sse";
import { isValidDiscordWebhookUrl } from "@/lib/discord/discord-webhook-settings";
export async function createForm(formData: FormData) {
await requireAdmin();
+2 -2
View File
@@ -15,9 +15,9 @@ import { DeleteFormButton } from "@/components/delete-buttons";
import { AdminShellServer } from "@/components/admin-shell-server";
import { createDefaultForm } from "./actions";
import { RealtimeRefresh } from "@/components/realtime-refresh";
import { getFormSubmissionStats } from "@/lib/form-submission-stats";
import { getFormSubmissionStats } from "@/lib/form/form-submission-stats";
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
import { isFormAcceptingSubmissions } from "@/lib/form-availability";
import { isFormAcceptingSubmissions } from "@/lib/form/form-availability";
export const dynamic = "force-dynamic";
+2 -2
View File
@@ -1,7 +1,7 @@
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { authOptions } from "@/lib/auth/auth-options";
import { redirect } from "next/navigation";
import { getAdminDiscordIds, getSessionDiscordId } from "@/lib/auth";
import { getAdminDiscordIds, getSessionDiscordId } from "@/lib/auth/auth";
export default async function AdminLayout({
children,
+1 -1
View File
@@ -18,7 +18,7 @@ import {
TableHeader,
TableRow,
} from "@/components/ui/table";
import { getAdminDashboardData } from "@/lib/admin-dashboard";
import { getAdminDashboardData } from "@/lib/admin/admin-dashboard";
import {
ClipboardList,
FilePlus2,
+1 -1
View File
@@ -4,7 +4,7 @@ import { Readable } from "node:stream";
import { pipeline } from "node:stream/promises";
import { randomUUID } from "node:crypto";
import { NextResponse } from "next/server";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
export const dynamic = "force-dynamic";
+2 -2
View File
@@ -1,6 +1,6 @@
import { NextResponse } from "next/server";
import { requireAdmin } from "@/lib/auth";
import { saveVideoUpload } from "@/lib/video-upload-storage";
import { requireAdmin } from "@/lib/auth/auth";
import { saveVideoUpload } from "@/lib/video/video-upload-storage";
export const dynamic = "force-dynamic";
+1 -1
View File
@@ -1,5 +1,5 @@
import NextAuth from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { authOptions } from "@/lib/auth/auth-options";
const handler = NextAuth(authOptions);
export { handler as GET, handler as POST };
+1 -1
View File
@@ -1,6 +1,6 @@
import { NextRequest, NextResponse } from "next/server";
import { cookies } from "next/headers";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
const TIKTOK_OAUTH_STATE_COOKIE = "tiktok-oauth-state";
+1 -1
View File
@@ -1,7 +1,7 @@
import { NextResponse } from "next/server";
import { randomBytes } from "node:crypto";
import { cookies } from "next/headers";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
const TIKTOK_OAUTH_STATE_COOKIE = "tiktok-oauth-state";
+1 -1
View File
@@ -1,6 +1,6 @@
import { cookies } from "next/headers";
import { NextRequest, NextResponse } from "next/server";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
function escapeHtml(value: unknown) {
return String(value ?? "")
+1 -1
View File
@@ -1,7 +1,7 @@
import { randomBytes } from "node:crypto";
import { cookies } from "next/headers";
import { NextResponse } from "next/server";
import { requireAdmin } from "@/lib/auth";
import { requireAdmin } from "@/lib/auth/auth";
const COOKIE = "youtube-oauth-state";
+1 -1
View File
@@ -1,5 +1,5 @@
import { NextResponse } from "next/server";
import { processDueVideoUploads } from "@/lib/video-platforms";
import { processDueVideoUploads } from "@/lib/video/video-platforms";
export const dynamic = "force-dynamic";
+2 -2
View File
@@ -1,8 +1,8 @@
import { NextResponse } from "next/server";
import { db } from "@/db";
import { cdn } from "@/db/schema";
import { requireDiscordId } from "@/lib/auth";
import { validateImageUploadFile, cdnUrl } from "@/lib/cdn-images";
import { requireDiscordId } from "@/lib/auth/auth";
import { validateImageUploadFile, cdnUrl } from "@/lib/cdn/cdn-images";
export async function POST(req: Request) {
let discordId: string;
+1 -1
View File
@@ -1,5 +1,5 @@
import { db } from "@/db";
import { cdnImageResponse } from "@/lib/cdn-images";
import { cdnImageResponse } from "@/lib/cdn/cdn-images";
export async function GET(
_request: Request,
+5 -5
View File
@@ -1,17 +1,17 @@
import { db } from "@/db";
import { FormFillerClient } from "../client";
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { authOptions } from "@/lib/auth/auth-options";
import { notFound } from "next/navigation";
import LoginDialog from "@/components/login-dialog";
import { canAccessForm, getSessionDiscordId } from "@/lib/auth";
import { canAccessForm, getSessionDiscordId } from "@/lib/auth/auth";
import { RealtimeRefresh } from "@/components/realtime-refresh";
import {
decodeCheckboxAnswer,
type FormAnswerValue,
} from "@/lib/form-answer-values";
import { getFormSubmissionStats } from "@/lib/form-submission-stats";
import { isFormAcceptingSubmissions } from "@/lib/form-availability";
} from "@/lib/form/form-answer-values";
import { getFormSubmissionStats } from "@/lib/form/form-submission-stats";
import { isFormAcceptingSubmissions } from "@/lib/form/form-availability";
export const dynamic = "force-dynamic";
+3 -3
View File
@@ -55,8 +55,8 @@ import {
import { Spinner } from "@/components/ui/spinner";
import {
type FormAnswerValue,
} from "@/lib/form-answer-values";
import { isImageOnlyResponse } from "@/lib/question-response-type";
} from "@/lib/form/form-answer-values";
import { isImageOnlyResponse } from "@/lib/form/question-response-type";
import {
buildFormSchema,
parseStoredDraft,
@@ -64,7 +64,7 @@ import {
type FormFillerClientProps,
type FormValues,
type StoredDraft,
} from "@/lib/form-client";
} from "@/lib/form/form-client";
export function FormLayoutClient({
userName,
+4 -4
View File
@@ -1,12 +1,12 @@
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { authOptions } from "@/lib/auth/auth-options";
import { FormLayoutClient, LoginButton } from "./client";
import { Metadata } from "next";
import { ThemeToggle } from "@/components/theme-toggle";
import { getSessionDiscordId } from "@/lib/auth";
import { getDiscordMemberProfile } from "@/lib/discord";
import { getSessionDiscordId } from "@/lib/auth/auth";
import { getDiscordMemberProfile } from "@/lib/discord/discord";
import Link from 'next/link';
import { getAdminDiscordIds } from "@/lib/auth";
import { getAdminDiscordIds } from "@/lib/auth/auth";
const siteUrl = process.env.BASE_URL;
+3 -3
View File
@@ -7,11 +7,11 @@ import {
} from "@/components/ui/card";
import { HtmlDisplay } from "@/components/html-display";
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { canAccessForm, getSessionDiscordId } from "@/lib/auth";
import { authOptions } from "@/lib/auth/auth-options";
import { canAccessForm, getSessionDiscordId } from "@/lib/auth/auth";
import { RealtimeRefresh } from "@/components/realtime-refresh";
import { Badge } from "@/components/ui/badge";
import { getFormSubmissionStats } from "@/lib/form-submission-stats";
import { getFormSubmissionStats } from "@/lib/form/form-submission-stats";
export const dynamic = "force-dynamic";
+3 -3
View File
@@ -1,10 +1,10 @@
import { getServerSession } from "next-auth";
import { authOptions } from "@/lib/auth-options";
import { authOptions } from "@/lib/auth/auth-options";
import {
getAdminDiscordIds,
getSessionDiscordId,
} from "@/lib/auth";
import { isSseTopic, sse } from "@/lib/sse";
} from "@/lib/auth/auth";
import { isSseTopic, sse } from "@/lib/realtime/sse";
export async function GET(
request: Request,