Compare commits

...

7 commits

Author SHA1 Message Date
7f52773bd9 fix: build errors AGAIN
aefusuhgurg
2026-04-17 01:19:21 +01:00
0c2dcf3192 fix: build errors 2026-04-17 01:14:58 +01:00
b66fbd305a temp disable likes 2026-04-17 01:11:49 +01:00
c72dab1962 refactor: remove random sort 2026-04-17 00:54:13 +01:00
8ebc480233 feat: prisma migration 2026-04-17 00:44:26 +01:00
b00ce4dc3b
Merge pull request #28 from AlexHelo/fix/cloudflare-caching-and-query-performance
Fix Cloudflare RSC caching bug and reduce database load
2026-04-17 00:39:44 +01:00
AlexHelo
8615a4d864 Fix Cloudflare RSC caching bug and reduce database load 2026-04-16 17:28:37 -06:00
13 changed files with 131 additions and 188 deletions

View file

@ -5,6 +5,17 @@ const nextConfig: NextConfig = {
images: {
unoptimized: true,
},
async headers() {
return [
{
// Prevent Cloudflare from serving cached HTML for RSC navigation requests
source: "/:path*",
headers: [
{ key: "Vary", value: "RSC, Next-Router-State-Tree, Next-Router-Prefetch" },
],
},
];
},
};
export default nextConfig;

View file

@ -32,7 +32,6 @@
"react-image-crop": "^11.0.10",
"redis": "^5.11.0",
"satori": "^0.26.0",
"seedrandom": "^3.0.5",
"sharp": "^0.34.5",
"sjcl-with-all": "1.0.8",
"swr": "^2.4.1",
@ -46,7 +45,6 @@
"@types/node": "^25.6.0",
"@types/react": "^19.2.14",
"@types/react-dom": "^19.2.3",
"@types/seedrandom": "^3.0.8",
"@types/sjcl": "^1.0.34",
"eslint": "^10.2.0",
"eslint-config-next": "16.2.3",

View file

@ -71,9 +71,6 @@ importers:
satori:
specifier: ^0.26.0
version: 0.26.0
seedrandom:
specifier: ^3.0.5
version: 3.0.5
sharp:
specifier: ^0.34.5
version: 0.34.5
@ -108,9 +105,6 @@ importers:
'@types/react-dom':
specifier: ^19.2.3
version: 19.2.3(@types/react@19.2.14)
'@types/seedrandom':
specifier: ^3.0.8
version: 3.0.8
'@types/sjcl':
specifier: ^1.0.34
version: 1.0.34
@ -797,9 +791,6 @@ packages:
'@types/react@19.2.14':
resolution: {integrity: sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==}
'@types/seedrandom@3.0.8':
resolution: {integrity: sha512-TY1eezMU2zH2ozQoAFAQFOPpvP15g+ZgSfTZt31AUUH/Rxtnz3H+A/Sv1Snw2/amp//omibc+AEkTaA8KUeOLQ==}
'@types/sjcl@1.0.34':
resolution: {integrity: sha512-bQHEeK5DTQRunIfQeUMgtpPsNNCcZyQ9MJuAfW1I7iN0LDunTc78Fu17STbLMd7KiEY/g2zHVApippa70h6HoQ==}
@ -2252,9 +2243,6 @@ packages:
schema-dts@2.0.0:
resolution: {integrity: sha512-t7NoCy3Rn5GHGx6p7s1qIYK/AeIb8ZxJNR9WUNFkwMv2CiiGZBmqqYWc2FlZVm5ZbiHMY4OvBWhj7QtyrFO2Jw==}
seedrandom@3.0.5:
resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
semver@6.3.1:
resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}
hasBin: true
@ -3111,8 +3099,6 @@ snapshots:
dependencies:
csstype: 3.2.3
'@types/seedrandom@3.0.8': {}
'@types/sjcl@1.0.34': {}
'@types/use-sync-external-store@0.0.6': {}
@ -4701,8 +4687,6 @@ snapshots:
transitivePeerDependencies:
- typescript
seedrandom@3.0.5: {}
semver@6.3.1: {}
semver@7.7.4: {}

View file

@ -0,0 +1,2 @@
-- CreateIndex
CREATE INDEX "miis_in_queue_quarantined_createdAt_idx" ON "miis"("in_queue", "quarantined", "createdAt" DESC);

View file

@ -104,6 +104,7 @@ model Mii {
@@index([gender])
@@index([makeup])
@@index([quarantined, id])
@@index([in_queue, quarantined, createdAt(sort: Desc)])
@@map("miis")
}

