Merge branch 'main' into feat/living-the-dream-manually

.dockerignore

@@ -0,0 +1,11 @@
+.next
+node_modules
+.git
+uploads
+Dockerfile
+.dockerignore
+.gitignore
+README.md
+DEVELOPMENT.md
+LICENSE
+.env*

next.config.ts

@@ -4,31 +4,7 @@ import type { NextConfig } from "next";
 const nextConfig: NextConfig = {
 	output: "standalone",
 	images: {
-		localPatterns: [
+		unoptimized: true,
-			{
-				pathname: "/mii/*/image",
-			},
-			{
-				pathname: "/profile/*/picture",
-			},
-			{
-				pathname: "/tutorial/**",
-			},
-			{
-				pathname: "/guest.webp",
-			},
-		],
-		remotePatterns: [
-			{
-				hostname: "avatars.githubusercontent.com",
-			},
-			{
-				hostname: "cdn.discordapp.com",
-			},
-			{
-				hostname: "studio.mii.nintendo.com",
-			},
-		],
 	},
 };
 

package.json

@@ -16,43 +16,43 @@
 		"@bprogress/next": "^3.2.12",
 		"@hello-pangea/dnd": "^18.0.1",
 		"@prisma/client": "^6.19.2",
-		"@sentry/nextjs": "^10.39.0",
+		"@sentry/nextjs": "^10.45.0",
 		"bit-buffer": "^0.3.0",
 		"canvas-confetti": "^1.9.4",
-		"dayjs": "^1.11.19",
+		"dayjs": "^1.11.20",
 		"downshift": "^9.3.2",
 		"embla-carousel-react": "^8.6.0",
-		"file-type": "^21.3.0",
+		"file-type": "^21.3.3",
 		"jsqr": "^1.4.0",
-		"next": "16.1.6",
+		"next": "16.2.0",
 		"next-auth": "5.0.0-beta.30",
 		"qrcode-generator": "^2.0.4",
 		"react": "^19.2.4",
 		"react-dom": "^19.2.4",
 		"react-dropzone": "^15.0.0",
 		"redis": "^5.11.0",
-		"satori": "^0.19.2",
+		"satori": "^0.25.0",
 		"seedrandom": "^3.0.5",
 		"sharp": "^0.34.5",
 		"sjcl-with-all": "1.0.8",
-		"swr": "^2.4.0",
+		"swr": "^2.4.1",
 		"zod": "^4.3.6"
 	},
 	"devDependencies": {
-		"@eslint/eslintrc": "^3.3.3",
+		"@eslint/eslintrc": "^3.3.5",
 		"@iconify/react": "^6.0.2",
-		"@tailwindcss/postcss": "^4.2.0",
+		"@tailwindcss/postcss": "^4.2.2",
 		"@types/canvas-confetti": "^1.9.0",
-		"@types/node": "^25.3.0",
+		"@types/node": "^25.5.0",
 		"@types/react": "^19.2.14",
 		"@types/react-dom": "^19.2.3",
 		"@types/seedrandom": "^3.0.8",
 		"@types/sjcl": "^1.0.34",
-		"eslint": "^10.0.1",
+		"eslint": "^10.0.3",
-		"eslint-config-next": "16.1.6",
+		"eslint-config-next": "16.2.0",
 		"prisma": "^6.19.2",
 		"schema-dts": "^1.1.5",
-		"tailwindcss": "^4.2.0",
+		"tailwindcss": "^4.2.2",
 		"typescript": "^5.9.3"
 	}
 }

prisma/migrations/20260324215914_remove_usernames/migration.sql

@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `username` on the `users` table. All the data in the column will be lost.
+  - You are about to drop the column `usernameUpdatedAt` on the `users` table. All the data in the column will be lost.
+
+*/
+-- DropIndex
+DROP INDEX "users_username_key";
+
+-- AlterTable
+ALTER TABLE "miis" ALTER COLUMN "allowedCopying" DROP NOT NULL;
+
+-- AlterTable
+ALTER TABLE "users" DROP COLUMN "username",
+DROP COLUMN "usernameUpdatedAt";

prisma/schema.prisma

