src/app/api/submit/route.ts

@@ -118,9 +118,7 @@ export async function POST(request: NextRequest) {
 	});
 
 	if (!parsed.success) {
-		const firstIssue = parsed.error.issues[0];
-		const path = firstIssue.path.length ? firstIssue.path.join(".") : "root";
-		const error = `${path}: ${firstIssue.message}`;
+		const error = parsed.error.issues[0].message;
 		const issues = parsed.error.issues;
 		const hasInstructionsErrors = issues.some((issue) => issue.path[0] === "instructions");
 
@@ -161,7 +159,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);
+			return rateLimit.sendResponse({ error: imageValidation.error }, imageValidation.status ?? 400);
 		}
 	}
 
@@ -169,10 +167,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) return rateLimit.sendResponse({ error: portraitValidation.error }, portraitValidation.status ?? 400);
+		if (!featuresValidation.valid) return rateLimit.sendResponse({ error: featuresValidation.error }, featuresValidation.status ?? 400);
 	}
 
 	const qrBytes = new Uint8Array(qrBytesRaw ?? []);
@@ -246,6 +242,7 @@ export async function POST(request: NextRequest) {
 		const fileLocation = path.join(miiUploadsDirectory, "mii.png");
 
 		await fs.writeFile(fileLocation, pngBuffer);
+		await generateMetadataImage(miiRecord, session.user?.name!);
 	} catch (error) {
 		// Clean up if something went wrong
 		await prisma.mii.delete({ where: { id: miiRecord.id } });
@@ -255,13 +252,6 @@ export async function POST(request: NextRequest) {
 		return rateLimit.sendResponse({ error: "Failed to download/store Mii portrait/features" }, 500);
 	}
 
-	try {
-		await generateMetadataImage(miiRecord, session.user?.name!);
-	} catch (error) {
-		console.error("Failed to generate metadata image:", error);
-		Sentry.captureException(error, { extra: { miiId: miiRecord.id, stage: "metadata-image-generation" } });
-	}
-
 	if (platform === "THREE_DS") {
 		try {
 			// Generate a new QR code for aesthetic reasons

src/components/mii/instructions.tsx

@@ -150,13 +150,13 @@ export default function MiiInstructions({ instructions }: Props) {
 			{eyebrows && <Section name="Eyebrows" instructions={eyebrows}></Section>}
 			{eyes && (
 				<Section name="Eyes" instructions={eyes}>
-					<Section isSubSection name="Tab 1" instructions={eyes.main} />
-					<Section isSubSection name="Tab 2" instructions={eyes.eyelashesTop} />
-					<Section isSubSection name="Tab 3" instructions={eyes.eyelashesBottom} />
-					<Section isSubSection name="Tab 4" instructions={eyes.eyelidTop} />
-					<Section isSubSection name="Tab 5" instructions={eyes.eyelidBottom} />
-					<Section isSubSection name="Tab 6" instructions={eyes.eyeliner} />
-					<Section isSubSection name="Tab 7" instructions={eyes.pupil} />
+					<Section isSubSection name="Main" instructions={eyes.main} />
+					<Section isSubSection name="Eyelashes Top" instructions={eyes.eyelashesTop} />
+					<Section isSubSection name="Eyelashes Bottom" instructions={eyes.eyelashesBottom} />
+					<Section isSubSection name="Eyelid Top" instructions={eyes.eyelidTop} />
+					<Section isSubSection name="Eyelid Bottom" instructions={eyes.eyelidBottom} />
+					<Section isSubSection name="Eyeliner" instructions={eyes.eyeliner} />
+					<Section isSubSection name="Pupil" instructions={eyes.pupil} />
 				</Section>
 			)}
 			{nose && <Section name="Nose" instructions={nose}></Section>}
@@ -182,16 +182,16 @@ export default function MiiInstructions({ instructions }: Props) {
 			)}
 			{other && (
 				<Section name="Other" instructions={other}>
-					<Section isSubSection name="Tab 1" instructions={other.wrinkles1} />
-					<Section isSubSection name="Tab 2" instructions={other.wrinkles2} />
-					<Section isSubSection name="Tab 3" instructions={other.beard} />
-					<Section isSubSection name="Tab 4" instructions={other.moustache}>
+					<Section isSubSection name="Wrinkles 1" instructions={other.wrinkles1} />
+					<Section isSubSection name="Wrinkles 2" instructions={other.wrinkles2} />
+					<Section isSubSection name="Beard" instructions={other.beard} />
+					<Section isSubSection name="Moustache" instructions={other.moustache}>
 						{other.moustache && other.moustache.isFlipped && <TableCell label="Flipped">{other.moustache.isFlipped ? "Yes" : "No"}</TableCell>}
 					</Section>
-					<Section isSubSection name="Tab 5" instructions={other.goatee} />
-					<Section isSubSection name="Tab 6" instructions={other.mole} />
-					<Section isSubSection name="Tab 7" instructions={other.eyeShadow} />
-					<Section isSubSection name="Tab 8" instructions={other.blush} />
+					<Section isSubSection name="Goatee" instructions={other.goatee} />
+					<Section isSubSection name="Mole" instructions={other.mole} />
+					<Section isSubSection name="Eye Shadow" instructions={other.eyeShadow} />
+					<Section isSubSection name="Blush" instructions={other.blush} />
 				</Section>
 			)}
 

src/components/submit-form/edit-form.tsx

@@ -64,6 +64,8 @@ export default function EditForm({ mii, likes }: Props) {
 		if (name != mii.name) formData.append("name", name);
 		if (tags != mii.tags) formData.append("tags", JSON.stringify(tags));
 		if (description && description != mii.description) formData.append("description", description);
+		console.log(minifyInstructions(structuredClone(instructions.current)));
+		console.log(mii.instructions);
 		if (minifyInstructions(structuredClone(instructions.current)) !== (mii.instructions as object))
 			formData.append("instructions", JSON.stringify(instructions.current));
 

src/components/submit-form/index.tsx

@@ -336,8 +336,8 @@ export default function SubmitForm() {
 					</div>
 
 					<div className="flex flex-col items-center gap-2">
-						<SwitchFileUpload text="a screenshot of your Mii here" image={miiPortraitUri} setImage={setMiiPortraitUri} forceCrop />
-						<SwitchFileUpload text="a screenshot of your Mii's features here" image={miiFeaturesUri} setImage={setMiiFeaturesUri} />
+						<SwitchFileUpload text="a screenshot of your Mii here" image={miiPortraitUri} setImage={setMiiPortraitUri} hasCrop />
+						<SwitchFileUpload text="a screenshot of your Mii's features here" setImage={setMiiFeaturesUri} />
 						<SwitchSubmitTutorialButton />
 					</div>
 

src/components/submit-form/mii-editor/number-inputs.tsx

@@ -23,8 +23,8 @@ export default function NumberInputs({ target }: Props) {
 					<input
 						type="number"
 						id="height"
-						min={-15}
-						max={15}
+						min={-5}
+						max={5}
 						value={height}
 						onChange={(e) => {
 							const value = Number(e.target.value);
@@ -44,8 +44,8 @@ export default function NumberInputs({ target }: Props) {
 					<input
 						type="number"
 						id="distance"
-						min={-15}
-						max={15}
+						min={-5}
+						max={5}
 						value={distance}
 						onChange={(e) => {
 							const value = Number(e.target.value);
@@ -65,8 +65,8 @@ export default function NumberInputs({ target }: Props) {
 					<input
 						type="number"
 						id="rotation"
-						min={-15}
-						max={15}
+						min={-5}
+						max={5}
 						value={rotation}
 						onChange={(e) => {
 							const value = Number(e.target.value);
@@ -86,8 +86,8 @@ export default function NumberInputs({ target }: Props) {
 					<input
 						type="number"
 						id="size"
-						min={-15}
-						max={15}
+						min={-5}
+						max={5}
 						value={size}
 						onChange={(e) => {
 							const value = Number(e.target.value);
@@ -107,8 +107,8 @@ export default function NumberInputs({ target }: Props) {
 					<input
 						type="number"
 						id="stretch"
-						min={-15}
-						max={15}
+						min={-5}
+						max={5}
 						value={stretch}
 						onChange={(e) => {
 							const value = Number(e.target.value);

src/components/submit-form/mii-editor/tabs/eyes.tsx

@@ -21,8 +21,8 @@ export default function EyesTab({ instructions }: Props) {
 	const [tab, setTab] = useState(0);
 	const [colors, setColors] = useState<number[]>(() =>
 		TABS.map((t) => {
-			const entry = instructions.current.eyes[t.name] ?? {};
-			const color = entry && "color" in entry ? entry.color : null;
+			const entry = instructions.current.eyes[t.name];
+			const color = "color" in entry ? entry.color : null;
 			return color ?? 122;
 		}),
 	);

src/components/submit-form/mii-editor/tabs/other.tsx

@@ -24,8 +24,8 @@ export default function OtherTab({ instructions }: Props) {
 
 	const [colors, setColors] = useState<number[]>(() =>
 		TABS.map((t) => {
-			const entry = instructions.current.other[t.name] ?? {};
-			const color = entry && "color" in entry ? entry.color : null;
+			const entry = instructions.current.other[t.name];
+			const color = "color" in entry ? entry.color : null;
 			return color ?? t.defaultColor ?? 0;
 		}),
 	);

src/components/submit-form/switch-file-upload.tsx

@@ -9,12 +9,12 @@ import CropPortrait from "./crop-portrait";
 
 interface Props {
 	text: string;
-	forceCrop?: boolean;
+	hasCrop?: boolean;
 	image?: string | undefined;
 	setImage: React.Dispatch<React.SetStateAction<string | undefined>>;
 }
 
-export default function SwitchFileUpload({ text, forceCrop, image, setImage }: Props) {
+export default function SwitchFileUpload({ text, hasCrop = false, image, setImage }: Props) {
 	const [isCameraOpen, setIsCameraOpen] = useState(false);
 	const [isCropOpen, setIsCropOpen] = useState(false);
 	const [hasImage, setHasImage] = useState(false);
@@ -27,7 +27,7 @@ export default function SwitchFileUpload({ text, forceCrop, image, setImage }: P
 			reader.onload = async (event) => {
 				setImage(event.target!.result as string);
 				setHasImage(true);
-				if (forceCrop) setIsCropOpen(true);
+				if (hasCrop) setIsCropOpen(true);
 			};
 			reader.readAsDataURL(file);
 		},
@@ -36,7 +36,7 @@ export default function SwitchFileUpload({ text, forceCrop, image, setImage }: P
 
 	useEffect(() => {
 		if (!isCameraOpen) return;
-		if (forceCrop) setIsCropOpen(true);
+		if (hasCrop) setIsCropOpen(true);
 	}, [isCameraOpen]);
 
 	return (
@@ -61,13 +61,17 @@ export default function SwitchFileUpload({ text, forceCrop, image, setImage }: P
 				<Icon icon="mdi:camera" fontSize={20} />
 				Use your camera
 			</button>
-			<button type="button" aria-label="Crop image" onClick={() => setIsCropOpen(true)} className="pill button gap-2">
-				<Icon icon="material-symbols:crop" fontSize={20} />
-				Crop Image
-			</button>
+			{hasCrop && (
+				<>
+					<button type="button" aria-label="Crop image" onClick={() => setIsCropOpen(true)} className="pill button gap-2">
+						<Icon icon="material-symbols:crop" fontSize={20} />
+						Crop Image
+					</button>
+					<CropPortrait isOpen={isCropOpen} setIsOpen={setIsCropOpen} image={image} setImage={setImage} />
+				</>
+			)}
 
 			<Camera isOpen={isCameraOpen} setIsOpen={setIsCameraOpen} setImage={setImage} />
-			<CropPortrait isOpen={isCropOpen} setIsOpen={setIsCropOpen} image={image} setImage={setImage} />
 		</div>
 	);
 }

src/lib/images.tsx

@@ -17,7 +17,7 @@ import { Mii } from "@prisma/client";
 
 const MIN_IMAGE_DIMENSIONS = [128, 128];
 const MAX_IMAGE_DIMENSIONS = [2000, 2000];
-const MAX_IMAGE_SIZE = 8 * 1024 * 1024; // 8 MB
+const MAX_IMAGE_SIZE = 4 * 1024 * 1024; // 4 MB
 const ALLOWED_MIME_TYPES = ["image/jpeg", "image/png", "image/gif", "image/webp"];
 
 //#region Image validation

src/lib/schemas.ts

@@ -84,7 +84,7 @@ export const userNameSchema = z
 	});
 
 const colorSchema = z.number().int().min(0).max(152).optional();
-const geometrySchema = z.number().int().min(-15).max(15).optional();
+const geometrySchema = z.number().int().min(-10).max(10).optional();
 
 export const switchMiiInstructionsSchema = z
 	.object({