View file

@ -6,54 +6,54 @@ import { idSchema } from "@/lib/schemas";
import { RateLimit } from "@/lib/rate-limit";
export async function PATCH(request: NextRequest, { params }: { params: Promise<{ id: string }> }) {
const session = await auth();
if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
// const session = await auth();
// if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
const rateLimit = new RateLimit(request, 100, "/api/mii/like");
const check = await rateLimit.handle();
if (check) return check;
// const rateLimit = new RateLimit(request, 100, "/api/mii/like");
// const check = await rateLimit.handle();
// if (check) return check;
const { id: slugId } = await params;
const parsed = idSchema.safeParse(slugId);
if (!parsed.success) return rateLimit.sendResponse({ error: parsed.error.issues[0].message }, 400);
const miiId = parsed.data;
// const { id: slugId } = await params;
// const parsed = idSchema.safeParse(slugId);
// if (!parsed.success) return rateLimit.sendResponse({ error: parsed.error.issues[0].message }, 400);
// const miiId = parsed.data;
const result = await prisma.$transaction(async (tx) => {
const existingLike = await tx.like.findUnique({
where: {
userId_miiId: {
userId: Number(session.user?.id),
miiId,
},
},
});
// const result = await prisma.$transaction(async (tx) => {
// const existingLike = await tx.like.findUnique({
// where: {
// userId_miiId: {
// userId: Number(session.user?.id),
// miiId,
// },
// },
// });
if (existingLike) {
// Remove the like if it exists
await tx.like.delete({
where: {
userId_miiId: {
userId: Number(session.user?.id),
miiId,
},
},
});
} else {
// Add a like if it doesn't exist
await tx.like.create({
data: {
userId: Number(session.user?.id),
miiId,
},
});
}
// if (existingLike) {
// // Remove the like if it exists
// await tx.like.delete({
// where: {
// userId_miiId: {
// userId: Number(session.user?.id),
// miiId,
// },
// },
// });
// } else {
// // Add a like if it doesn't exist
// await tx.like.create({
// data: {
// userId: Number(session.user?.id),
// miiId,
// },
// });
// }
const likeCount = await tx.like.count({
where: { miiId },
});
// const likeCount = await tx.like.count({
// where: { miiId },
// });
return { liked: !existingLike, count: likeCount };
});
// return { liked: !existingLike, count: likeCount };
// });
return rateLimit.sendResponse({ success: true, liked: result.liked, count: result.count });
return NextResponse.json({ success: false });
}

View file

@ -4,25 +4,26 @@ import { prisma } from "@/lib/prisma";
import { RateLimit } from "@/lib/rate-limit";
export async function GET(request: NextRequest) {
const session = await auth();
if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
// const session = await auth();
// if (!session) return NextResponse.json({ error: "Unauthorized" }, { status: 401 });
const rateLimit = new RateLimit(request, 50, "/api/mii/like_get");
const check = await rateLimit.handle();
if (check) return check;
// const rateLimit = new RateLimit(request, 50, "/api/mii/like_get");
// const check = await rateLimit.handle();
// if (check) return check;
const idsParam = new URL(request.url).searchParams.get("ids");
if (!idsParam) return NextResponse.json({ error: "Missing IDs parameter" }, { status: 400 });
// const idsParam = new URL(request.url).searchParams.get("ids");
// if (!idsParam) return NextResponse.json({ error: "Missing IDs parameter" }, { status: 400 });
const ids = idsParam.split(",").map(Number).filter(Boolean);
if (!ids.length) return NextResponse.json({ error: "No valid IDs provided" }, { status: 400 });
if (ids.length > 100) return NextResponse.json({ error: "Too many IDs, maximum is 100" }, { status: 400 });
// const ids = idsParam.split(",").map(Number).filter(Boolean);
// if (!ids.length) return NextResponse.json({ error: "No valid IDs provided" }, { status: 400 });
// if (ids.length > 100) return NextResponse.json({ error: "Too many IDs, maximum is 100" }, { status: 400 });
const liked = await prisma.like.findMany({
where: { userId: Number(session.user?.id), miiId: { in: ids } },
select: { miiId: true },
});
// const liked = await prisma.like.findMany({
// where: { userId: Number(session.user?.id), miiId: { in: ids } },
// select: { miiId: true },
// });
// Return only Miis that are liked
return NextResponse.json(liked.map((l) => l.miiId));
// // Return only Miis that are liked
// return NextResponse.json(liked.map((l) => l.miiId));
return NextResponse.json({ success: false }, { status: 500 });
}

