diff --git a/app/actions/submissions.ts b/app/actions/submissions.ts index 9eb9fce..f4a5868 100644 --- a/app/actions/submissions.ts +++ b/app/actions/submissions.ts @@ -15,11 +15,13 @@ import { import { writeSubmission } from "@/lib/form/submission-write"; import { submissionWebhookMessage } from "@/lib/form/submission-webhook"; import { isFormAcceptingSubmissions } from "@/lib/form/form-availability"; +import { getCanonicalUrl } from "@/lib/config/server"; function getSubmissionResultLink(formId: string, submissionId: string) { - const baseUrl = process.env.BASE_URL || process.env.NEXTAUTH_URL; - if (!baseUrl) return `/admin/form/${formId}/result/${submissionId}`; - return new URL(`/admin/form/${formId}/result/${submissionId}`, baseUrl).toString(); + return new URL( + `/admin/form/${formId}/result/${submissionId}`, + getCanonicalUrl(), + ).toString(); } export async function submitForm( diff --git a/app/discord/page.tsx b/app/discord/page.tsx index ce548e2..341f08a 100644 --- a/app/discord/page.tsx +++ b/app/discord/page.tsx @@ -1,6 +1,7 @@ import { redirect } from 'next/navigation'; +import { config } from "@/lib/config"; export default function Page() { - redirect('https://discord.com/invite/3cZQbvW6cF'); + redirect(config.site.discordInviteUrl); return
Redirecting...
; } diff --git a/app/form/[id]/not-found.tsx b/app/form/[id]/not-found.tsx index 4f1716a..ba40e6c 100644 --- a/app/form/[id]/not-found.tsx +++ b/app/form/[id]/not-found.tsx @@ -8,6 +8,7 @@ import { Spinner } from "@/components/ui/spinner"; import Background from "@/public/background/404.png"; import Profile from "@/public/404-image.jpg"; import { Activity, Home } from "lucide-react"; +import { config } from "@/lib/config"; const MESSAGES = [ "ฟอร์มนี้อาจจะถูก Erika กินไปแล้ว...", @@ -54,7 +55,7 @@ export default function NotFound() { กลับหน้าเลือก - + - +