Compare commits

...

2 commits

8 changed files with 71 additions and 50 deletions

View file

@ -1,11 +1,10 @@
import { NextRequest, NextResponse } from "next/server";
import { z } from "zod";
import { auth } from "@/lib/auth";
let canSubmit = true;
import { settings } from "@/lib/settings";
export async function GET() {
return NextResponse.json({ success: true, value: canSubmit });
return NextResponse.json({ success: true, value: settings.canSubmit });
}
export async function PATCH(request: NextRequest) {
@ -15,9 +14,9 @@ export async function PATCH(request: NextRequest) {
if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
const body = await request.json();
const validatedCanSubmit = z.boolean().safeParse(body);
if (!validatedCanSubmit.success) return NextResponse.json({ error: "Failed to validate body" }, { status: 400 });
const validated = z.boolean().safeParse(body);
if (!validated.success) return NextResponse.json({ error: "Failed to validate body" }, { status: 400 });
canSubmit = validatedCanSubmit.data;
settings.canSubmit = validated.data;
return NextResponse.json({ success: true });
}

View file

@ -0,0 +1,22 @@
import { NextRequest, NextResponse } from "next/server";
import { z } from "zod";
import { auth } from "@/lib/auth";
import { settings } from "@/lib/settings";
export async function GET() {
return NextResponse.json({ success: true, value: settings.queueEnabled });
}
export async function PATCH(request: NextRequest) {
const session = await auth();
if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
const body = await request.json();
const validated = z.boolean().safeParse(body);
if (!validated.success) return NextResponse.json({ error: "Failed to validate body" }, { status: 400 });
settings.queueEnabled = validated.data;
return NextResponse.json({ success: true });
}

View file

@ -21,6 +21,7 @@ import { ThreeDsTomodachiLifeMii } from "@/lib/three-ds-tomodachi-life-mii";
import { SwitchMiiInstructions } from "@/types";
import { minifyInstructions } from "@/lib/switch";
import { settings } from "@/lib/settings";
const uploadsDirectory = path.join(process.cwd(), "uploads", "mii");
@ -74,10 +75,7 @@ export async function POST(request: NextRequest) {
const rateLimit = new RateLimit(request, 3);
const check = await rateLimit.handle();
if (check) return check;
const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL}/api/admin/can-submit`);
const { value } = await response.json();
if (!value) return rateLimit.sendResponse({ error: "Submissions are temporarily disabled" }, 503);
if (!settings.canSubmit) return rateLimit.sendResponse({ error: "Submissions are temporarily disabled" }, 503);
// Parse tags and QR code as JSON
const formData = await request.formData();
@ -155,6 +153,7 @@ export async function POST(request: NextRequest) {
const description = uncensoredDescription && profanity.censor(uncensoredDescription);
// Validate image files
let wasImagesModerated = false;
const customImages: File[] = [];
for (const img of [image1, image2, image3]) {
@ -164,7 +163,7 @@ export async function POST(request: NextRequest) {
if (imageValidation.valid) {
customImages.push(img);
} else {
return rateLimit.sendResponse({ error: `Failed to verify custom image: ${imageValidation.error}` }, imageValidation.status ?? 400);
wasImagesModerated = true;
}
}
@ -172,10 +171,8 @@ export async function POST(request: NextRequest) {
if (platform === "SWITCH") {
const portraitValidation = await validateImage(miiPortraitImage);
const featuresValidation = await validateImage(miiFeaturesImage);
if (!portraitValidation.valid)
return rateLimit.sendResponse({ error: `Failed to verify portrait: ${portraitValidation.error}` }, portraitValidation.status ?? 400);
if (!featuresValidation.valid)
return rateLimit.sendResponse({ error: `Failed to verify features: ${featuresValidation.error}` }, featuresValidation.status ?? 400);
if (!portraitValidation.valid) wasImagesModerated = true;
if (!featuresValidation.valid) wasImagesModerated = true;
}
const qrBytes = new Uint8Array(qrBytesRaw ?? []);
@ -199,8 +196,8 @@ export async function POST(request: NextRequest) {
name,
tags,
description,
gender: gender ?? "MALE",
in_queue: true,
gender: gender ?? "MALE",
in_queue: wasImagesModerated || settings.queueEnabled,
// Automatically detect certain information if on 3DS
...(platform === "THREE_DS"
@ -337,5 +334,5 @@ export async function POST(request: NextRequest) {
return rateLimit.sendResponse({ error: "Failed to store user images" }, 500);
}
return rateLimit.sendResponse({ success: true, id: miiRecord.id });
return rateLimit.sendResponse({ success: true, id: miiRecord.id, inQueue: wasImagesModerated });
}

View file

@ -19,6 +19,7 @@ import Description from "@/components/description";
import MiiInstructions from "@/components/mii/instructions";
import { SwitchMiiInstructions } from "@/types";
import { settings } from "@/lib/settings";
interface Props {
params: Promise<{ id: string }>;
@ -128,6 +129,15 @@ export default async function MiiPage({ params }: Props) {
<p className="font-medium">This Mii is flagged as controversial and only appears when the filter is enabled</p>
</div>
)}
{mii.in_queue && (
<div className="bg-zinc-50 border-2 border-zinc-400 rounded-2xl shadow-lg p-4 flex items-center gap-3 text-zinc-700">
<Icon icon="material-symbols:timer" className="text-2xl shrink-0" />
<p className="font-medium">
This Mii is waiting to be manually reviewed {!settings.queueEnabled && "due to inappropriate images "}
and is hidden from the main page.
</p>
</div>
)}
<div className="relative grid grid-cols-3 gap-4 max-md:grid-cols-1">
<div className="bg-amber-50 rounded-3xl border-2 border-amber-500 shadow-lg p-4 h-min flex flex-col items-center max-w-md w-full max-md:place-self-center max-md:row-start-2">
{/* Mii Image */}
@ -335,7 +345,7 @@ export default async function MiiPage({ params }: Props) {
{/* Author and Created date */}
<div className="mt-2">
<Link href={`/profile/${mii.userId}`} className="text-lg">
<Link href={`/profile/${mii.userId}`} className="text-lg wrap-break-word">
By <span className="font-bold">{mii.user.name}</span>
</Link>
<h4 className="text-sm">

View file

@ -8,6 +8,7 @@ import { auth } from "@/lib/auth";
import { prisma } from "@/lib/prisma";
import SubmitForm from "@/components/submit-form";
import { settings } from "@/lib/settings";
export const metadata: Metadata = {
title: "Submit a Mii - TomodachiShare",
@ -30,16 +31,8 @@ export default async function SubmitPage() {
});
if (activePunishment) redirect("/off-the-island");
// Check if submissions are disabled
let value: boolean | null = true;
try {
const response = await fetch(`${process.env.NEXT_PUBLIC_BASE_URL}/api/admin/can-submit`);
value = await response.json();
} catch (error) {
return <p>An error occurred!</p>;
}
if (!value) return (
if (!settings.canSubmit)
return (
<div className="grow flex items-center justify-center">
<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-8 max-w-xs w-full text-center flex flex-col">
<h2 className="text-5xl font-black">Sorry</h2>
@ -50,7 +43,7 @@ export default async function SubmitPage() {
</Link>
</div>
</div>
);
);
return <SubmitForm />;
}

View file

@ -1,25 +1,17 @@
"use client";
import { useEffect, useState } from "react";
import { settings } from "@/lib/settings";
import { useState } from "react";
export default function ControlCenter() {
const [canSubmit, setCanSubmit] = useState(true);
const [canSubmit, setCanSubmit] = useState(settings.canSubmit);
const [isQueueEnabled, setIsQeueueEnabled] = useState(settings.queueEnabled);
const onClickSet = async () => {
await fetch("/api/admin/can-submit", { method: "PATCH", body: JSON.stringify(canSubmit) });
await fetch("/api/admin/queue", { method: "PATCH", body: JSON.stringify(isQueueEnabled) });
};
useEffect(() => {
const check = async () => {
const response = await fetch("/api/admin/can-submit");
const { value } = await response.json();
setCanSubmit(value);
};
check();
}, []);
return (
<div className="bg-orange-100 rounded-xl border-2 border-orange-400 p-2 flex flex-col gap-2">
<div className="flex items-center gap-2">
@ -33,6 +25,17 @@ export default function ControlCenter() {
/>
<label htmlFor="submit">Enable Submissions</label>
</div>
<div className="flex items-center gap-2">
<input
id="queue"
type="checkbox"
className="checkbox size-6!"
placeholder="Enter banner text"
checked={isQueueEnabled}
onChange={(e) => setIsQeueueEnabled(e.target.checked)}
/>
<label htmlFor="queue">Enable Queue</label>
</div>
<div className="flex gap-2 self-end">
<button type="submit" className="pill button" onClick={onClickSet}>

View file

@ -60,13 +60,6 @@ export async function validateImage(file: File): Promise<{ valid: boolean; error
formData.append("image", blob);
const moderationResponse = await fetch("https://api.trafficlunar.net/moderate/image", { method: "POST", body: formData });
if (!moderationResponse.ok) {
console.error("Moderation API error");
Sentry.captureException("Moderation API error", { extra: { stage: "moderation-api-response", status: moderationResponse.status } });
return { valid: false, error: "Content moderation check failed", status: 500 };
}
const result = await moderationResponse.json();
if (result.error) {
return { valid: false, error: result.error };

4
src/lib/settings.ts Normal file
View file

@ -0,0 +1,4 @@
export const settings = {
canSubmit: true,
queueEnabled: false,
};