View file

@ -24,31 +24,31 @@ export default function LikeButton({ likes, isLiked, miiId, disabled, abbreviate
const [isAnimating, setIsAnimating] = useState(false);
const onClick = async () => {
if (disabled) return;
if (!session.data?.user) {
router.push("/login");
return;
}
// if (disabled) return;
// if (!session.data?.user) {
// router.push("/login");
// return;
// }
setIsLikedState(!isLikedState);
setLikesState(isLikedState ? likesState - 1 : likesState + 1);
// setIsLikedState(!isLikedState);
// setLikesState(isLikedState ? likesState - 1 : likesState + 1);
// Trigger animation
if (!isLikedState) {
setIsAnimating(true);
setTimeout(() => setIsAnimating(false), 1000); // match animation duration
}
// // Trigger animation
// if (!isLikedState) {
// setIsAnimating(true);
// setTimeout(() => setIsAnimating(false), 1000); // match animation duration
// }
const response = await fetch(`/api/mii/${miiId}/like`, { method: "PATCH" });
// const response = await fetch(`/api/mii/${miiId}/like`, { method: "PATCH" });
if (response.ok) {
const { liked, count } = await response.json();
setIsLikedState(liked);
setLikesState(count);
} else {
setIsLikedState(isLikedState);
setLikesState(likesState);
}
// if (response.ok) {
// const { liked, count } = await response.json();
// setIsLikedState(liked);
// setLikesState(count);
// } else {
// setIsLikedState(isLikedState);
// setLikesState(likesState);
// }
};
// Preload like button icons
@ -56,9 +56,9 @@ export default function LikeButton({ likes, isLiked, miiId, disabled, abbreviate
loadIcons(["icon-park-solid:like", "icon-park-outline:like"]);
}, []);
useEffect(() => {
setIsLikedState(isLiked);
}, [isLiked]);
// useEffect(() => {
// setIsLikedState(isLiked);
// }, [isLiked]);
return (
<button

View file

@ -1,8 +1,5 @@
import { Prisma } from "@prisma/client";
import crypto from "crypto";
import seedrandom from "seedrandom";
import { searchSchema } from "@/lib/schemas";
import { auth } from "@/lib/auth";
import { prisma } from "@/lib/prisma";
@ -23,7 +20,7 @@ export default async function MiiList({ searchParams, userId, parentPage }: Prop
const parsed = searchSchema.safeParse(searchParams);
if (!parsed.success) return <h1>{parsed.error.issues[0].message}</h1>;
const { q: query, sort, tags, exclude, platform, gender, makeup, allowCopying, quarantined, page = 1, limit = 24, seed } = parsed.data;
const { q: query, sort, tags, exclude, platform, gender, makeup, allowCopying, quarantined, page = 1, limit = 24 } = parsed.data;
// My Likes page
let miiIdsLiked: number[] | undefined = undefined;
@ -108,41 +105,8 @@ export default async function MiiList({ searchParams, userId, parentPage }: Prop
const skip = (page - 1) * limit;
let totalCount: number;
let filteredCount: number;
let miis: Prisma.MiiGetPayload<{ select: typeof select }>[];
if (sort === "random") {
// Get all IDs that match the where conditions
const matchingIds = await prisma.mii.findMany({
where,
select: { id: true },
});
totalCount = matchingIds.length;
filteredCount = Math.max(0, Math.min(limit, totalCount - skip));
if (matchingIds.length === 0) return;
// Use seed for consistent random results
const randomSeed = seed || crypto.randomInt(0, 1_000_000_000);
const rng = seedrandom(randomSeed.toString());
// Randomize all IDs using the Durstenfeld algorithm
for (let i = matchingIds.length - 1; i > 0; i--) {
const j = Math.floor(rng() * (i + 1));
[matchingIds[i], matchingIds[j]] = [matchingIds[j], matchingIds[i]];
}
// Convert to number[] array
const selectedIds = matchingIds.slice(skip, skip + limit).map((i) => i.id);
miis = await prisma.mii.findMany({
where: {
id: { in: selectedIds },
},
select,
});
} else {
// Sorting by likes, newest, or oldest
let orderBy: Prisma.MiiOrderByWithRelationInput[];
@ -155,18 +119,16 @@ export default async function MiiList({ searchParams, userId, parentPage }: Prop
orderBy = [{ createdAt: "desc" }, { name: "asc" }];
}
[totalCount, filteredCount, miis] = await Promise.all([
[totalCount, miis] = await Promise.all([
prisma.mii.count({ where: { ...where, userId } }),
prisma.mii.count({ where, skip, take: limit }),
prisma.mii.findMany({
where,
orderBy,
select,
skip: (page - 1) * limit,
skip,
take: limit,
}),
]);
}
const lastPage = Math.ceil(totalCount / limit);
@ -174,19 +136,8 @@ export default async function MiiList({ searchParams, userId, parentPage }: Prop
<div className="w-full">
<div className="bg-amber-50 border-2 border-amber-500 rounded-2xl shadow-lg p-4 flex justify-between items-center gap-2 mb-2 max-md:flex-col">
<div className="flex items-center gap-2">
{totalCount == filteredCount ? (
<>
<span className="text-2xl font-bold text-amber-900">{totalCount}</span>
<span className="text-lg text-amber-700">{totalCount === 1 ? "Mii" : "Miis"}</span>
</>
) : (
<>
<span className="text-2xl font-bold text-amber-900">{filteredCount}</span>
<span className="text-sm text-amber-700">of</span>
<span className="text-lg font-semibold text-amber-800">{totalCount}</span>
<span className="text-lg text-amber-700">Miis</span>
</>
)}
</div>
<div className="relative flex items-center justify-end gap-2 w-full md:max-w-2/3 max-md:justify-center">

View file

@ -23,12 +23,12 @@ export default function MiiGrid({ miis, userId, parentPage }: Props) {
const session = useSession();
const router = useRouter();
const ids = miis.map((m) => m.id).join(",");
const { data } = useSWR<number[]>(session.data?.user && miis.length > 0 ? `/api/mii/has-liked?ids=${ids}` : null, fetcher, {
revalidateOnFocus: false,
revalidateOnReconnect: false,
});
const likedIds = new Set(data ?? []);
// const ids = miis.map((m) => m.id).join(",");
// const { data } = useSWR<number[]>(session.data?.user && miis.length > 0 ? `/api/mii/has-liked?ids=${ids}` : null, fetcher, {
// revalidateOnFocus: false,
// revalidateOnReconnect: false,
// });
const likedIds = new Set([0]);
return (
<div className="grid grid-cols-4 gap-4 max-lg:grid-cols-3 max-md:grid-cols-2 max-[30rem]:grid-cols-1">

View file

@ -5,9 +5,9 @@ import { useTransition } from "react";
import { useSelect } from "downshift";
import { Icon } from "@iconify/react";
type Sort = "likes" | "newest" | "oldest" | "random";
type Sort = "likes" | "newest" | "oldest";
const items = ["likes", "newest", "oldest", "random"];
const items = ["likes", "newest", "oldest"];
export default function SortSelect() {
const router = useRouter();
@ -26,10 +26,6 @@ export default function SortSelect() {
params.set("page", "1");
params.set("sort", selectedItem);
if (selectedItem == "random") {
params.set("seed", Math.floor(Math.random() * 1_000_000_000).toString());
}
startTransition(() => {
router.push(`?${params.toString()}`, { scroll: false });
});

View file

@ -68,9 +68,10 @@ export class RateLimit {
return { success, limit: this.maxRequests, remaining, expires: expireAt };
} catch (error) {
// Fail open — don't block users when Redis is unreachable
console.error("Rate limit check failed", error);
return {
success: false,
success: true,
limit: this.maxRequests,
remaining: this.maxRequests,
expires: expireAt,

View file

@ -39,7 +39,7 @@ export const idSchema = z.coerce.number({ error: "ID must be a number" }).int({
export const searchSchema = z.object({
q: querySchema.optional(),
sort: z.enum(["likes", "newest", "oldest", "random"], { error: "Sort must be either 'likes', 'newest', 'oldest', or 'random'" }).default("newest"),
sort: z.enum(["likes", "newest", "oldest"], { error: "Sort must be either 'likes', 'newest', or 'oldest'" }).default("newest"),
tags: z
.string()
.optional()
@ -72,8 +72,6 @@ export const searchSchema = z.object({
.max(100, { error: "Limit cannot be more than 100" })
.optional(),
page: z.coerce.number({ error: "Page must be a number" }).int({ error: "Page must be an integer" }).min(1, { error: "Page must be at least 1" }).optional(),
// Random sort
seed: z.coerce.number({ error: "Seed must be a number" }).int({ error: "Seed must be an integer" }).optional(),
});
export const userNameSchema = z