Compare commits

..

No commits in common. "147d005a1419188adca1475d16b10f51f16796cc" and "b8a4808595e5e851abbf53f744437a365ef56477" have entirely different histories.

8 changed files with 22 additions and 37 deletions

View file

@ -6,9 +6,6 @@ REDIS_URL="redis://localhost:6379/0"
# Used for metadata, sitemaps, etc.
NEXT_PUBLIC_BASE_URL=http://localhost:3000
CLOUDFLARE_ZONE_ID=XXXXXXXXXXXXXXXX
CLOUDFLARE_API_TOKEN=XXXXXXXXXXXXXXXX
# Used for error tracking
NEXT_PUBLIC_SENTRY_DSN=""
SENTRY_URL=""

View file

@ -1,2 +0,0 @@
-- AlterTable
ALTER TABLE "miis" ADD COLUMN "in_queue" BOOLEAN NOT NULL DEFAULT false;

View file

@ -76,7 +76,6 @@ model Mii {
description String? @db.VarChar(512)
platform MiiPlatform @default(THREE_DS)
quarantined Boolean @default(false)
in_queue Boolean @default(false)
instructions Json?
gender MiiGender?

View file

@ -123,8 +123,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
}
// Prevent non-admins from quarantining Miis
if (quarantined && session.user?.id?.toString() !== process.env.NEXT_PUBLIC_ADMIN_USER_ID)
return rateLimit.sendResponse({ error: `You're not an admin!` }, 401);
if (quarantined && session.user?.id != process.env.NEXT_PUBLIC_ADMIN_USER_ID) return rateLimit.sendResponse({ error: `You're not an admin!` }, 401);
// Edit Mii in database
const updateData: Prisma.MiiUpdateInput = {};
@ -137,7 +136,7 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
if (instructions !== undefined) updateData.instructions = instructions;
if (images.length > 0) updateData.imageCount = images.length;
if (Object.keys(updateData).length === 0) return rateLimit.sendResponse({ error: "Nothing was changed" }, 400);
if (Object.keys(updateData).length == 0) return rateLimit.sendResponse({ error: "Nothing was changed" }, 400);
const updatedMii = await prisma.mii.update({
where: {
id: miiId,
@ -231,28 +230,15 @@ export async function PATCH(request: NextRequest, { params }: { params: Promise<
}
}
try {
await generateMetadataImage(updatedMii, updatedMii.user.name!);
} catch (error) {
console.error(error);
return rateLimit.sendResponse({ error: `Failed to generate 'metadata' type image for mii ${miiId}` }, 500);
if (description === undefined) {
// If images or description were not changed, regenerate the metadata image
try {
await generateMetadataImage(updatedMii, updatedMii.user.name!);
} catch (error) {
console.error(error);
return rateLimit.sendResponse({ error: `Failed to generate 'metadata' type image for mii ${miiId}` }, 500);
}
}
// Tell Cloudflare to purge cache for the changed pages
fetch(`https://api.cloudflare.com/client/v4/zones/${process.env.CLOUDFLARE_ZONE_ID}/purge_cache`, {
method: "POST",
headers: { Authorization: `Bearer ${process.env.CLOUDFLARE_API_TOKEN}`, "Content-Type": "application/json" },
body: JSON.stringify({
files: [
`${process.env.NEXT_PUBLIC_BASE_URL}/mii/${miiId}`,
`${process.env.NEXT_PUBLIC_BASE_URL}/mii/${miiId}/image?type=mii`,
`${process.env.NEXT_PUBLIC_BASE_URL}/mii/${miiId}/image?type=features`,
],
}),
}).catch((err) => {
console.error("Cloudflare cache purge failed:", err);
Sentry.captureException(err, { extra: { stage: "cloudflare-purge", miiId } });
});
return rateLimit.sendResponse({ success: true });
}

View file

@ -199,8 +199,7 @@ export async function POST(request: NextRequest) {
name,
tags,
description,
gender: gender ?? "MALE",
in_queue: true,
gender: gender ?? "MALE",
// Automatically detect certain information if on 3DS
...(platform === "THREE_DS"

View file

@ -19,7 +19,7 @@ const searchParamsSchema = z.object({
});
export async function GET(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
const rateLimit = new RateLimit(request, 200, "/mii/image");
const rateLimit = new RateLimit(request, 20000, "/mii/image");
const check = await rateLimit.handle();
if (check) return check;

View file

@ -38,8 +38,15 @@ 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 (
if (!value)
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 +57,7 @@ export default async function SubmitPage() {
</Link>
</div>
</div>
);
);
return <SubmitForm />;
}

View file

@ -36,8 +36,7 @@ export default async function MiiList({ searchParams, userId, inLikesPage }: Pro
miiIdsLiked = likedMiis.map((like) => like.miiId);
}
const where: Prisma.MiiWhereInput = {
in_queue: false,
const where: Prisma.MiiWhereInput = {
// Only show liked miis on likes page
...(inLikesPage && miiIdsLiked && { id: { in: miiIdsLiked } }),
// Searching