@@ -9,7 +9,6 @@ datasource db {
 
 model User {
   id            Int       @id @default(autoincrement())
-  username      String?   @unique
   name          String
   email         String    @unique
   emailVerified DateTime?
@@ -19,7 +18,6 @@ model User {
   createdAt DateTime @default(now())
   updatedAt DateTime @updatedAt
 
-  usernameUpdatedAt DateTime?
   imageUpdatedAt DateTime?
 
   accounts Account[]

src/app/admin/page.tsx

@@ -21,7 +21,7 @@ export const metadata: Metadata = {
 export default async function AdminPage() {
 	const session = await auth();
 
-	if (!session || Number(session.user.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) redirect("/404");
+	if (!session || Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) redirect("/404");
 
 	return (
 		<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-4 flex flex-col gap-4">

src/app/api/admin/banner/route.ts

@@ -11,7 +11,7 @@ export async function POST(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 });
+	if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
 
 	const body = await request.text();
 	bannerText = body;
@@ -23,7 +23,7 @@ export async function DELETE() {
 	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 });
+	if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
 
 	bannerText = null;
 	return NextResponse.json({ success: true });

src/app/api/admin/can-submit/route.ts

@@ -12,7 +12,7 @@ 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 });
+	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);

src/app/api/admin/lookup/route.ts

@@ -8,7 +8,7 @@ export async function GET(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 });
+	if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
 
 	const searchParams = request.nextUrl.searchParams;
 	const parsed = idSchema.safeParse(searchParams.get("id"));
@@ -51,7 +51,6 @@ export async function GET(request: NextRequest) {
 	return NextResponse.json({
 		success: true,
 		name: user.name,
-		username: user.username,
 		image: user.image,
 		createdAt: user.createdAt,
 		punishments: user.punishments,

src/app/api/admin/punish/route.ts

@@ -30,7 +30,7 @@ export async function POST(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 });
+	if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
 
 	const searchParams = request.nextUrl.searchParams;
 	const parsedUserId = idSchema.safeParse(searchParams.get("id"));
@@ -69,7 +69,7 @@ export async function DELETE(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 });
+	if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
 
 	const searchParams = request.nextUrl.searchParams;
 	const parsedPunishmentId = idSchema.safeParse(searchParams.get("id"));

src/app/api/admin/regenerate-metadata-images/route.ts

@@ -7,7 +7,7 @@ export async function PATCH() {
 	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 });
+	if (Number(session.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) return NextResponse.json({ error: "Forbidden" }, { status: 403 });
 
 	// Start processing in background
 	regenerateImages().catch(console.error);

src/app/api/auth/about-me/route.ts

@@ -10,7 +10,7 @@ import { RateLimit } from "@/lib/rate-limit";
 export async function PATCH(request: NextRequest) {
 	const session = await auth();
 	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user?.id, name: session.user?.name });
 
 	const rateLimit = new RateLimit(request, 3);
 	const check = await rateLimit.handle();
@@ -24,7 +24,7 @@ export async function PATCH(request: NextRequest) {
 
 	try {
 		await prisma.user.update({
-			where: { id: Number(session.user.id) },
+			where: { id: Number(session.user?.id) },
 			data: { description: profanity.censor(description) },
 		});
 	} catch (error) {

src/app/api/auth/delete/route.ts

@@ -8,7 +8,7 @@ import { RateLimit } from "@/lib/rate-limit";
 export async function DELETE(request: NextRequest) {
 	const session = await auth();
 	if (!session || !session.user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user.id, name: session.user.name });
 
 	const rateLimit = new RateLimit(request, 1);
 	const check = await rateLimit.handle();

src/app/api/auth/display-name/route.ts

@@ -1,40 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import * as Sentry from "@sentry/nextjs";
-import { profanity } from "@2toad/profanity";
-
-import { auth } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { displayNameSchema } from "@/lib/schemas";
-import { RateLimit } from "@/lib/rate-limit";
-
-export async function PATCH(request: NextRequest) {
-	const session = await auth();
-	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
-
-	const rateLimit = new RateLimit(request, 3);
-	const check = await rateLimit.handle();
-	if (check) return check;
-
-	const { displayName } = await request.json();
-	if (!displayName) return rateLimit.sendResponse({ error: "New display name is required" }, 400);
-
-	const validation = displayNameSchema.safeParse(displayName);
-	if (!validation.success) return rateLimit.sendResponse({ error: validation.error.issues[0].message }, 400);
-
-	// Check for inappropriate words
-	if (profanity.exists(displayName)) return rateLimit.sendResponse({ error: "Display name contains inappropriate words" }, 400);
-
-	try {
-		await prisma.user.update({
-			where: { id: Number(session.user.id) },
-			data: { name: displayName },
-		});
-	} catch (error) {
-		console.error("Failed to update display name:", error);
-		Sentry.captureException(error, { extra: { stage: "update-display-name" } });
-		return rateLimit.sendResponse({ error: "Failed to update display name" }, 500);
-	}
-
-	return rateLimit.sendResponse({ success: true });
-}

src/app/api/auth/name/route.ts

@@ -0,0 +1,40 @@
+import { NextRequest, NextResponse } from "next/server";
+import * as Sentry from "@sentry/nextjs";
+import { profanity } from "@2toad/profanity";
+
+import { auth } from "@/lib/auth";
+import { prisma } from "@/lib/prisma";
+import { userNameSchema } from "@/lib/schemas";
+import { RateLimit } from "@/lib/rate-limit";
+
+export async function PATCH(request: NextRequest) {
+	const session = await auth();
+	if (!session || !session.user) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
+	Sentry.setUser({ id: session.user.id, name: session.user.name });
+
+	const rateLimit = new RateLimit(request, 3);
+	const check = await rateLimit.handle();
+	if (check) return check;
+
+	const { name } = await request.json();
+	if (!name) return rateLimit.sendResponse({ error: "New name is required" }, 400);
+
+	const validation = userNameSchema.safeParse(name);
+	if (!validation.success) return rateLimit.sendResponse({ error: validation.error.issues[0].message }, 400);
+
+	// Check for inappropriate words
+	if (profanity.exists(name)) return rateLimit.sendResponse({ error: "Name contains inappropriate words" }, 400);
+
+	try {
+		await prisma.user.update({
+			where: { id: Number(session.user.id) },
+			data: { name },
+		});
+	} catch (error) {
+		console.error("Failed to update name:", error);
+		Sentry.captureException(error, { extra: { stage: "update-name" } });
+		return rateLimit.sendResponse({ error: "Failed to update name" }, 500);
+	}
+
+	return rateLimit.sendResponse({ success: true });
+}

src/app/api/auth/picture/route.ts

@@ -21,14 +21,14 @@ const formDataSchema = z.object({
 export async function PATCH(request: NextRequest) {
 	const session = await auth();
 	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user?.id, name: session.user?.name });
 
 	const rateLimit = new RateLimit(request, 3);
 	const check = await rateLimit.handle();
 	if (check) return check;
 
 	// Check if profile picture was updated in the last 7 days
-	const user = await prisma.user.findUnique({ where: { id: Number(session.user.id) } });
+	const user = await prisma.user.findUnique({ where: { id: Number(session.user?.id) } });
 	if (user && user.imageUpdatedAt) {
 		const timePeriod = dayjs().subtract(7, "days");
 		const lastUpdate = dayjs(user.imageUpdatedAt);
@@ -48,8 +48,8 @@ export async function PATCH(request: NextRequest) {
 	// If there is no image, set the profile picture to the guest image
 	if (!image) {
 		await prisma.user.update({
-			where: { id: Number(session.user.id) },
+			where: { id: Number(session.user?.id) },
-			data: { image: `/guest.webp`, imageUpdatedAt: new Date() },
+			data: { image: `/guest.png`, imageUpdatedAt: new Date() },
 		});
 
 		return rateLimit.sendResponse({ success: true });
@@ -64,10 +64,10 @@ export async function PATCH(request: NextRequest) {
 
 	try {
 		const buffer = Buffer.from(await image.arrayBuffer());
-		const webpBuffer = await sharp(buffer, { animated: true }).resize({ width: 128, height: 128 }).webp({ quality: 85 }).toBuffer();
+		const pngBuffer = await sharp(buffer, { animated: true }).resize({ width: 128, height: 128 }).png({ quality: 85 }).toBuffer();
-		const fileLocation = path.join(uploadsDirectory, `${session.user.id}.webp`);
+		const fileLocation = path.join(uploadsDirectory, `${session.user?.id}.png`);
 
-		await fs.writeFile(fileLocation, webpBuffer);
+		await fs.writeFile(fileLocation, pngBuffer);
 	} catch (error) {
 		console.error("Error uploading profile picture:", error);
 		Sentry.captureException(error, { extra: { stage: "upload-profile-picture" } });
@@ -76,8 +76,8 @@ export async function PATCH(request: NextRequest) {
 
 	try {
 		await prisma.user.update({
-			where: { id: Number(session.user.id) },
+			where: { id: Number(session.user?.id) },
-			data: { image: `/profile/${session.user.id}/picture`, imageUpdatedAt: new Date() },
+			data: { image: `/profile/${session.user?.id}/picture`, imageUpdatedAt: new Date() },
 		});
 	} catch (error) {
 		console.error("Failed to update profile picture:", error);

src/app/api/auth/username/route.ts

@@ -1,54 +0,0 @@
-import { NextRequest, NextResponse } from "next/server";
-import * as Sentry from "@sentry/nextjs";
-
-import dayjs from "dayjs";
-import { profanity } from "@2toad/profanity";
-
-import { auth } from "@/lib/auth";
-import { prisma } from "@/lib/prisma";
-import { usernameSchema } from "@/lib/schemas";
-import { RateLimit } from "@/lib/rate-limit";
-
-export async function PATCH(request: NextRequest) {
-	const session = await auth();
-	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
-
-	const rateLimit = new RateLimit(request, 3);
-	const check = await rateLimit.handle();
-	if (check) return check;
-
-	const { username } = await request.json();
-	if (!username) return rateLimit.sendResponse({ error: "New username is required" }, 400);
-
-	// Check if username was updated in the last 90 days
-	const user = await prisma.user.findUnique({ where: { id: Number(session.user.id) } });
-	if (user && user.usernameUpdatedAt) {
-		const timePeriod = dayjs().subtract(90, "days");
-		const lastUpdate = dayjs(user.usernameUpdatedAt);
-
-		if (lastUpdate.isAfter(timePeriod)) return rateLimit.sendResponse({ error: "Username was changed in the last 90 days" }, 400);
-	}
-
-	const validation = usernameSchema.safeParse(username);
-	if (!validation.success) return rateLimit.sendResponse({ error: validation.error.issues[0].message }, 400);
-
-	// Check for inappropriate words
-	if (profanity.exists(username)) return rateLimit.sendResponse({ error: "Username contains inappropriate words" }, 400);
-
-	const existingUser = await prisma.user.findUnique({ where: { username } });
-	if (existingUser) return rateLimit.sendResponse({ error: "Username is already taken" }, 400);
-
-	try {
-		await prisma.user.update({
-			where: { id: Number(session.user.id) },
-			data: { username, usernameUpdatedAt: new Date() },
-		});
-	} catch (error) {
-		console.error("Failed to update username:", error);
-		Sentry.captureException(error, { extra: { stage: "update-username" } });
-		return rateLimit.sendResponse({ error: "Failed to update username" }, 500);
-	}
-
-	return rateLimit.sendResponse({ success: true });
-}

src/app/api/mii/[id]/delete/route.ts

@@ -14,7 +14,7 @@ const uploadsDirectory = path.join(process.cwd(), "uploads", "mii");
 export async function DELETE(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
 	const session = await auth();
 	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user?.id, name: session.user?.name });
 
 	const rateLimit = new RateLimit(request, 30, "/api/mii/delete");
 	const check = await rateLimit.handle();
@@ -33,7 +33,7 @@ export async function DELETE(request: NextRequest, { params }: { params: Promise
 	});
 
 	if (!mii) return rateLimit.sendResponse({ error: "Mii not found" }, 404);
-	if (!(Number(session.user.id) === mii.userId || Number(session.user.id) === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)))
+	if (!(Number(session.user?.id) === mii.userId || Number(session.user?.id) === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)))
 		return rateLimit.sendResponse({ error: "You don't have ownership of that Mii" }, 403);
 
 	const miiUploadsDirectory = path.join(uploadsDirectory, miiId.toString());

src/app/api/mii/[id]/edit/route.ts

@@ -1,7 +1,7 @@
 import { NextRequest, NextResponse } from "next/server";
 import * as Sentry from "@sentry/nextjs";
 import { z } from "zod";
-import { Mii } from "@prisma/client";
+import { Mii, Prisma } from "@prisma/client";
 
 import fs from "fs/promises";
 import path from "path";
@@ -29,7 +29,7 @@ const editSchema = z.object({
 export async function PATCH(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
 	const session = await auth();
 	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user?.id, name: session.user?.name });
 
 	const rateLimit = new RateLimit(request, 1); // no grouped pathname; edit each mii 1 time a minute
 	const check = await rateLimit.handle();
@@ -49,7 +49,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 	});
 
 	if (!mii) return rateLimit.sendResponse({ error: "Mii not found" }, 404);
-	if (!(Number(session.user.id) === mii.userId || Number(session.user.id) === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)))
+	if (!(Number(session.user?.id) === mii.userId || Number(session.user?.id) === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)))
 		return rateLimit.sendResponse({ error: "You don't have ownership of that Mii" }, 403);
 
 	// Parse form data
@@ -90,7 +90,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 	}
 
 	// Edit Mii in database
-	const updateData: Partial<Mii> = {};
+	const updateData: Prisma.MiiUpdateInput = {};
 	if (name !== undefined) updateData.name = profanity.censor(name); // Censor potential inappropriate words
 	if (tags !== undefined) updateData.tags = tags.map((t) => profanity.censor(t)); // Same here
 	if (description !== undefined) updateData.description = profanity.censor(description);
@@ -126,10 +126,10 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 			await Promise.all(
 				images.map(async (image, index) => {
 					const buffer = Buffer.from(await image.arrayBuffer());
-					const webpBuffer = await sharp(buffer).webp({ quality: 85 }).toBuffer();
+					const pngBuffer = await sharp(buffer).png({ quality: 85 }).toBuffer();
-					const fileLocation = path.join(miiUploadsDirectory, `image${index}.webp`);
+					const fileLocation = path.join(miiUploadsDirectory, `image${index}.png`);
 
-					await fs.writeFile(fileLocation, webpBuffer);
+					await fs.writeFile(fileLocation, pngBuffer);
 				}),
 			);
 		} catch (error) {

src/app/api/mii/[id]/like/route.ts

@@ -22,7 +22,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 		const existingLike = await tx.like.findUnique({
 			where: {
 				userId_miiId: {
-					userId: Number(session.user.id),
+					userId: Number(session.user?.id),
 					miiId,
 				},
 			},
@@ -33,7 +33,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 			await tx.like.delete({
 				where: {
 					userId_miiId: {
-						userId: Number(session.user.id),
+						userId: Number(session.user?.id),
 						miiId,
 					},
 				},
@@ -42,7 +42,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
 			// Add a like if it doesn't exist
 			await tx.like.create({
 				data: {
-					userId: Number(session.user.id),
+					userId: Number(session.user?.id),
 					miiId,
 				},
 			});

src/app/api/report/route.ts

@@ -19,7 +19,7 @@ const reportSchema = z.object({
 export async function POST(request: NextRequest) {
 	const session = await auth();
 	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user?.id, name: session.user?.name });
 
 	const rateLimit = new RateLimit(request, 2);
 	const check = await rateLimit.handle();
@@ -35,7 +35,7 @@ export async function POST(request: NextRequest) {
 		include: {
 			user: {
 				select: {
-					username: true;
+					name: true;
 				};
 			};
 		};
@@ -48,7 +48,7 @@ export async function POST(request: NextRequest) {
 			include: {
 				user: {
 					select: {
-						username: true,
+						name: true,
 					},
 				},
 			},
@@ -66,7 +66,7 @@ export async function POST(request: NextRequest) {
 		where: {
 			targetId: id,
 			reportType: type.toUpperCase() as ReportType,
-			authorId: Number(session.user.id),
+			authorId: Number(session.user?.id),
 		},
 	});
 
@@ -79,7 +79,7 @@ export async function POST(request: NextRequest) {
 				targetId: id,
 				reason: reason.toUpperCase() as ReportReason,
 				reasonNotes: notes,
-				authorId: Number(session.user.id),
+				authorId: Number(session.user?.id),
 				creatorId: mii ? mii.userId : undefined,
 			},
 		});
@@ -92,11 +92,11 @@ export async function POST(request: NextRequest) {
 	// Send notification to ntfy
 	if (process.env.NTFY_URL) {
 		// This is only shown if report type is MII
-		const miiCreatorMessage = mii ? `by @${mii.user.username} (ID: ${mii.userId})` : "";
+		const miiCreatorMessage = mii ? `by ${mii.user.name} (ID: ${mii.userId})` : "";
 
 		await fetch(process.env.NTFY_URL, {
 			method: "POST",
-			body: `Report by @${session.user.username} (ID: ${session.user.id}) on ${type.toUpperCase()} (ID: ${id}) ${miiCreatorMessage}`,
+			body: `Report by ${session.user?.name} (ID: ${session.user?.id}) on ${type.toUpperCase()} (ID: ${id}) ${miiCreatorMessage}`,
 			headers: {
 				Title: "Report recieved - TomodachiShare",
 				Priority: "urgent",

src/app/api/return/route.ts

@@ -14,7 +14,7 @@ export async function DELETE(request: NextRequest) {
 
 	const activePunishment = await prisma.punishment.findFirst({
 		where: {
-			userId: Number(session.user.id),
+			userId: Number(session.user?.id),
 			returned: false,
 		},
 		include: {

src/app/api/submit/route.ts

@@ -66,7 +66,7 @@ const submitSchema = z
 export async function POST(request: NextRequest) {
 	const session = await auth();
 	if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
-	Sentry.setUser({ id: session.user.id, username: session.user.username });
+	Sentry.setUser({ id: session.user?.id, name: session.user?.name });
 
 	const rateLimit = new RateLimit(request, 3);
 	const check = await rateLimit.handle();
@@ -205,7 +205,7 @@ export async function POST(request: NextRequest) {
 	// Create Mii in database
 	const miiRecord = await prisma.mii.create({
 		data: {
-			userId: Number(session.user.id),
+			userId: Number(session.user?.id),
 			platform,
 			name,
 			tags,
@@ -249,10 +249,10 @@ export async function POST(request: NextRequest) {
 		}
 
 		if (!portraitBuffer) throw Error("Mii portrait buffer not initialised");
-		const webpBuffer = await sharp(portraitBuffer).webp({ quality: 85 }).toBuffer();
+		const pngBuffer = await sharp(portraitBuffer).png({ quality: 85 }).toBuffer();
-		const fileLocation = path.join(miiUploadsDirectory, "mii.webp");
+		const fileLocation = path.join(miiUploadsDirectory, "mii.png");
 
-		await fs.writeFile(fileLocation, webpBuffer);
+		await fs.writeFile(fileLocation, pngBuffer);
 	} catch (error) {
 		// Clean up if something went wrong
 		await prisma.mii.delete({ where: { id: miiRecord.id } });
@@ -276,10 +276,11 @@ export async function POST(request: NextRequest) {
 			const codeBuffer = Buffer.from(codeBase64, "base64");
 
 			// Compress and store
-			const codeWebpBuffer = await sharp(codeBuffer).webp({ quality: 85 }).toBuffer();
+			const codePngBuffer = await sharp(codeBuffer).png({ quality: 85 }).toBuffer();
-			const codeFileLocation = path.join(miiUploadsDirectory, "qr-code.webp");
+			const codeFileLocation = path.join(miiUploadsDirectory, "qr-code.png");
 
-			await fs.writeFile(codeFileLocation, codeWebpBuffer);
+			await fs.writeFile(codeFileLocation, codePngBuffer);
+			await generateMetadataImage(miiRecord, session.user?.name!);
 		} catch (error) {
 			// Clean up if something went wrong
 			await prisma.mii.delete({ where: { id: miiRecord.id } });
@@ -290,23 +291,15 @@ export async function POST(request: NextRequest) {
 		}
 	}
 
-	try {
-		await generateMetadataImage(miiRecord, session.user.name!);
-	} catch (error) {
-		console.error(error);
-		Sentry.captureException(error, { extra: { miiId: miiRecord.id, stage: "metadata-image" } });
-		return rateLimit.sendResponse({ error: `Failed to generate 'metadata' type image for mii ${miiRecord.id}` }, 500);
-	}
-
 	// Compress and store user images
 	try {
 		await Promise.all(
 			customImages.map(async (image, index) => {
 				const buffer = Buffer.from(await image.arrayBuffer());
-				const webpBuffer = await sharp(buffer).webp({ quality: 85 }).toBuffer();
+				const pngBuffer = await sharp(buffer).png({ quality: 85 }).toBuffer();
-				const fileLocation = path.join(miiUploadsDirectory, `image${index}.webp`);
+				const fileLocation = path.join(miiUploadsDirectory, `image${index}.png`);
 
-				await fs.writeFile(fileLocation, webpBuffer);
+				await fs.writeFile(fileLocation, pngBuffer);
 			}),
 		);
 

src/app/create-username/page.tsx

@@ -1,38 +0,0 @@
-import { Metadata } from "next";
-import { redirect } from "next/navigation";
-import { auth } from "@/lib/auth";
-import UsernameForm from "@/components/username-form";
-
-export const metadata: Metadata = {
-	title: "Create your Username - TomodachiShare",
-	description: "Pick a unique username to start using TomodachiShare",
-	robots: {
-		index: false,
-		follow: false,
-	},
-};
-
-export default async function CreateUsernamePage() {
-	const session = await auth();
-
-	// If the user is not logged in or already has a username, redirect
-	if (!session || session?.user.username) {
-		redirect("/");
-	}
-
-	return (
-		<div className="grow flex items-center justify-center">
-			<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg px-10 py-12 max-w-md text-center">
-				<h1 className="text-3xl font-bold mb-4">Welcome to the island!</h1>
-
-				<div className="flex items-center gap-4 text-zinc-500 text-sm font-medium mb-6">
-					<hr className="grow border-zinc-300" />
-					<span>Please create a username</span>
-					<hr className="grow border-zinc-300" />
-				</div>
-
-				<UsernameForm />
-			</div>
-		</div>
-	);
-}

src/app/edit/[id]/page.tsx

@@ -44,7 +44,7 @@ export default async function MiiPage({ params }: Props) {
 	});
 
 	// Check ownership
-	if (!mii || (Number(session?.user.id) !== mii.userId && Number(session?.user.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID))) redirect("/404");
+	if (!mii || (Number(session?.user?.id) !== mii.userId && Number(session?.user?.id) !== Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID))) redirect("/404");
 
 	return <EditForm mii={mii} likes={mii._count.likedBy} />;
 }

src/app/login/page.tsx

@@ -12,9 +12,7 @@ export default async function LoginPage() {
 	const session = await auth();
 
 	// If the user is already logged in, redirect
-	if (session) {
+	if (session) redirect("/");
-		redirect("/");
-	}
 
 	return (
 		<div className="grow flex items-center justify-center">

src/app/mii/[id]/image/route.ts

@@ -32,8 +32,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
 	if (!searchParamsParsed.success) return rateLimit.sendResponse({ error: searchParamsParsed.error.issues[0].message }, 400);
 	const { type: imageType } = searchParamsParsed.data;
 
-	const fileExtension = imageType === "metadata" ? ".png" : ".webp";
+	const filePath = path.join(process.cwd(), "uploads", "mii", miiId.toString(), `${imageType}.png`);
-	const filePath = path.join(process.cwd(), "uploads", "mii", miiId.toString(), `${imageType}${fileExtension}`);
 
 	let buffer: Buffer | undefined;
 	// Only find Mii if image type is 'metadata'
@@ -109,7 +108,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
 	}
 
 	return rateLimit.sendResponse(buffer, 200, {
-		"Content-Type": "image/webp",
+		"Content-Type": "image/png",
 		"X-Robots-Tag": "noindex, noimageindex, nofollow",
 		"Cache-Control": "no-store",
 	});

src/app/mii/[id]/page.tsx

@@ -35,7 +35,6 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 			user: {
 				select: {
 					name: true,
-					username: true,
 				},
 			},
 			_count: {
@@ -49,16 +48,18 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
 	const metadataImageUrl = `/mii/${mii.id}/image?type=metadata`;
 
+	const name = `@${mii.user.name}`;
+
 	return {
 		metadataBase: new URL(process.env.NEXT_PUBLIC_BASE_URL!),
 		title: `${mii.name} - TomodachiShare`,
-		description: `Check out '${mii.name}', a ${mii.platform === MiiPlatform.SWITCH ? "Switch Living the Dream" : "3DS"} Tomodachi Life Mii created by ${mii.user.name} on TomodachiShare with ${mii._count.likedBy} likes.`,
+		description: `Check out '${mii.name}', a ${mii.platform === MiiPlatform.SWITCH ? "Switch Living the Dream" : "3DS"} Tomodachi Life Mii created by ${mii.name} on TomodachiShare with ${mii._count.likedBy} likes.`,
 		keywords: ["mii", "tomodachi life", "nintendo", "tomodachishare", "tomodachi-share", "mii creator", "mii collection", ...mii.tags],
-		creator: mii.user.username,
+		creator: name,
 		openGraph: {
 			type: "article",
 			title: `${mii.name} - TomodachiShare`,
-			description: `Check out '${mii.name}', a ${mii.platform === MiiPlatform.SWITCH ? "Switch Living the Dream" : "3DS"} Tomodachi Life Mii created by ${mii.user.name} on TomodachiShare with ${mii._count.likedBy} likes.`,
+			description: `Check out '${mii.name}', a ${mii.platform === MiiPlatform.SWITCH ? "Switch Living the Dream" : "3DS"} Tomodachi Life Mii created by ${mii.name} on TomodachiShare with ${mii._count.likedBy} likes.`,
 			images: [
 				{
 					url: metadataImageUrl,
@@ -66,19 +67,19 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 				},
 			],
 			publishedTime: mii.createdAt.toISOString(),
-			authors: mii.user.username,
+			authors: name,
 		},
 		twitter: {
 			card: "summary_large_image",
 			title: `${mii.name} - TomodachiShare`,
-			description: `Check out '${mii.name}', a ${mii.platform === MiiPlatform.SWITCH ? "Switch Living the Dream" : "3DS"} Tomodachi Life Mii created by ${mii.user.name} on TomodachiShare with ${mii._count.likedBy} likes.`,
+			description: `Check out '${mii.name}', a ${mii.platform === MiiPlatform.SWITCH ? "Switch Living the Dream" : "3DS"} Tomodachi Life Mii created by ${mii.name} on TomodachiShare with ${mii._count.likedBy} likes.`,
 			images: [
 				{
 					url: metadataImageUrl,
 					alt: `${mii.name}, ${mii.tags.join(", ")} ${mii.gender} Mii character`,
 				},
 			],
-			creator: mii.user.username!,
+			creator: mii.user.name!,
 		},
 		alternates: {
 			canonical: `/mii/${mii.id}`,
@@ -98,7 +99,6 @@ export default async function MiiPage({ params }: Props) {
 			user: {
 				select: {
 					name: true,
-					username: true,
 				},
 			},
 			likedBy: session?.user
@@ -291,7 +291,7 @@ export default async function MiiPage({ params }: Props) {
 
 						{/* Buttons */}
 						<div className="flex gap-3 w-fit bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-4 text-3xl text-orange-400 max-md:place-self-center *:size-12 *:flex *:flex-col *:items-center *:gap-1 **:transition-discrete **:duration-150 *:hover:brightness-75 *:hover:scale-[1.08] *:[&_span]:text-xs">
-							{session && (Number(session.user.id) === mii.userId || Number(session.user.id) === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) && (
+							{session && (Number(session.user?.id) === mii.userId || Number(session.user?.id) === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID)) && (
 								<>
 									<Link aria-label="Edit Mii" href={`/edit/${mii.id}`}>
 										<Icon icon="mdi:pencil" />

src/app/page.tsx

@@ -39,9 +39,6 @@ export default async function Page({ searchParams }: Props) {
 	const session = await auth();
 	const { page, tags } = await searchParams;
 
-	if (session?.user && !session.user.username) {
-		redirect("/create-username");
-	}
 	if (session?.user) {
 		const activePunishment = await prisma.punishment.findFirst({
 			where: {

src/app/privacy/page.tsx

@@ -32,8 +32,8 @@ export default function PrivacyPage() {
 						<p className="mb-2">The following types of information are stored when you use this website:</p>
 						<ul className="list-disc list-inside">
 							<li>
-								<strong>Account Information:</strong> When you sign up or log in using Discord or Github, your username, e-mail, and profile picture are
+								<strong>Account Information:</strong> When you sign up or log in using Discord or Github, your name, e-mail, and profile picture are collected.
-								collected. Your authentication tokens may also be temporarily stored to maintain your login session.
+								Your authentication tokens may also be temporarily stored to maintain your login session.
 							</li>
 							<li>
 								<strong>Miis:</strong> We store any Miis you submit, including associated images (such as a picture of your Mii, QR codes, and custom images).
@@ -77,7 +77,7 @@ export default function PrivacyPage() {
 						</p>
 						<ul className="list-disc list-inside ml-4">
 							<li>Errors and performance data is collected.</li>
-							<li>Only your user ID and username are sent, no other personally identifiable information is collected.</li>
+							<li>Only your user ID and name are sent, no other personally identifiable information is collected.</li>
 							<li>You can use ad blockers or browser privacy features to opt out.</li>
 						</ul>
 					</section>

src/app/profile/[id]/page.tsx

@@ -39,24 +39,23 @@ export async function generateMetadata({ params }: Props): Promise<Metadata> {
 
 	return {
 		metadataBase: new URL(process.env.NEXT_PUBLIC_BASE_URL!),
-		title: `${user.name} (@${user.username}) - TomodachiShare`,
+		title: `${user.name} - TomodachiShare`,
 		description: `View ${user.name}'s profile on TomodachiShare. Creator of ${user._count.miis} Miis. Member since ${joinDate}.`,
 		keywords: ["mii", "tomodachi life", "nintendo", "mii creator", "mii collection", "profile"],
-		creator: user.username,
+		creator: user.name,
 		openGraph: {
 			type: "profile",
-			title: `${user.name} (@${user.username}) - TomodachiShare`,
+			title: `${user.name} - TomodachiShare`,
 			description: `View ${user.name}'s profile on TomodachiShare. Creator of ${user._count.miis} Miis. Member since ${joinDate}.`,
-			images: [user.image ?? "/guest.webp"],
+			images: [user.image ?? "/guest.png"],
-			username: user.username,
+			username: user.name,
-			firstName: user.name,
 		},
 		twitter: {
 			card: "summary",
-			title: `${user.name} (@${user.username}) - TomodachiShare`,
+			title: `${user.name} - TomodachiShare`,
 			description: `View ${user.name}'s profile on TomodachiShare. Creator of ${user._count.miis} Miis. Member since ${joinDate}.`,
-			images: [user.image ?? "/guest.webp"],
+			images: [user.image ?? "/guest.png"],
-			creator: user.username!,
+			creator: user.name,
 		},
 		alternates: {
 			canonical: `/profile/${user.id}`,

src/app/profile/[id]/picture/route.ts

@@ -16,7 +16,7 @@ export async function GET(request: NextRequest, { params }: { params: Promise<{
 	if (!parsed.success) return rateLimit.sendResponse({ error: parsed.error.issues[0].message }, 400);
 	const userId = parsed.data;
 
-	const filePath = path.join(process.cwd(), "uploads", "user", `${userId}.webp`);
+	const filePath = path.join(process.cwd(), "uploads", "user", `${userId}.png`);
 
 	try {
 		const buffer = await fs.readFile(filePath);

src/app/profile/settings/page.tsx

@@ -21,7 +21,7 @@ export default async function ProfileSettingsPage() {
 
 	if (!session) redirect("/login");
 
-	const user = await prisma.user.findUnique({ where: { id: Number(session.user.id!) }, select: { description: true } });
+	const user = await prisma.user.findUnique({ where: { id: Number(session.user?.id!) }, select: { description: true } });
 
 	return (
 		<div>

src/app/robots.ts

@@ -5,18 +5,7 @@ export default function robots(): MetadataRoute.Robots {
 		rules: {
 			userAgent: "*",
 			allow: "/",
-			disallow: [
+			disallow: ["/*?*page=", "/profile*?*tags=", "/edit/*", "/profile/settings", "/random", "/submit", "/report/mii/*", "/report/user/*", "/admin"],
-				"/*?*page=",
-				"/profile*?*tags=",
-				"/create-username",
-				"/edit/*",
-				"/profile/settings",
-				"/random",
-				"/submit",
-				"/report/mii/*",
-				"/report/user/*",
-				"/admin",
-			],
 		},
 		sitemap: `${process.env.NEXT_PUBLIC_BASE_URL}/sitemap.xml`,
 	};

src/app/submit/page.tsx

@@ -22,10 +22,9 @@ export default async function SubmitPage() {
 	const session = await auth();
 
 	if (!session) redirect("/login");
-	if (!session.user.username) redirect("/create-username");
 	const activePunishment = await prisma.punishment.findFirst({
 		where: {
-			userId: Number(session?.user.id),
+			userId: Number(session?.user?.id),
 			returned: false,
 		},
 	});
@@ -39,6 +38,12 @@ export default async function SubmitPage() {
 	} catch (error) {
 		return <p>An error occurred!</p>;
 	}
+	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 (

src/components/admin/user-management.tsx

@@ -14,7 +14,6 @@ import PunishmentDeletionDialog from "./punishment-deletion-dialog";
 interface ApiResponse {
 	success: boolean;
 	name: string;
-	username: string;
 	image: string;
 	createdAt: string;
 	punishments: Prisma.PunishmentGetPayload<{
@@ -115,7 +114,7 @@ export default function Punishments() {
 							<ProfilePicture src={user.image} width={96} height={96} className="rounded-full border-2 border-orange-400" />
 							<div className="p-2 flex flex-col">
 								<p className="text-xl font-bold">{user.name}</p>
-								<p className="text-black/60 text-sm font-medium">@{user.username}</p>
+								<p className="text-black/60 text-sm font-medium">@{user.name}</p>
 								<p className="text-sm mt-auto">
 									<span className="font-medium">Created:</span>{" "}
 									{new Date(user.createdAt).toLocaleString("en-GB", {

src/components/description.tsx

@@ -63,7 +63,7 @@ export default function Description({ text, className }: Props) {
 								href={`/profile/${id}`}
 								className="inline-flex items-center align-bottom gap-1.5 pr-2 bg-orange-100 border border-orange-400 rounded-lg mx-1 text-orange-800 text-xs"
 							>
-								<ProfilePicture src={linkedProfile.image || "/guest.webp"} width={24} height={24} className="bg-white rounded-lg border-r border-orange-400" />
+								<ProfilePicture src={linkedProfile.image || "/guest.png"} width={24} height={24} className="bg-white rounded-lg border-r border-orange-400" />
 								{linkedProfile.name}
 							</Link>
 						);

src/components/dropzone.tsx

@@ -22,7 +22,7 @@ export default function Dropzone({ onDrop, options, children }: Props) {
 		onDrop: handleDrop,
 		maxFiles: 3,
 		accept: {
-			"image/*": [".png", ".jpg", ".jpeg", ".bmp", ".webp", ".heic"],
+			"image/*": [".png", ".jpg", ".jpeg", ".bmp", ".png", ".heic"],
 		},
 		...options,
 	});

src/components/login-buttons.tsx

@@ -7,7 +7,7 @@ export default function LoginButtons() {
 	return (
 		<div className="flex flex-col items-center gap-2">
 			<button
-				onClick={() => signIn("discord", { redirectTo: "/create-username" })}
+				onClick={() => signIn("discord", { redirectTo: "/" })}
 				aria-label="Login with Discord"
 				className="pill button gap-2 px-3! bg-indigo-400! border-indigo-500! hover:bg-indigo-500!"
 			>
@@ -15,7 +15,7 @@ export default function LoginButtons() {
 				Login with Discord
 			</button>
 			<button
-				onClick={() => signIn("github", { redirectTo: "/create-username" })}
+				onClick={() => signIn("github", { redirectTo: "/" })}
 				aria-label="Login with GitHub"
 				className="pill button gap-2 px-3! bg-zinc-700! border-zinc-800!  hover:bg-zinc-800! text-white"
 			>

src/components/mii/list/index.tsx

@@ -1,3 +1,4 @@
+import { headers } from "next/headers";
 import Link from "next/link";
 
 import { MiiGender, MiiPlatform, Prisma } from "@prisma/client";
@@ -25,7 +26,6 @@ interface Props {
 
 export default async function MiiList({ searchParams, userId, inLikesPage }: Props) {
 	const session = await auth();
-
 	const parsed = searchSchema.safeParse(searchParams);
 	if (!parsed.success) return <h1>{parsed.error.issues[0].message}</h1>;
 
@@ -34,7 +34,7 @@ export default async function MiiList({ searchParams, userId, inLikesPage }: Pro
 	// My Likes page
 	let miiIdsLiked: number[] | undefined = undefined;
 
-	if (inLikesPage && session?.user.id) {
+	if (inLikesPage && session?.user?.id) {
 		const likedMiis = await prisma.like.findMany({
 			where: { userId: Number(session.user.id) },
 			select: { miiId: true },
@@ -69,7 +69,7 @@ export default async function MiiList({ searchParams, userId, inLikesPage }: Pro
 			user: {
 				select: {
 					id: true,
-					username: true,
+					name: true,
 				},
 			},
 		}),
@@ -219,11 +219,11 @@ export default async function MiiList({ searchParams, userId, inLikesPage }: Pro
 
 								{!userId && (
 									<Link href={`/profile/${mii.user?.id}`} className="text-sm text-right overflow-hidden text-ellipsis">
-										@{mii.user?.username}
+										@{mii.user?.name}
 									</Link>
 								)}
 
-								{userId && Number(session?.user.id) == userId && (
+								{userId && Number(session?.user?.id) == userId && (
 									<div className="flex gap-1 text-2xl justify-end text-zinc-400">
 										<Link href={`/edit/${mii.id}`} title="Edit Mii" aria-label="Edit Mii" data-tooltip="Edit">
 											<Icon icon="mdi:pencil" />

src/components/profile-information.tsx

@@ -15,7 +15,7 @@ interface Props {
 export default async function ProfileInformation({ userId, page }: Props) {
 	const session = await auth();
 
-	const id = userId ? userId : Number(session?.user.id);
+	const id = userId ? userId : Number(session?.user?.id);
 	const user = await prisma.user.findUnique({ where: { id } });
 	const likedMiis = await prisma.like.count({ where: { userId: id } });
 
@@ -23,14 +23,14 @@ export default async function ProfileInformation({ userId, page }: Props) {
 
 	const isAdmin = id === Number(process.env.NEXT_PUBLIC_ADMIN_USER_ID);
 	const isContributor = process.env.NEXT_PUBLIC_CONTRIBUTORS_USER_IDS?.split(",").includes(id.toString());
-	const isOwnProfile = Number(session?.user.id) === id;
+	const isOwnProfile = Number(session?.user?.id) === id;
 
 	return (
 		<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-4 flex gap-4 mb-2 max-md:flex-col">
 			<div className="flex w-full gap-4 overflow-x-scroll">
 				{/* Profile picture */}
 				<Link href={`/profile/${user.id}`} className="size-28 aspect-square">
-					<ProfilePicture src={user.image ?? "/guest.webp"} className="rounded-full bg-white border-2 border-orange-400 shadow max-md:self-center" />
+					<ProfilePicture src={user.image ?? "/guest.png"} className="rounded-full bg-white border-2 border-orange-400 shadow max-md:self-center" />
 				</Link>
 				{/* User information */}
 				<div className="flex flex-col w-full relative py-3">
@@ -47,7 +47,7 @@ export default async function ProfileInformation({ userId, page }: Props) {
 							</div>
 						)}
 					</div>
-					<h2 className="text-black/60 text-sm font-semibold wrap-break-word">@{user?.username}</h2>
+					<h2 className="text-black/60 text-sm font-semibold wrap-break-word">ID: {user?.id}</h2>
 
 					<div className="mt-3 text-sm flex gap-8">
 						<h4 title={`${user.createdAt.toLocaleTimeString("en-GB", { timeZone: "UTC" })} UTC`}>

src/components/profile-overview.tsx

@@ -7,15 +7,15 @@ export default async function ProfileOverview() {
 
 	return (
 		<li title="Your profile">
-			<Link href={`/profile/${session?.user.id}`} aria-label="Go to profile" className="pill button gap-2! p-0! h-full max-w-64" data-tooltip="Your Profile">
+			<Link href={`/profile/${session?.user?.id}`} aria-label="Go to profile" className="pill button gap-2! p-0! h-full max-w-64" data-tooltip="Your Profile">
 				<Image
-					src={session?.user?.image ?? "/guest.webp"}
+					src={session?.user?.image ?? "/guest.png"}
 					alt="profile picture"
 					width={40}
 					height={40}
 					className="rounded-full aspect-square object-cover h-full bg-white outline-2 outline-orange-400"
 				/>
-				<span className="pr-4 overflow-hidden whitespace-nowrap text-ellipsis w-full">{session?.user?.username ?? "unknown"}</span>
+				<span className="pr-4 overflow-hidden whitespace-nowrap text-ellipsis w-full">{session?.user?.name ?? "unknown"}</span>
 			</Link>
 		</li>
 	);

src/components/profile-picture.tsx

@@ -7,5 +7,5 @@ export default function ProfilePicture(props: Partial<ImageProps>) {
 	const { src, ...rest } = props;
 	const [imgSrc, setImgSrc] = useState(src);
 
-	return <Image width={128} height={128} {...rest} src={imgSrc || "/guest.webp"} alt={"profile picture"} onError={() => setImgSrc("/guest.webp")} />;
+	return <Image width={128} height={128} {...rest} src={imgSrc || "/guest.png"} alt={"profile picture"} onError={() => setImgSrc("/guest.png")} />;
 }

src/components/profile-settings/index.tsx

@@ -2,9 +2,8 @@
 
 import { useRouter } from "next/navigation";
 import { useState } from "react";
-import dayjs from "dayjs";
 
-import { displayNameSchema, usernameSchema } from "@/lib/schemas";
+import { userNameSchema } from "@/lib/schemas";
 
 import ProfilePictureSettings from "./profile-picture";
 import SubmitDialogButton from "./submit-dialog-button";
@@ -19,14 +18,10 @@ export default function ProfileSettings({ currentDescription }: Props) {
 	const router = useRouter();
 
 	const [description, setDescription] = useState(currentDescription);
-	const [displayName, setDisplayName] = useState("");
+	const [name, setName] = useState("");
-	const [username, setUsername] = useState("");
 
 	const [descriptionChangeError, setDescriptionChangeError] = useState<string | undefined>(undefined);
-	const [displayNameChangeError, setDisplayNameChangeError] = useState<string | undefined>(undefined);
+	const [nameChangeError, setNameChangeError] = useState<string | undefined>(undefined);
-	const [usernameChangeError, setUsernameChangeError] = useState<string | undefined>(undefined);
-
-	const usernameDate = dayjs().add(90, "days");
 
 	const handleSubmitDescriptionChange = async (close: () => void) => {
 		const parsed = z.string().trim().max(256).safeParse(description);
@@ -51,45 +46,22 @@ export default function ProfileSettings({ currentDescription }: Props) {
 		router.refresh();
 	};
 
-	const handleSubmitDisplayNameChange = async (close: () => void) => {
+	const handleSubmitNameChange = async (close: () => void) => {
-		const parsed = displayNameSchema.safeParse(displayName);
+		const parsed = userNameSchema.safeParse(name);
 		if (!parsed.success) {
-			setDisplayNameChangeError(parsed.error.issues[0].message);
+			setNameChangeError(parsed.error.issues[0].message);
 			return;
 		}
 
-		const response = await fetch("/api/auth/display-name", {
+		const response = await fetch("/api/auth/name", {
 			method: "PATCH",
 			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ displayName }),
+			body: JSON.stringify({ name }),
 		});
 
 		if (!response.ok) {
 			const { error } = await response.json();
-			setDisplayNameChangeError(error);
+			setNameChangeError(error);
-			return;
-		}
-
-		close();
-		router.refresh();
-	};
-
-	const handleSubmitUsernameChange = async (close: () => void) => {
-		const parsed = usernameSchema.safeParse(username);
-		if (!parsed.success) {
-			setUsernameChangeError(parsed.error.issues[0].message);
-			return;
-		}
-
-		const response = await fetch("/api/auth/username", {
-			method: "PATCH",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ username }),
-		});
-
-		if (!response.ok) {
-			const { error } = await response.json();
-			setUsernameChangeError(error);
 			return;
 		}
 
@@ -101,7 +73,7 @@ export default function ProfileSettings({ currentDescription }: Props) {
 		<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-4 flex flex-col gap-4">
 			<div>
 				<h2 className="text-2xl font-bold">Profile Settings</h2>
-				<p className="text-sm text-zinc-500">Update your account info, and username.</p>
+				<p className="text-sm text-zinc-500">Update your profile picture, description, name, etc.</p>
 			</div>
 
 			{/* Separator */}
@@ -146,58 +118,21 @@ export default function ProfileSettings({ currentDescription }: Props) {
 			{/* Change Name */}
 			<div className="grid grid-cols-5 gap-4 max-lg:grid-cols-1">
 				<div className="col-span-3">
-					<label className="font-semibold">Change Display Name</label>
+					<label className="font-semibold">Change Name</label>
-					<p className="text-sm text-zinc-500">This is a display name shown on your profile — feel free to change it anytime</p>
+					<p className="text-sm text-zinc-500">This is your name shown on your profile and miis — feel free to change it anytime</p>
 				</div>
 
 				<div className="flex justify-end gap-1 h-min col-span-2">
-					<input type="text" className="pill input flex-1" placeholder="Type here..." value={displayName} onChange={(e) => setDisplayName(e.target.value)} />
+					<input type="text" className="pill input flex-1" placeholder="Type here..." value={name} onChange={(e) => setName(e.target.value)} />
 					<SubmitDialogButton
-						title="Confirm Display Name Change"
+						title="Confirm Name Change"
-						description="Are you sure? This will only be visible on your profile. You can change it again later."
+						description="Are you sure? You can change it again later."
-						error={displayNameChangeError}
+						error={nameChangeError}
-						onSubmit={handleSubmitDisplayNameChange}
+						onSubmit={handleSubmitNameChange}
 					>
 						<div className="bg-orange-100 rounded-xl border-2 border-amber-500 mt-4 px-2 py-1">
-							<p className="font-semibold">New display name:</p>
+							<p className="font-semibold">New name:</p>
-							<p className="indent-4">&apos;{displayName}&apos;</p>
+							<p className="indent-4">&apos;{name}&apos;</p>
-						</div>
-					</SubmitDialogButton>
-				</div>
-			</div>
-
-			{/* Change Username */}
-			<div className="grid grid-cols-5 gap-4 max-lg:grid-cols-1">
-				<div className="col-span-3">
-					<label className="font-semibold">Change Username</label>
-					<p className="text-sm text-zinc-500">Your unique tag on the site. Can only be changed once every 90 days</p>
-				</div>
-
-				<div className="flex justify-end gap-1 col-span-2">
-					<div className="relative flex-1">
-						<input
-							type="text"
-							className="pill input w-full indent-4"
-							placeholder="Type here..."
-							value={username}
-							onChange={(e) => setUsername(e.target.value)}
-						/>
-						<span className="absolute top-1/2 -translate-y-1/2 left-4 select-none">@</span>
-					</div>
-					<SubmitDialogButton
-						title="Confirm Username Change"
-						description="Are you sure? Your username is your unique indentifier and can only be changed every 90 days."
-						error={usernameChangeError}
-						onSubmit={handleSubmitUsernameChange}
-					>
-						<p className="text-sm text-zinc-500 mt-2">
-							After submitting, you can change it again on{" "}
-							{usernameDate.toDate().toLocaleDateString("en-US", { month: "long", day: "numeric", year: "numeric" })}.
-						</p>
-
-						<div className="bg-orange-100 rounded-xl border-2 border-amber-500 mt-4 px-2 py-1">
-							<p className="font-semibold">New username:</p>
-							<p className="indent-4">&apos;@{username}&apos;</p>
 						</div>
 					</SubmitDialogButton>
 				</div>

src/components/profile-settings/profile-picture.tsx

@@ -59,7 +59,7 @@ export default function ProfilePictureSettings() {
 						</p>
 
 						<Image
-							src={newPicture ? URL.createObjectURL(newPicture) : "/guest.webp"}
+							src={newPicture ? URL.createObjectURL(newPicture) : "/guest.png"}
 							alt="new profile picture"
 							width={96}
 							height={96}
@@ -93,7 +93,7 @@ export default function ProfilePictureSettings() {
 						<div className="bg-orange-100 rounded-xl border-2 border-amber-500 mt-4 px-2 py-1 flex items-center">
 							<p className="font-semibold mb-2">New profile picture:</p>
 							<Image
-								src={newPicture ? URL.createObjectURL(newPicture) : "/guest.webp"}
+								src={newPicture ? URL.createObjectURL(newPicture) : "/guest.png"}
 								alt="new profile picture"
 								width={128}
 								height={128}

src/components/report/user-form.tsx

@@ -43,11 +43,8 @@ export default function ReportUserForm({ user }: Props) {
 			<hr className="border-zinc-300" />
 
 			<div className="bg-orange-100 rounded-xl border-2 border-orange-400 flex p-4 gap-4">
-				<ProfilePicture src={user.image ?? "/guest.webp"} width={96} height={96} className="aspect-square rounded-full border-2 border-orange-400" />
+				<ProfilePicture src={user.image ?? "/guest.png"} width={96} height={96} className="aspect-square rounded-full border-2 border-orange-400" />
-				<div className="flex flex-col justify-center">
 				<p className="text-xl font-bold overflow-hidden text-ellipsis">{user.name}</p>
-					<p className="text-sm font-bold overflow-hidden text-ellipsis">@{user.username}</p>
-				</div>
 			</div>
 
 			<div className="w-full grid grid-cols-3 items-center">

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

@@ -90,7 +90,7 @@ export default function EditForm({ mii, likes }: Props) {
 						const response = await fetch(path);
 						const blob = await response.blob();
 
-						return Object.assign(new File([blob], `image${index}.webp`, { type: "image/webp" }), { path });
+						return Object.assign(new File([blob], `image${index}.png`, { type: "image/png" }), { path });
 					}),
 				);
 

src/components/username-form.tsx

@@ -1,46 +0,0 @@
-"use client";
-
-import { useState } from "react";
-import { redirect } from "next/navigation";
-import { usernameSchema } from "@/lib/schemas";
-import SubmitButton from "./submit-button";
-
-export default function UsernameForm() {
-	const [username, setUsername] = useState("");
-	const [error, setError] = useState<string | undefined>(undefined);
-
-	const handleSubmit = async () => {
-		const parsed = usernameSchema.safeParse(username);
-		if (!parsed.success) setError(parsed.error.issues[0].message);
-
-		const response = await fetch("/api/auth/username", {
-			method: "PATCH",
-			headers: { "Content-Type": "application/json" },
-			body: JSON.stringify({ username }),
-		});
-
-		if (!response.ok) {
-			const { error } = await response.json();
-			setError(error);
-			return;
-		}
-
-		redirect("/");
-	};
-
-	return (
-		<form className="flex flex-col items-center">
-			<input
-				type="text"
-				placeholder="Type your username..."
-				value={username}
-				onChange={(e) => setUsername(e.target.value)}
-				required
-				className="pill input w-96 mb-2"
-			/>
-
-			<SubmitButton onClick={handleSubmit} />
-			{error && <p className="text-red-400 font-semibold mt-4">Error: {error}</p>}
-		</form>
-	);
-}

src/lib/auth.ts

@@ -15,7 +15,6 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
 		async session({ session, user }) {
 			if (user) {
 				session.user.id = user.id;
-				session.user.username = user.username;
 				session.user.email = user.email;
 			}
 			return session;

src/lib/images.tsx

@@ -130,10 +130,9 @@ export async function generateMetadataImage(mii: Mii, author: string): Promise<{
 
 	// Load assets concurrently
 	const [miiImage, qrCodeImage, fonts] = await Promise.all([
-		// Read and convert the .webp images to .png (because satori doesn't support it)
+		// Read and convert the images to data URI
-		fs.readFile(path.join(miiUploadsDirectory, "mii.webp")).then((buffer) =>
+		fs.readFile(path.join(miiUploadsDirectory, "mii.png")).then((buffer) =>
 			sharp(buffer)
-				.png()
 				// extend to fix shadow bug on landscape pictures
 				.extend({
 					left: 16,
@@ -144,9 +143,8 @@ export async function generateMetadataImage(mii: Mii, author: string): Promise<{
 				.then((pngBuffer) => `data:image/png;base64,${pngBuffer.toString("base64")}`),
 		),
 		mii.platform === "THREE_DS"
-			? fs.readFile(path.join(miiUploadsDirectory, "qr-code.webp")).then((buffer) =>
+			? fs.readFile(path.join(miiUploadsDirectory, "qr-code.png")).then((buffer) =>
 					sharp(buffer)
-						.png()
 						.toBuffer()
 						.then((pngBuffer) => `data:image/png;base64,${pngBuffer.toString("base64")}`),
 				)
@@ -240,8 +238,6 @@ export async function generateMetadataImage(mii: Mii, author: string): Promise<{
 
 	// Store the file
 	try {
-		// I tried using .webp here but the quality looked awful
-		// but it actually might be well-liked due to the hatred of .webp
 		const fileLocation = path.join(miiUploadsDirectory, "metadata.png");
 		await fs.writeFile(fileLocation, buffer);
 	} catch (error) {

src/lib/rate-limit.ts

@@ -102,7 +102,7 @@ export class RateLimit {
 	async handle(): Promise<NextResponse<object | unknown> | undefined> {
 		const session = await auth();
 		const ip = this.request.headers.get("CF-Connecting-IP") || this.request.headers.get("X-Forwarded-For")?.split(",")[0];
-		const identifier = (session ? session.user.id : ip) ?? "anonymous";
+		const identifier = (session ? session.user?.id : ip) ?? "anonymous";
 
 		this.data = await this.check(identifier);
 

src/lib/schemas.ts

@@ -74,21 +74,13 @@ export const searchSchema = z.object({
 	seed: z.coerce.number({ error: "Seed must be a number" }).int({ error: "Seed must be an integer" }).optional(),
 });
 
-// Account Info
+export const userNameSchema = z
-export const usernameSchema = z
 	.string()
 	.trim()
-	.min(3, "Username must be at least 3 characters long")
+	.min(2, { error: "Name must be at least 2 characters long" })
-	.max(20, "Username cannot be more than 20 characters long")
+	.max(64, { error: "Name cannot be more than 64 characters long" })
-	.regex(/^[a-zA-Z0-9_]+$/, "Username can only contain letters, numbers, and underscores");
-
-export const displayNameSchema = z
-	.string()
-	.trim()
-	.min(2, { error: "Display name must be at least 2 characters long" })
-	.max(64, { error: "Display name cannot be more than 64 characters long" })
 	.regex(/^[a-zA-Z0-9-_. ']+$/, {
-		error: "Display name can only contain letters, numbers, dashes, underscores, apostrophes, and spaces.",
+		error: "Name can only contain letters, numbers, dashes, underscores, apostrophes, and spaces.",
 	});
 
 const colorSchema = z.number().int().min(0).max(107).optional();

src/types.d.ts

@@ -1,18 +1,6 @@
 import { MiiGender, Prisma } from "@prisma/client";
 import { DefaultSession } from "next-auth";
 
-declare module "next-auth" {
-	interface Session {
-		user: {
-			username?: string;
-		} & DefaultSession["user"];
-	}
-
-	interface User {
-		username?: string;
-	}
-}
-
 // All color properties are assumed to be the same 108 colors
 interface SwitchMiiInstructions {
 	head: {