chore(deps): update All dependencies

drizzle/migrations/0020_performance_indexes.sql

@@ -1,12 +0,0 @@
--- 0020_performance_indexes.sql
--- Adds indexes for the hot CMS read paths (shared DB with the Arcturus
--- emulator — additive only, no schema changes to emulator-owned columns).
---
---   users.credits                     → credits leaderboard (ORDER BY credits DESC LIMIT 20)
---   users_currency(type, amount)      → duckets/diamonds leaderboard (WHERE type=? ORDER BY amount DESC LIMIT 20)
---   users_settings.respects_received  → respects leaderboard (ORDER BY respects_received DESC LIMIT 20)
---   camera_web.timestamp              → homepage recent photos (ORDER BY timestamp DESC LIMIT 4)
-CREATE INDEX IF NOT EXISTS `idx_users_credits` ON `users` (`credits`);
-CREATE INDEX IF NOT EXISTS `idx_users_currency_type_amount` ON `users_currency` (`type`, `amount`);
-CREATE INDEX IF NOT EXISTS `idx_users_settings_respects_received` ON `users_settings` (`respects_received`);
-CREATE INDEX IF NOT EXISTS `idx_camera_web_timestamp` ON `camera_web` (`timestamp`);

drizzle/migrations/0021_add_messenger_offline_user_id_index.sql

@@ -1,4 +0,0 @@
--- 0021_add_messenger_offline_user_id_index.sql
--- The /me dashboard counts unread offline messages with
--- `WHERE user_id = ?`; messenger_offline previously had no index there.
-CREATE INDEX IF NOT EXISTS `idx_messenger_offline_user_id` ON `messenger_offline` (`user_id`);

ecosystem.config.cjs

@@ -2,7 +2,7 @@ module.exports = {
   apps: [
     {
       name: "epicnextcms",
-      script: "pnpm",
+      script: "node_modules/next/dist/bin/next",
       args: "start",
       instances: "max",
       exec_mode: "cluster",
@@ -10,7 +10,7 @@ module.exports = {
       max_memory_restart: "1G",
       env: {
         NODE_ENV: "production",
-        PORT: 3002
+        PORT: 3000
       }
     }
   ]

next.config.ts

@@ -52,6 +52,8 @@ const nextConfig: NextConfig = {
 		ignoreBuildErrors: false,
 	},
 
+	// Enable React Compiler for automatic memoization
+
 	// Compress responses with gzip/brotli
 	compress: true,
 
@@ -63,11 +65,6 @@ const nextConfig: NextConfig = {
 		hideLogsAfterAbort: true, // <-- Dit verbergt de prerender bail-out logberichten!
 	},
 
-	// Optimize images served through next/image with sharp → AVIF/WebP.
-	images: {
-		formats: ["image/avif", "image/webp"],
-	},
-
 	// Add caching headers for static assets
 	async headers() {
 		return [

package.json

@@ -7,7 +7,7 @@
 	},
 	"packageManager": "[email protected]",
 	"scripts": {
-		"dev": "next dev",
+		"dev": "next dev --turbo",
 		"build": "next build",
 		"start": "next start",
 		"lint": "biome check .",
@@ -30,7 +30,7 @@
 		"@dnd-kit/core": "6.3.1",
 		"@dnd-kit/sortable": "10.0.0",
 		"@dnd-kit/utilities": "3.2.2",
-		"@hookform/resolvers": "5.9.0",
+		"@hookform/resolvers": "5.8.0",
 		"@next/bundle-analyzer": "16.3.1",
 		"@tanstack/react-virtual": "3.14.9",
 		"class-variance-authority": "0.7.1",

pnpm-lock.yaml

@@ -35,8 +35,8 @@ importers:
         specifier: 3.2.2
         version: 3.2.2([email protected])
       '@hookform/resolvers':
-        specifier: 5.9.0
-        version: 5.9.0(@standard-schema/[email protected])([email protected]([email protected]))([email protected])
+        specifier: 5.8.0
+        version: 5.8.0(@standard-schema/[email protected])([email protected]([email protected]))([email protected])
       '@next/bundle-analyzer':
         specifier: 16.3.1
         version: 16.3.1
@@ -559,8 +559,8 @@ packages:
   '@formatjs/[email protected]':
     resolution: {integrity: sha512-kHEAFOkeJSPNi7c5PaKaRjxcBrJwzzt81ifUu+8uve1EDW/VJl83KsxmqgqNZLzcFEhSliZGvx3+pk/RH0IOmg==}
 
-  '@hookform/resolvers@5.9.0':
-    resolution: {integrity: sha512-8sNo1IklGaONrsKzXjwZJNsPbccAXLXGX//G+VFEcQOviMtbvR8/fM6HWyA0qrjgpOYauwoodda53CQIWOZ7Ag==}
+  '@hookform/resolvers@5.8.0':
+    resolution: {integrity: sha512-2m6GvRLmYYK1Fwt093lGMf7db9l/+8pNuAtwoNkpBntJT4xcA5lNthYGWKViOc3z2SuaPD0HjE81pyXmqc1JyA==}
     peerDependencies:
       '@sinclair/typebox': '>=0.25.24'
       '@standard-schema/spec': ^1.0.0
@@ -578,7 +578,7 @@ packages:
       fluentvalidation-ts: ^3.0.0
       fp-ts: ^2.7.0
       io-ts: ^2.0.0
-      joi: ^17.0.0 || ^18.0.0
+      joi: ^17.0.0
       nope-validator: '>=0.12.0'
       react-hook-form: ^7.55.0
       superstruct: '>=0.12.0'
@@ -3372,7 +3372,7 @@ snapshots:
     dependencies:
       '@formatjs/fast-memoize': 3.1.7
 
-  '@hookform/resolvers@5.9.0(@standard-schema/[email protected])([email protected]([email protected]))([email protected])':
+  '@hookform/resolvers@5.8.0(@standard-schema/[email protected])([email protected]([email protected]))([email protected])':
     dependencies:
       '@standard-schema/utils': 0.3.0
       react-hook-form: 7.85.0([email protected])

pnpm-workspace.yaml

@@ -19,34 +19,21 @@ minimumReleaseAgeExclude:
   - "@biomejs/[email protected]"
   - "@biomejs/[email protected]"
   - "@biomejs/[email protected]"
-  - "@hookform/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "@next/[email protected]"
-  - "@next/[email protected]"
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"
   - "[email protected]"
-  - "[email protected]"
-  - "[email protected]"
   - "[email protected]"
   - "[email protected]"
 

src/actions/admin-ads.ts

@@ -7,6 +7,7 @@ import { redirect } from "next/navigation";
 import { z } from "zod";
 import { requirePermission } from "@/lib/admin/guard";
 import { db, WebsiteAds } from "@/lib/db";
+import { formPositiveBigInt } from "@/lib/form-data";
 import { logger } from "@/lib/logger";
 import { PERMS } from "@/lib/permissions";
 import { adminAction } from "@/lib/safe-action";
@@ -116,3 +117,28 @@ export const deleteAd = adminAction(
 		return actionOk();
 	},
 );
+
+/** Legacy form POST delete — kept for compatibility; prefer client deleteAd action. */
+export async function deleteAdForm(formData: FormData): Promise<void> {
+	const staff = await requirePermission(PERMS.PAGES_EDIT);
+	const id = formPositiveBigInt(formData, "id");
+	if (!id) return;
+
+	try {
+		await db.delete(WebsiteAds).where(eq(WebsiteAds.id, id));
+		await logStaffActivity({
+			staffId: staff.id,
+			action: "ad_delete",
+			description: `Deleted advertisement #${id}`,
+			targetType: "website_ad",
+			targetId: Number(id),
+		});
+	} catch (err) {
+		logger.error("Action failed: deleteAdForm", {
+			action: "deleteAdForm",
+			id: Number(id),
+			error: err instanceof Error ? err.message : "DB error",
+		});
+	}
+	redirect("/admin/ads");
+}

src/actions/auth-precheck.test.ts

@@ -6,14 +6,31 @@ import { captchaConfig, verifyCaptcha } from "@/lib/services/captcha";
 import { siteSettings } from "@/lib/services/site-settings";
 import { precheckLogin } from "./auth-precheck";
 
-const { queryPreparedOne } = vi.hoisted(() => {
-	const queryPreparedOne = vi.fn().mockResolvedValue(null);
-	return { queryPreparedOne };
+const { selectLimit } = vi.hoisted(() => {
+	const selectLimit = vi.fn().mockResolvedValue([]);
+	return { selectLimit };
 });
 
 vi.mock("@/env", () => ({ env: { CONVERT_PASSWORDS: false } }));
 vi.mock("@/lib/auth/password", () => ({ checkLogin: vi.fn() }));
-vi.mock("@/lib/db", () => ({ queryPreparedOne }));
+vi.mock("@/lib/db", () => ({
+	db: {
+		select: vi.fn(() => ({
+			from: vi.fn(() => ({
+				where: vi.fn(() => ({
+					limit: selectLimit,
+				})),
+			})),
+		})),
+	},
+	User: {
+		password: "password",
+		twoFactorConfirmedAt: "twoFactorConfirmedAt",
+		mail: "mail",
+		mailVerified: "mailVerified",
+		username: "username",
+	},
+}));
 vi.mock("@/lib/rate-limit", () => ({ clientIp: vi.fn(), rateLimit: vi.fn() }));
 vi.mock("@/lib/services/captcha", () => ({
 	captchaConfig: vi.fn(),
@@ -29,27 +46,31 @@ beforeEach(() => {
 	vi.mocked(rateLimit).mockResolvedValue({ ok: true });
 	vi.mocked(checkLogin).mockResolvedValue({ valid: true } as never);
 	vi.mocked(captchaConfig).mockResolvedValue({ provider: "none" } as never);
-	queryPreparedOne.mockResolvedValue(null);
+	selectLimit.mockResolvedValue([]);
 });
 
 describe("precheckLogin", () => {
 	it("returns ok for valid login without 2FA", async () => {
-		queryPreparedOne.mockResolvedValue({
-			password: "hash",
-			twoFactorConfirmedAt: null,
-			mail: null,
-			mailVerified: "0",
-		});
+		selectLimit.mockResolvedValue([
+			{
+				password: "hash",
+				twoFactorConfirmedAt: null,
+				mail: null,
+				mailVerified: "0",
+			},
+		]);
 		expect(await precheckLogin("user", "pass")).toBe("ok");
 	});
 
 	it("returns twofactor when 2FA is set up", async () => {
-		queryPreparedOne.mockResolvedValue({
-			password: "hash",
-			twoFactorConfirmedAt: new Date(),
-			mail: null,
-			mailVerified: "0",
-		});
+		selectLimit.mockResolvedValue([
+			{
+				password: "hash",
+				twoFactorConfirmedAt: new Date(),
+				mail: null,
+				mailVerified: "0",
+			},
+		]);
 		expect(await precheckLogin("user", "pass")).toBe("twofactor");
 	});
 
@@ -62,29 +83,33 @@ describe("precheckLogin", () => {
 			provider: "hcaptcha",
 		} as never);
 		vi.mocked(verifyCaptcha).mockResolvedValue(false);
-		queryPreparedOne.mockResolvedValue({
-			password: "hash",
-			twoFactorConfirmedAt: null,
-			mail: null,
-			mailVerified: "0",
-		});
+		selectLimit.mockResolvedValue([
+			{
+				password: "hash",
+				twoFactorConfirmedAt: null,
+				mail: null,
+				mailVerified: "0",
+			},
+		]);
 		expect(await precheckLogin("user", "pass", "bad-token")).toBe("captcha");
 	});
 
 	it("returns invalid when user not found (dummy hash check)", async () => {
-		queryPreparedOne.mockResolvedValue(null);
+		selectLimit.mockResolvedValue([]);
 		const result = await precheckLogin("nonexistent", "pass");
 		expect(result).toBe("invalid");
 		expect(checkLogin).toHaveBeenCalled();
 	});
 
 	it("returns unverified when email verification required", async () => {
-		queryPreparedOne.mockResolvedValue({
-			password: "hash",
-			twoFactorConfirmedAt: null,
-			mail: "[email protected]",
-			mailVerified: "0",
-		});
+		selectLimit.mockResolvedValue([
+			{
+				password: "hash",
+				twoFactorConfirmedAt: null,
+				mail: "[email protected]",
+				mailVerified: "0",
+			},
+		]);
 		vi.mocked(siteSettings.getBool).mockResolvedValue(true);
 		expect(await precheckLogin("user", "pass")).toBe("unverified");
 	});

src/actions/auth-precheck.ts

@@ -1,8 +1,9 @@
 "use server";
 
+import { eq } from "drizzle-orm";
 import { env } from "@/env";
 import { checkLogin } from "@/lib/auth/password";
-import { queryPreparedOne } from "@/lib/db";
+import { db, User } from "@/lib/db";
 import { clientIp, rateLimit } from "@/lib/rate-limit";
 import { captchaConfig, verifyCaptcha } from "@/lib/services/captcha";
 import { siteSettings } from "@/lib/services/site-settings";
@@ -45,17 +46,17 @@ export async function precheckLogin(
 		mailVerified: string;
 	} | null;
 	try {
-		user = await queryPreparedOne<{
-			password: string;
-			twoFactorConfirmedAt: Date | null;
-			mail: string | null;
-			mailVerified: string;
-		}>(
-			`SELECT password, two_factor_confirmed_at AS twoFactorConfirmedAt,
-			        mail, mail_verified AS mailVerified
-			 FROM users WHERE username = ? LIMIT 1`,
-			[u],
-		);
+		const [row] = await db
+			.select({
+				password: User.password,
+				twoFactorConfirmedAt: User.twoFactorConfirmedAt,
+				mail: User.mail,
+				mailVerified: User.mailVerified,
+			})
+			.from(User)
+			.where(eq(User.username, u))
+			.limit(1);
+		user = row ?? null;
 	} catch {
 		return "invalid";
 	}

src/actions/password-reset.ts

@@ -90,10 +90,7 @@ export async function resetPassword(formData: FormData): Promise<void> {
 	if (!error) {
 		try {
 			const [row] = await db
-				.select({
-					token: PasswordReset.token,
-					createdAt: PasswordReset.createdAt,
-				})
+				.select()
 				.from(PasswordReset)
 				.where(eq(PasswordReset.email, email))
 				.limit(1);

src/actions/polls.ts

@@ -166,12 +166,7 @@ export const voteOnPoll = authAction(
 		}
 
 		const [poll] = await db
-			.select({
-				id: WebsitePoll.id,
-				status: WebsitePoll.status,
-				startsAt: WebsitePoll.startsAt,
-				endsAt: WebsitePoll.endsAt,
-			})
+			.select()
 			.from(WebsitePoll)
 			.where(eq(WebsitePoll.id, ctx.data.pollId))
 			.limit(1);
@@ -189,12 +184,7 @@ export const voteOnPoll = authAction(
 		}
 
 		const questions = await db
-			.select({
-				id: WebsitePollQuestion.id,
-				pollId: WebsitePollQuestion.pollId,
-				type: WebsitePollQuestion.type,
-				options: WebsitePollQuestion.options,
-			})
+			.select()
 			.from(WebsitePollQuestion)
 			.where(eq(WebsitePollQuestion.pollId, poll.id));
 

src/actions/register.ts

@@ -52,7 +52,6 @@ export async function register(
 			String(formData.get("look") ?? "")
 				.normalize("NFC")
 				.trim() || DEFAULT_LOOK,
-		termsAccepted: formData.get("terms") === "on",
 	};
 
 	const parsed = registerSchema.safeParse(raw);
@@ -77,10 +76,6 @@ export async function register(
 			return "Captcha verification failed. Please try again.";
 	}
 
-	// Terms acceptance check.
-	if (!raw.termsAccepted)
-		return "You must accept the terms and conditions to register.";
-
 	// VPN/proxy block (only when enabled in /admin/vpn).
 	if ((await checkVpn(ip)).blocked) {
 		return (

src/actions/tickets.ts

@@ -60,10 +60,7 @@ export const adminReplyTicket = adminAction(
 	},
 	async (ctx) => {
 		const [ticket] = await db
-			.select({
-				id: WebsiteTicket.id,
-				assigneeId: WebsiteTicket.assigneeId,
-			})
+			.select()
 			.from(WebsiteTicket)
 			.where(eq(WebsiteTicket.id, ctx.data.ticketId))
 			.limit(1);
@@ -109,11 +106,7 @@ export const updateTicketStatus = adminAction(
 	},
 	async (ctx) => {
 		const [ticket] = await db
-			.select({
-				id: WebsiteTicket.id,
-				assigneeId: WebsiteTicket.assigneeId,
-				status: WebsiteTicket.status,
-			})
+			.select()
 			.from(WebsiteTicket)
 			.where(eq(WebsiteTicket.id, ctx.data.ticketId))
 			.limit(1);
@@ -156,10 +149,7 @@ export const assignTicket = adminAction(
 	},
 	async (ctx) => {
 		const [ticket] = await db
-			.select({
-				id: WebsiteTicket.id,
-				assigneeId: WebsiteTicket.assigneeId,
-			})
+			.select()
 			.from(WebsiteTicket)
 			.where(eq(WebsiteTicket.id, ctx.data.ticketId))
 			.limit(1);
@@ -195,10 +185,7 @@ export const updateTicketPriority = adminAction(
 	},
 	async (ctx) => {
 		const [ticket] = await db
-			.select({
-				id: WebsiteTicket.id,
-				priority: WebsiteTicket.priority,
-			})
+			.select()
 			.from(WebsiteTicket)
 			.where(eq(WebsiteTicket.id, ctx.data.ticketId))
 			.limit(1);

src/app/(site)/leaderboard/page.tsx

@@ -1,4 +1,4 @@
-import { desc, eq } from "drizzle-orm";
+import { desc, eq, inArray } from "drizzle-orm";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState, RankBadge } from "@/components/public/ui";
@@ -7,7 +7,6 @@ import {
 	type CurrencyKind,
 } from "@/components/shared/currency-icon";
 import { UserAvatarThumbnail } from "@/components/shared/user-avatar-thumbnail";
-import { cached } from "@/lib/cache";
 import { db, User, UsersCurrency, UsersSettings } from "@/lib/db";
 
 export const metadata = { title: "Leaderboard" };
@@ -44,17 +43,15 @@ type Row = { username: string; look: string; value: number };
 
 async function loadCreditsRows(): Promise<Row[]> {
 	try {
-		const users = await cached("lb_credits", 60_000, () =>
-			db
-				.select({
-					username: User.username,
-					look: User.look,
-					credits: User.credits,
-				})
-				.from(User)
-				.orderBy(desc(User.credits))
-				.limit(20),
-		);
+		const users = await db
+			.select({
+				username: User.username,
+				look: User.look,
+				credits: User.credits,
+			})
+			.from(User)
+			.orderBy(desc(User.credits))
+			.limit(20);
 		return users.map((u) => ({
 			username: u.username,
 			look: u.look,
@@ -67,19 +64,35 @@ async function loadCreditsRows(): Promise<Row[]> {
 
 async function loadCurrencyRows(type: number): Promise<Row[]> {
 	try {
-		return await cached(`lb_currency_${type}`, 60_000, () =>
-			db
-				.select({
-					username: User.username,
-					look: User.look,
-					value: UsersCurrency.amount,
-				})
-				.from(UsersCurrency)
-				.innerJoin(User, eq(UsersCurrency.userId, User.id))
-				.where(eq(UsersCurrency.type, type))
-				.orderBy(desc(UsersCurrency.amount))
-				.limit(20),
-		);
+		const top = await db
+			.select({
+				userId: UsersCurrency.userId,
+				amount: UsersCurrency.amount,
+			})
+			.from(UsersCurrency)
+			.where(eq(UsersCurrency.type, type))
+			.orderBy(desc(UsersCurrency.amount))
+			.limit(20);
+		if (top.length === 0) return [];
+
+		const users = await db
+			.select({ id: User.id, username: User.username, look: User.look })
+			.from(User)
+			.where(
+				inArray(
+					User.id,
+					top.map((t) => t.userId),
+				),
+			);
+		const byId = new Map(users.map((u) => [u.id, u]));
+
+		return top
+			.map((t) => {
+				const u = byId.get(t.userId);
+				if (!u) return null;
+				return { username: u.username, look: u.look, value: t.amount };
+			})
+			.filter((r): r is Row => r !== null);
 	} catch {
 		return [];
 	}
@@ -90,18 +103,38 @@ async function loadSettingsRows(
 ): Promise<Row[]> {
 	try {
 		const column = UsersSettings[field];
-		return await cached(`lb_settings_${field}`, 60_000, () =>
-			db
-				.select({
-					username: User.username,
-					look: User.look,
-					value: column,
-				})
-				.from(UsersSettings)
-				.innerJoin(User, eq(UsersSettings.userId, User.id))
-				.orderBy(desc(column))
-				.limit(20),
-		);
+		const top = await db
+			.select({
+				userId: UsersSettings.userId,
+				value: column,
+			})
+			.from(UsersSettings)
+			.orderBy(desc(column))
+			.limit(20);
+		if (top.length === 0) return [];
+
+		const users = await db
+			.select({ id: User.id, username: User.username, look: User.look })
+			.from(User)
+			.where(
+				inArray(
+					User.id,
+					top.map((t) => t.userId),
+				),
+			);
+		const byId = new Map(users.map((u) => [u.id, u]));
+
+		return top
+			.map((t) => {
+				const u = byId.get(t.userId);
+				if (!u) return null;
+				return {
+					username: u.username,
+					look: u.look,
+					value: Number(t.value ?? 0),
+				};
+			})
+			.filter((r): r is Row => r !== null);
 	} catch {
 		return [];
 	}

src/app/(site)/me/page.tsx

@@ -18,6 +18,7 @@ import {
 	UsersBadges,
 	UsersSettings,
 	WebsiteLoginLogs,
+	WebsiteSetting,
 } from "@/lib/db";
 import { avatarImageUrl } from "@/lib/format";
 import { resolveHotelName } from "@/lib/hotel-name";
@@ -84,9 +85,9 @@ export default async function MePage({
 		const [
 			userRows,
 			hotelName,
-			neededRaw,
-			rewardAmountRaw,
-			currencySettings,
+			neededRows,
+			amountRows,
+			currencyRows,
 			alertRaw,
 			recentRooms,
 			badges,
@@ -111,12 +112,29 @@ export default async function MePage({
 				.where(eq(User.id, userId))
 				.limit(1),
 			resolveHotelName(),
-			siteSettings.get("referrals_needed", "5"),
-			siteSettings.get("referral_reward_amount", "30"),
-			siteSettings.getMany([
-				"referral_reward_currency_type",
-				"referral_reward_currency",
-			]),
+			db
+				.select({ value: WebsiteSetting.value })
+				.from(WebsiteSetting)
+				.where(eq(WebsiteSetting.key, "referrals_needed"))
+				.limit(1)
+				.catch(() => []),
+			db
+				.select({ value: WebsiteSetting.value })
+				.from(WebsiteSetting)
+				.where(eq(WebsiteSetting.key, "referral_reward_amount"))
+				.limit(1)
+				.catch(() => []),
+			db
+				.select({ value: WebsiteSetting.value })
+				.from(WebsiteSetting)
+				.where(
+					inArray(WebsiteSetting.key, [
+						"referral_reward_currency_type",
+						"referral_reward_currency",
+					]),
+				)
+				.limit(1)
+				.catch(() => []),
 			siteSettings.get("hotel_alert_banner", ""),
 			db
 				.select({
@@ -173,6 +191,9 @@ export default async function MePage({
 		]);
 
 		const user = userRows[0] ?? null;
+		const neededRaw = neededRows[0] ?? null;
+		const amountRaw = amountRows[0] ?? null;
+		const currencyRaw = currencyRows[0] ?? null;
 		const lastWebLogin = lastWebLoginRows[0] ?? null;
 		const userSettings = userSettingsRows[0] ?? null;
 		const friendCount = Number(friendCountRows[0]?.value ?? 0);
@@ -182,13 +203,9 @@ export default async function MePage({
 
 		if (!user) throw new Error("user-not-found");
 
-		const needed = Number.parseInt(neededRaw ?? "5", 10) || 5;
-		const rewardAmount = Number.parseInt(rewardAmountRaw ?? "30", 10) || 0;
-		const rewardCurrency = (
-			currencySettings.referral_reward_currency_type ??
-			currencySettings.referral_reward_currency ??
-			"diamonds"
-		)
+		const needed = Number.parseInt(neededRaw?.value ?? "5", 10) || 5;
+		const rewardAmount = Number.parseInt(amountRaw?.value ?? "30", 10) || 0;
+		const rewardCurrency = (currencyRaw?.value ?? "diamonds")
 			.trim()
 			.toLowerCase();
 

src/app/(site)/news/[...slug]/page.tsx

@@ -228,7 +228,6 @@ export default async function ArticlePage({
 					<img
 						src={article.image}
 						alt=""
-						decoding="async"
 						style={{ width: "100%", borderRadius: 10, margin: "0 0 1rem" }}
 					/>
 				) : null}

src/app/(site)/news/page.tsx

@@ -1,17 +1,28 @@
+import { desc } from "drizzle-orm";
 import Image from "next/image";
 import Link from "next/link";
 import { getTranslations } from "next-intl/server";
 import { ContentCard, EmptyState } from "@/components/public/ui";
+import { db, WebsiteArticles } from "@/lib/db";
 import { excerpt } from "@/lib/format";
 import { formatDate } from "@/lib/format-date";
-import { getNewsList } from "@/lib/services/news-list";
 
 export const metadata = { title: "News" };
 
 export default async function NewsPage() {
 	const t = await getTranslations("pages.news");
 
-	const articles = await getNewsList(30);
+	let articles: (typeof WebsiteArticles.$inferSelect)[] = [];
+	try {
+		articles = await db
+			.select()
+			.from(WebsiteArticles)
+			.orderBy(desc(WebsiteArticles.createdAt))
+			.limit(30);
+	} catch {
+		// DB unavailable — render the empty state rather than a 500.
+		articles = [];
+	}
 
 	return (
 		<main style={{ display: "grid", gap: "1.5rem" }}>
@@ -47,8 +58,8 @@ export default async function NewsPage() {
 											src={a.image}
 											alt=""
 											fill
-											sizes="(max-width: 1024px) 50vw, 300px"
 											style={{ objectFit: "cover" }}
+											unoptimized
 										/>
 									</div>
 								) : (

src/app/(site)/page.tsx

@@ -15,11 +15,10 @@ import { ThemeSwitcher } from "@/components/theme-switcher";
 import { TypewriterText } from "@/components/typewriter-text";
 import { auth } from "@/lib/auth";
 import { cached } from "@/lib/cache";
-import { CameraWeb, db, Rooms, User } from "@/lib/db";
+import { CameraWeb, db, Rooms, User, WebsiteArticles } from "@/lib/db";
 import { formatDate } from "@/lib/format-date";
 import { resolveHotelName } from "@/lib/hotel-name";
 import { captchaConfig } from "@/lib/services/captcha";
-import { getNewsList } from "@/lib/services/news-list";
 import { siteSettings } from "@/lib/services/site-settings";
 
 async function getHotelData() {
@@ -44,40 +43,42 @@ async function getHotelData() {
 				.where(eq(User.online, "1"))
 				.then((rows) => rows[0]?.total ?? 0),
 		).catch(() => 0),
-		cached("total_users", 300_000, () =>
+		cached("total_users", 30_000, () =>
 			db
 				.select({ total: count() })
 				.from(User)
 				.then((rows) => rows[0]?.total ?? 0),
 		).catch(() => 0),
-		cached("total_rooms", 300_000, () =>
+		cached("total_rooms", 30_000, () =>
 			db
 				.select({ total: count() })
 				.from(Rooms)
 				.then((rows) => rows[0]?.total ?? 0),
 		).catch(() => 0),
-		getNewsList(4),
-		cached("home_online_users", 15_000, () =>
-			db
-				.select({ username: User.username, look: User.look })
-				.from(User)
-				.where(eq(User.online, "1"))
-				.limit(30),
-		).catch(() => []),
-		cached("home_recent_photos", 60_000, () =>
-			db
-				.select({ id: CameraWeb.id, url: CameraWeb.url })
-				.from(CameraWeb)
-				.orderBy(desc(CameraWeb.timestamp))
-				.limit(4),
-		).catch(() => []),
-		cached("home_latest_users", 60_000, () =>
-			db
-				.select({ username: User.username, look: User.look })
-				.from(User)
-				.orderBy(desc(User.accountCreated))
-				.limit(8),
-		).catch(() => []),
+		db
+			.select()
+			.from(WebsiteArticles)
+			.orderBy(desc(WebsiteArticles.createdAt))
+			.limit(5)
+			.catch(() => []),
+		db
+			.select({ username: User.username, look: User.look })
+			.from(User)
+			.where(eq(User.online, "1"))
+			.limit(30)
+			.catch(() => []),
+		db
+			.select()
+			.from(CameraWeb)
+			.orderBy(desc(CameraWeb.timestamp))
+			.limit(4)
+			.catch(() => []),
+		db
+			.select({ username: User.username, look: User.look })
+			.from(User)
+			.orderBy(desc(User.accountCreated))
+			.limit(8)
+			.catch(() => []),
 	]);
 
 	return {
@@ -190,18 +191,12 @@ export default async function Home() {
 				<div
 					className="relative overflow-hidden rounded-2xl border"
 					style={{
+						background: `url(/assets/images/next_header.jpg) center/cover no-repeat`,
+						backgroundPosition: "center 20%",
 						borderColor:
 							"color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
 					}}
 				>
-					<Image
-						src="/assets/images/next_header.jpg"
-						alt=""
-						fill
-						priority
-						sizes="100vw"
-						style={{ objectFit: "cover", objectPosition: "center 20%" }}
-					/>
 					<div
 						className="absolute inset-0"
 						style={{
@@ -561,8 +556,8 @@ export default async function Home() {
 													src={a.image}
 													alt={a.title}
 													fill
-													sizes="(max-width: 768px) 100vw, 400px"
 													className="rounded-lg object-cover transition-all duration-300 group-hover:scale-105"
+													unoptimized
 												/>
 												<div className="absolute top-2.5 right-2.5 w-8 h-8 rounded-full flex items-center justify-center bg-black/50 backdrop-blur-sm transition-all duration-300 opacity-0 group-hover:opacity-100 translate-x-1 group-hover:translate-x-0">
 													<span className="text-white text-sm font-bold">

src/app/admin/housekeeping/client.tsx

@@ -81,6 +81,8 @@ interface AuditEntry {
 	action: string;
 	target: string;
 	targetId: number | null;
+	before: unknown;
+	after: unknown;
 	createdAt: string;
 }
 

src/app/admin/import/audit/audit-client.tsx

@@ -86,11 +86,7 @@ interface AuditEvent {
 	sqlCount?: number;
 	applied?: number;
 	sqlFailed?: number;
-	furniData?: {
-		added: number;
-		removedDuplicates: number;
-		removedIdConflicts: number;
-	};
+	furniData?: { added: number; removedDuplicates: number };
 	structure?: {
 		orphanedRemoved: number;
 		orphanedCleaned: number;
@@ -159,7 +155,6 @@ export function AuditClient() {
 	const [applySql, setApplySql] = useState(false);
 	const [repairFurniData, setRepairFurniData] = useState(false);
 	const [repairStructure, setRepairStructure] = useState(false);
-	const [checkFurniDataIds, setCheckFurniDataIds] = useState(false);
 
 	const [issues, setIssues] = useState<AuditIssue[]>([]);
 	const [missingFromSources, setMissingFromSources] = useState<
@@ -179,7 +174,6 @@ export function AuditClient() {
 	const [furniDataResult, setFurniDataResult] = useState<{
 		added: number;
 		removedDuplicates: number;
-		removedIdConflicts: number;
 	} | null>(null);
 	const [structureResult, setStructureResult] = useState<{
 		orphanedRemoved: number;
@@ -228,7 +222,6 @@ export function AuditClient() {
 					applySql,
 					repairFurniData,
 					repairStructure,
-					checkFurniDataIds,
 				}),
 			});
 
@@ -365,7 +358,6 @@ export function AuditClient() {
 		applySql,
 		repairFurniData,
 		repairStructure,
-		checkFurniDataIds,
 	]);
 
 	const errors = issues.filter((i) => i.severity === "error");
@@ -429,13 +421,6 @@ export function AuditClient() {
 					>
 						Repair FurnitureData.json (add missing + dedupe)
 					</AuditCheckbox>
-					<AuditCheckbox
-						checked={checkFurniDataIds}
-						disabled={loading}
-						onChange={setCheckFurniDataIds}
-					>
-						Check FurnitureData.json for spriteId conflicts
-					</AuditCheckbox>
 					<AuditCheckbox
 						checked={repairStructure}
 						disabled={loading}
@@ -680,15 +665,6 @@ export function AuditClient() {
 											</span>
 										</>
 									)}
-									{furniDataResult.removedIdConflicts > 0 && (
-										<>
-											{" · "}
-											<span className="text-[var(--admin-warning)] font-medium">
-												{furniDataResult.removedIdConflicts} spriteId conflicts
-												fixed
-											</span>
-										</>
-									)}
 								</span>
 							</div>
 						)}

src/app/admin/rooms/_lib/load-room.ts

@@ -7,18 +7,7 @@ export async function loadRoom(id: string) {
 	if (Number.isNaN(roomId)) notFound();
 
 	const [room] = await db
-		.select({
-			id: Rooms.id,
-			ownerId: Rooms.ownerId,
-			ownerName: Rooms.ownerName,
-			name: Rooms.name,
-			description: Rooms.description,
-			state: Rooms.state,
-			users: Rooms.users,
-			usersMax: Rooms.usersMax,
-			category: Rooms.category,
-			score: Rooms.score,
-		})
+		.select()
 		.from(Rooms)
 		.where(eq(Rooms.id, roomId))
 		.limit(1);

src/app/admin/settings/cms-settings-config.ts

@@ -269,7 +269,7 @@ export const SETTINGS_GROUPS: SettingsGroup[] = [
 			{
 				key: "captcha_provider",
 				label: "Captcha provider",
-				description: "none | turnstile | recaptcha | hcaptcha",
+				description: "none | turnstile | recaptcha",
 				type: "text",
 				defaultValue: "none",
 			},
@@ -278,11 +278,6 @@ export const SETTINGS_GROUPS: SettingsGroup[] = [
 				label: "Turnstile site key",
 				type: "text",
 			},
-			{
-				key: "hcaptcha_site_key",
-				label: "hCaptcha site key",
-				type: "text",
-			},
 			{
 				key: "recaptcha_site_key",
 				label: "reCAPTCHA site key",

src/app/admin/users/_lib/load-user.ts

@@ -21,24 +21,7 @@ export async function loadUserById(id: string) {
 		numericId > 0 &&
 		String(numericId) === id;
 	const [user] = await db
-		.select({
-			id: User.id,
-			username: User.username,
-			mail: User.mail,
-			gender: User.gender,
-			machineId: User.machineId,
-			twoFactorConfirmedAt: User.twoFactorConfirmedAt,
-			rank: User.rank,
-			online: User.online,
-			motto: User.motto,
-			look: User.look,
-			credits: User.credits,
-			pixels: User.pixels,
-			accountCreated: User.accountCreated,
-			lastLogin: User.lastLogin,
-			ipRegister: User.ipRegister,
-			ipCurrent: User.ipCurrent,
-		})
+		.select()
 		.from(User)
 		.where(isNumeric ? eq(User.id, numericId) : eq(User.username, id))
 		.limit(1);
@@ -57,10 +40,7 @@ export async function loadUserById(id: string) {
 	] = await Promise.all([
 		db.select().from(UsersCurrency).where(eq(UsersCurrency.userId, user.id)),
 		db
-			.select({
-				id: UsersBadges.id,
-				badgeCode: UsersBadges.badgeCode,
-			})
+			.select()
 			.from(UsersBadges)
 			.where(eq(UsersBadges.userId, user.id))
 			.orderBy(asc(UsersBadges.slotId)),

src/app/api/admin/catalog/tree/route.ts

@@ -27,20 +27,7 @@ type PageRow = {
 
 async function getBcTreeFlat(): Promise<TreeNode[]> {
 	const [allPages, itemCounts] = await Promise.all([
-		db
-			.select({
-				id: CatalogPagesBc.id,
-				parentId: CatalogPagesBc.parentId,
-				caption: CatalogPagesBc.caption,
-				pageLayout: CatalogPagesBc.pageLayout,
-				iconColor: CatalogPagesBc.iconColor,
-				iconImage: CatalogPagesBc.iconImage,
-				orderNum: CatalogPagesBc.orderNum,
-				visible: CatalogPagesBc.visible,
-				enabled: CatalogPagesBc.enabled,
-			})
-			.from(CatalogPagesBc)
-			.orderBy(asc(CatalogPagesBc.orderNum)),
+		db.select().from(CatalogPagesBc).orderBy(asc(CatalogPagesBc.orderNum)),
 		db
 			.select({
 				pageId: CatalogItemsBc.pageId,
@@ -121,17 +108,7 @@ async function getChildren(
 
 	if (isBc) {
 		const pages = await db
-			.select({
-				id: CatalogPagesBc.id,
-				parentId: CatalogPagesBc.parentId,
-				caption: CatalogPagesBc.caption,
-				pageLayout: CatalogPagesBc.pageLayout,
-				iconColor: CatalogPagesBc.iconColor,
-				iconImage: CatalogPagesBc.iconImage,
-				orderNum: CatalogPagesBc.orderNum,
-				visible: CatalogPagesBc.visible,
-				enabled: CatalogPagesBc.enabled,
-			})
+			.select()
 			.from(CatalogPagesBc)
 			.where(parentFilterBc)
 			.orderBy(asc(CatalogPagesBc.orderNum));
@@ -186,17 +163,7 @@ async function getChildren(
 	}
 
 	const pages = await db
-		.select({
-			id: CatalogPages.id,
-			parentId: CatalogPages.parentId,
-			caption: CatalogPages.caption,
-			pageLayout: CatalogPages.pageLayout,
-			iconColor: CatalogPages.iconColor,
-			iconImage: CatalogPages.iconImage,
-			orderNum: CatalogPages.orderNum,
-			visible: CatalogPages.visible,
-			enabled: CatalogPages.enabled,
-		})
+		.select()
 		.from(CatalogPages)
 		.where(parentFilter)
 		.orderBy(asc(CatalogPages.orderNum));
@@ -246,17 +213,7 @@ async function searchPages(q: string, isBc: boolean): Promise<TreeNode[]> {
 		const conditions = [like(CatalogPagesBc.caption, `%${needle}%`)];
 		if (idOk) conditions.push(eq(CatalogPagesBc.id, idExact));
 		const pages = await db
-			.select({
-				id: CatalogPagesBc.id,
-				parentId: CatalogPagesBc.parentId,
-				caption: CatalogPagesBc.caption,
-				pageLayout: CatalogPagesBc.pageLayout,
-				iconColor: CatalogPagesBc.iconColor,
-				iconImage: CatalogPagesBc.iconImage,
-				orderNum: CatalogPagesBc.orderNum,
-				visible: CatalogPagesBc.visible,
-				enabled: CatalogPagesBc.enabled,
-			})
+			.select()
 			.from(CatalogPagesBc)
 			.where(or(...conditions))
 			.orderBy(asc(CatalogPagesBc.orderNum))
@@ -283,17 +240,7 @@ async function searchPages(q: string, isBc: boolean): Promise<TreeNode[]> {
 	const conditions = [like(CatalogPages.caption, `%${needle}%`)];
 	if (idOk) conditions.push(eq(CatalogPages.id, idExact));
 	const pages = await db
-		.select({
-			id: CatalogPages.id,
-			parentId: CatalogPages.parentId,
-			caption: CatalogPages.caption,
-			pageLayout: CatalogPages.pageLayout,
-			iconColor: CatalogPages.iconColor,
-			iconImage: CatalogPages.iconImage,
-			orderNum: CatalogPages.orderNum,
-			visible: CatalogPages.visible,
-			enabled: CatalogPages.enabled,
-		})
+		.select()
 		.from(CatalogPages)
 		.where(or(...conditions))
 		.orderBy(asc(CatalogPages.orderNum))

src/app/api/admin/import/audit/route.ts

@@ -18,7 +18,6 @@ export const POST = withAdmin(
 		let applySql = false;
 		let repairFurniData = false;
 		let repairStructure = false;
-		let checkFurniDataIds = false;
 		try {
 			const body = (await request.json().catch(() => ({}))) as {
 				repair?: unknown;
@@ -27,7 +26,6 @@ export const POST = withAdmin(
 				applySql?: unknown;
 				repairFurniData?: unknown;
 				repairStructure?: unknown;
-				checkFurniDataIds?: unknown;
 			};
 			repair = body.repair === true;
 			repairNitros = body.repairNitros === true;
@@ -35,7 +33,6 @@ export const POST = withAdmin(
 			applySql = body.applySql === true;
 			repairFurniData = body.repairFurniData === true;
 			repairStructure = body.repairStructure === true;
-			checkFurniDataIds = body.checkFurniDataIds === true;
 		} catch (err) {
 			logger.warn("Failed to parse audit request body", { err });
 		}
@@ -58,7 +55,6 @@ export const POST = withAdmin(
 						applySql,
 						repairFurniData,
 						repairStructure,
-						checkFurniDataIds,
 					});
 				} catch (err) {
 					send({

src/app/api/admin/import/furni/route.ts

@@ -297,7 +297,6 @@ export const POST = withAdmin(
 						type: item.type ?? "flooritem",
 						revision: item.revision ?? 0,
 						category: item.category ?? "unknown",
-						updateExisting: body.updateExisting === true,
 						sourceSwfBaseUrl: source?.sourceSwfBaseUrl,
 						nitroBaseUrl: source?.nitroBaseUrl || undefined,
 						iconBaseUrl: source?.iconBaseUrl || undefined,
@@ -360,7 +359,6 @@ export const POST = withAdmin(
 			revision,
 			category,
 			sourceId,
-			updateExisting,
 		} = body;
 
 		if (!classname || !name) return apiError("Missing classname or name", 400);
@@ -376,7 +374,6 @@ export const POST = withAdmin(
 			type: type ?? "flooritem",
 			revision: revision ?? 0,
 			category: category ?? "unknown",
-			updateExisting: updateExisting === true,
 			sourceSwfBaseUrl: source?.sourceSwfBaseUrl,
 			nitroBaseUrl: source?.nitroBaseUrl || undefined,
 			iconBaseUrl: source?.iconBaseUrl || undefined,

src/app/api/radio/shouts/route.ts

@@ -13,12 +13,7 @@ const MAX_MESSAGE_LENGTH = 255;
 export async function GET(_req: Request) {
 	try {
 		const shouts = await db
-			.select({
-				id: RadioShouts.id,
-				userId: RadioShouts.userId,
-				message: RadioShouts.message,
-				createdAt: RadioShouts.createdAt,
-			})
+			.select()
 			.from(RadioShouts)
 			.orderBy(desc(RadioShouts.createdAt))
 			.limit(50);

src/app/imaging/route.ts

@@ -1,5 +1,4 @@
 import { type NextRequest, NextResponse } from "next/server";
-import sharp from "sharp";
 import { resolveImagerBase } from "@/lib/imager";
 
 const FIGURE_RE = /^([a-z]{2}-\d+)(\.[a-z]{2}-\d+)*$/i;
@@ -7,19 +6,6 @@ const FIGURE_MAX_LEN = 512;
 const FIGURE_MAX_PARTS = 24;
 const UPSTREAM_TIMEOUT_MS = 10_000;
 
-type AvatarFormat = "png" | "webp" | "avif";
-
-function resolveFormat(raw: string | null): AvatarFormat {
-	switch (raw?.toLowerCase()) {
-		case "webp":
-			return "webp";
-		case "avif":
-			return "avif";
-		default:
-			return "png";
-	}
-}
-
 export async function GET(request: NextRequest) {
 	const { searchParams } = new URL(request.url);
 
@@ -80,8 +66,6 @@ export async function GET(request: NextRequest) {
 	const imgFormat = searchParams.get("img_format");
 	if (imgFormat) params.set("img_format", imgFormat);
 
-	const format = resolveFormat(searchParams.get("format"));
-
 	const upstream = resolveImagerBase();
 	const upstreamUrl = `${upstream}?${params.toString()}`;
 
@@ -101,35 +85,15 @@ export async function GET(request: NextRequest) {
 			);
 		}
 
-		const buffer = Buffer.from(await res.arrayBuffer());
+		const buffer = await res.arrayBuffer();
+		const contentType = res.headers.get("content-type") || "image/png";
 
-		// Re-encode PNG avatars to WebP/AVIF with sharp to cut bandwidth.
-		// Falls back to the original PNG if conversion fails.
-		let body: Uint8Array = new Uint8Array(buffer);
-		let contentType = res.headers.get("content-type") || "image/png";
-		if (format !== "png") {
-			try {
-				if (format === "webp") {
-					body = new Uint8Array(await sharp(buffer).webp().toBuffer());
-					contentType = "image/webp";
-				} else {
-					body = new Uint8Array(await sharp(buffer).avif().toBuffer());
-					contentType = "image/avif";
-				}
-			} catch {
-				body = new Uint8Array(buffer);
-				contentType = res.headers.get("content-type") || "image/png";
-			}
-		}
-
-		return new NextResponse(body as unknown as BodyInit, {
+		return new NextResponse(buffer, {
 			status: 200,
 			headers: {
 				"Content-Type": contentType,
-				"Content-Length": String(body.length),
 				// s-maxage lets Cloudflare/edge cache avatars (currently DYNAMIC),
 				// stale-while-revalidate keeps them fresh without blocking requests.
-				// The ?format= param is part of the URL, so variants cache separately.
 				"Cache-Control":
 					"public, max-age=3600, s-maxage=86400, stale-while-revalidate=86400",
 				"Access-Control-Allow-Origin": "*",

src/components/auth/register-form.tsx

@@ -282,7 +282,7 @@ export function RegisterForm({
 
 				{/* Terms */}
 				<div
-					className="rounded-xl p-4 flex gap-4"
+					className="rounded-xl p-4 flex flex-col gap-3"
 					style={{
 						backgroundColor:
 							"color-mix(in srgb, var(--color-background) 50%, var(--color-surface))",
@@ -290,7 +290,7 @@ export function RegisterForm({
 							"1px solid color-mix(in srgb, var(--color-text-muted) 8%, transparent)",
 					}}
 				>
-					<div className="flex items-center gap-2">
+					<div className="flex items-center gap-3 text-sm">
 						<input
 							type="checkbox"
 							id="terms"
@@ -301,7 +301,8 @@ export function RegisterForm({
 						/>
 						<label
 							htmlFor="terms"
-							className="font-medium text-sm text-[var(--color-text-readable)]"
+							className="font-semibold cursor-pointer select-none"
+							style={{ color: "var(--color-text-readable)" }}
 							onClick={() => setTermsAccepted(!termsAccepted)}
 							onKeyDown={(e) => {
 								if (e.key === "Enter" || e.key === " ") {
@@ -313,9 +314,6 @@ export function RegisterForm({
 							{t("termsAccept", { hotel: hotelName })}
 						</label>
 					</div>
-					<p className="text-xs text-[var(--color-text-muted)]">
-						* Required for account creation
-					</p>
 				</div>
 
 				{/* Captcha */}
@@ -325,9 +323,6 @@ export function RegisterForm({
 				{showCaptcha && captcha.provider === "recaptcha" && (
 					<div className="g-recaptcha" data-sitekey={captcha.siteKey} />
 				)}
-				{showCaptcha && captcha.provider === "hcaptcha" && (
-					<div className="h-captcha" data-sitekey={captcha.siteKey} />
-				)}
 
 				{/* Submit */}
 				<button

src/db/schema.ts

@@ -76,8 +76,6 @@ export const User = mysqlTable("users", {
 	homeRoom: int("home_room").notNull().default(0),
 	secretKey: varchar("secret_key", { length: 40 }),
 	pincode: varchar("pincode", { length: 11 }),
-	termsAccepted: boolean("terms_accepted").notNull().default(false),
-	ageVerified: boolean("age_verified").notNull().default(false),
 	extraRank: int("extra_rank"),
 	twoFactorSecret: text("two_factor_secret"),
 	twoFactorRecoveryCodes: text("two_factor_recovery_codes"),
@@ -391,20 +389,6 @@ export const LogsShopPurchases = mysqlTable("logs_shop_purchases", {
 	amount: int("amount"),
 });
 
-export const LogsFurniImports = mysqlTable("logs_furni_imports", {
-	id: int("id", { unsigned: true }).autoincrement().primaryKey().notNull(),
-	timestamp: int("timestamp", { unsigned: true }).notNull(),
-	userId: int("user_id").notNull(),
-	batch: tinyint("batch").notNull().default(0),
-	totalItems: int("total_items").notNull().default(0),
-	succeeded: int("succeeded").notNull().default(0),
-	failed: int("failed").notNull().default(0),
-	details: text("details").notNull(),
-	rolledBack: tinyint("rolled_back").notNull().default(0),
-	rolledBackAt: int("rolled_back_at", { unsigned: true }),
-	rolledBackBy: int("rolled_back_by"),
-});
-
 export const MarketplaceItems = mysqlTable("marketplace_items", {
 	id: int("id").autoincrement().primaryKey().notNull(),
 	itemId: int("item_id").notNull(),

src/lib/cache.ts

@@ -5,11 +5,6 @@ import { redis } from "@/lib/redis";
 type CacheEntry<T> = { data: T; expiresAt: number };
 const memory = new Map<string, CacheEntry<unknown>>();
 
-/** Drop a key from the in-process cache (used when an upstream value changes). */
-export function invalidateMemory(key: string): void {
-	memory.delete(key);
-}
-
 /**
  * Redis-first cached query with an in-memory fallback.
  * Use for read-heavy endpoints polled by the browser (online count, etc.).
@@ -21,29 +16,24 @@ export async function cached<T>(
 ): Promise<T> {
 	const ttlSec = Math.ceil(ttlMs / 1000);
 
-	// In-memory fast path — served first so repeated reads within a TTL window
-	// don't each pay a Redis round-trip (Redis is still the shared fallback).
-	// `existing &&` short-circuits so Date.now() is never evaluated during
-	// prerender when the map is empty (keeps `next build` prerendering clean).
-	const existing = memory.get(key);
-	if (existing && existing.expiresAt > Date.now()) {
-		return existing.data as T;
-	}
-
 	// Redis path (shared across instances).
 	if (redis && redis.status !== "end") {
 		try {
 			const cached = await redis.get(key);
 			if (cached !== null && cached !== undefined) {
-				const data = JSON.parse(cached) as T;
-				memory.set(key, { data, expiresAt: Date.now() + ttlMs });
-				return data;
+				return JSON.parse(cached) as T;
 			}
 		} catch {
-			/* fall through to fn */
+			/* fall through to DB / memory */
 		}
 	}
 
+	// In-memory fallback (single-instance fast path).
+	const existing = memory.get(key);
+	if (existing && existing.expiresAt > Date.now()) {
+		return existing.data as T;
+	}
+
 	const data = await fn();
 
 	if (redis && redis.status !== "end") {

src/lib/cached-db.ts

@@ -1,32 +1,52 @@
 import "server-only";
 
-import { cached, invalidateMemory } from "@/lib/cache";
+import { logger } from "@/lib/logger";
 import { redis } from "@/lib/redis";
 
 const DEFAULT_CACHE_TTL = 60;
 
-/**
- * Redis-backed cached query with an in-process fast path (see `cached()`).
- * Use for read-heavy lookups that are safe to serve slightly stale
- * (login user, article bodies, …). Redis stays the shared source of truth.
- */
+function isRedisAvailable(): boolean {
+	return !!redis && redis.status !== "end";
+}
+
 export async function cachedQuery<T>(
 	cacheKey: string,
 	queryFn: () => Promise<T>,
 	ttl: number = DEFAULT_CACHE_TTL,
 ): Promise<T> {
-	return cached(cacheKey, ttl * 1000, queryFn);
+	if (!isRedisAvailable()) {
+		return queryFn();
+	}
+
+	try {
+		const cached = await redis?.get(cacheKey);
+		if (cached !== null && cached !== undefined) {
+			return JSON.parse(cached) as T;
+		}
+	} catch (err) {
+		logger.warn("[cache] read failed, falling back to DB", {
+			key: cacheKey,
+			error: String(err),
+		});
+	}
+
+	const result = await queryFn();
+
+	try {
+		await redis?.setex(cacheKey, ttl, JSON.stringify(result));
+	} catch (err) {
+		logger.warn("[cache] write failed, continuing without cache", {
+			key: cacheKey,
+			error: String(err),
+		});
+	}
+
+	return result;
 }
 
-/** Invalidate a single cache key immediately (memory + Redis). */
+/** Invalidate a single cache key immediately. */
 export async function invalidateKey(key: string): Promise<number> {
-	invalidateMemory(key);
-	if (redis && redis.status !== "end") {
-		try {
-			return await redis.del(key);
-		} catch {
-			return 0;
-		}
-	}
-	return 0;
+	if (!isRedisAvailable()) return 0;
+	if (!redis) return 0;
+	return redis.del(key);
 }

src/lib/db.ts

@@ -1,5 +1,4 @@
-import { drizzle } from "drizzle-orm/mysql2";
-import type { Pool as MySqlPool } from "mysql2/promise";
+import { drizzle, type MySql2Database } from "drizzle-orm/mysql2";
 import mysql from "mysql2/promise";
 import * as relations from "@/db/relations";
 import * as schema from "@/db/schema";
@@ -9,10 +8,10 @@ import { resolveConnectionLimit } from "@/lib/db-pool";
 const fullSchema = { ...schema, ...relations };
 
 const globalForDb = globalThis as unknown as {
-	db?: ReturnType<typeof createDb>;
+	db?: MySql2Database<typeof fullSchema>;
 };
 
-function createDb() {
+function createDb(): MySql2Database<typeof fullSchema> {
 	const url = new URL(env.DATABASE_URL);
 	const isBuild =
 		process.env.NEXT_PHASE === "phase-production-build" ||
@@ -36,6 +35,11 @@ function createDb() {
 		connectTimeout,
 		idleTimeout: env.DATABASE_IDLE_TIMEOUT_MS,
 		enableKeepAlive: true,
+		// Prepared-statement caching via mysql2's native support (Node 22+).
+		// Saves query-parse per request on hot paths.
+		...("cache" in mysql.createPool && {
+			cache: { type: "prepared" },
+		}),
 		// Allow :placeholder syntax for raw SQL helpers.
 		namedPlaceholders: true,
 		// Reject multiple statements (SQL injection hardening).
@@ -61,37 +65,6 @@ export const db = globalForDb.db ?? createDb();
 
 if (env.NODE_ENV !== "production") globalForDb.db = db;
 
-export type Db = ReturnType<typeof createDb>;
-
-type PreparedValue = string | number | bigint | boolean | Date | null | Buffer;
-
-/**
- * Server-side prepared statements (mysql2 pool.execute()).
- *
- * Drizzle's mysql2 driver runs `.select()` through the text protocol
- * (pool.query()), so it never uses server-side prepared statements. For
- * hot-path queries the SQL is parsed once on the server per connection
- * instead of every execution. Column aliases let you pick exactly the
- * columns you need (no SELECT *).
- */
-export async function queryPrepared<T extends Record<string, unknown>>(
-	sql: string,
-	params?: PreparedValue[],
-): Promise<T[]> {
-	const client = db.$client as MySqlPool;
-	const [rows] = (await client.execute(sql, params)) as unknown as [
-		T[],
-		unknown,
-	];
-	return rows ?? [];
-}
-
-export async function queryPreparedOne<T extends Record<string, unknown>>(
-	sql: string,
-	params?: PreparedValue[],
-): Promise<T | null> {
-	const rows = await queryPrepared<T>(sql, params);
-	return rows[0] ?? null;
-}
+export type Db = MySql2Database<typeof fullSchema>;
 
 export * from "@/db/schema";

src/lib/redis-cache.ts

@@ -1,17 +1,36 @@
 import "server-only";
 
-import { cached } from "@/lib/cache";
+import { redis } from "@/lib/redis";
 
 /**
- * Cache the result of a fetch function, memory-first with a Redis fallback
- * (see `cached()`). TTL is given in seconds.
+ * Cache the result of a fetch function in Redis.
+ * Falls back to the fresh fetch if Redis is unavailable.
  */
 export async function redisCache<T>(
 	key: string,
 	ttlSeconds: number,
 	fetch: () => Promise<T>,
 ): Promise<T> {
-	return cached(key, ttlSeconds * 1000, fetch);
+	if (!redis) return fetch();
+
+	try {
+		const cached = await redis.get(key);
+		if (cached !== null) {
+			return JSON.parse(cached) as T;
+		}
+	} catch {
+		// cache miss or error — fall through to fresh fetch
+	}
+
+	const fresh = await fetch();
+
+	try {
+		await redis.setex(key, ttlSeconds, JSON.stringify(fresh));
+	} catch {
+		// ignore write errors
+	}
+
+	return fresh;
 }
 
 /**

src/lib/services/audit.ts

@@ -87,15 +87,7 @@ export async function getAuditLogs(options: GetLogsOptions = {}) {
 
 	const [rows, totalResult] = await Promise.all([
 		db
-			.select({
-				id: AdminAuditLog.id,
-				userId: AdminAuditLog.userId,
-				action: AdminAuditLog.action,
-				target: AdminAuditLog.target,
-				targetId: AdminAuditLog.targetId,
-				diff: AdminAuditLog.diff,
-				createdAt: AdminAuditLog.createdAt,
-			})
+			.select()
 			.from(AdminAuditLog)
 			.where(where)
 			.orderBy(desc(AdminAuditLog.id))

src/lib/services/captcha.ts

@@ -2,8 +2,8 @@ import { siteSettings } from "@/lib/services/site-settings";
 
 /**
  * Server-side CAPTCHA verification, driven by website_settings so staff pick the
- * provider in housekeeping. Supports Cloudflare Turnstile, Google reCAPTCHA,
- * and hCaptcha (three AtomCMS offers, mutually exclusive).
+ * provider in housekeeping. Supports Cloudflare Turnstile and Google reCAPTCHA
+ * (the two AtomCMS offers, mutually exclusive).
  *
  * Behaviour:
  *   - provider "none" (or unset) → fail-open (allow)
@@ -11,13 +11,12 @@ import { siteSettings } from "@/lib/services/site-settings";
  *     API error, or network failure → fail-closed (deny)
  *
  * Settings keys:
- *   captcha_provider   = "turnstile" | "recaptcha" | "hcaptcha" | "none" (default none)
+ *   captcha_provider   = "turnstile" | "recaptcha" | "none" (default none)
  *   turnstile_secret / turnstile_site_key
  *   recaptcha_secret  / recaptcha_site_key
- *   hcaptcha_secret   / hcaptcha_site_key
  */
 export interface CaptchaConfig {
-	provider: "turnstile" | "recaptcha" | "hcaptcha" | "none";
+	provider: "turnstile" | "recaptcha" | "none";
 	siteKey: string;
 	/** Form field the widget writes the token into. */
 	field: string;
@@ -26,7 +25,6 @@ export interface CaptchaConfig {
 const TURNSTILE_URL =
 	"https://challenges.cloudflare.com/turnstile/v0/siteverify";
 const RECAPTCHA_URL = "https://www.google.com/recaptcha/api/siteverify";
-const HCAPTCHA_URL = "https://hcaptcha.com/siteverify";
 
 /** Public config the register/login pages need to render the widget (no secrets). */
 export async function captchaConfig(): Promise<CaptchaConfig> {
@@ -47,13 +45,6 @@ export async function captchaConfig(): Promise<CaptchaConfig> {
 			field: "g-recaptcha-response",
 		};
 	}
-	if (provider === "hcaptcha") {
-		return {
-			provider: "hcaptcha",
-			siteKey: (await siteSettings.get("hcaptcha_site_key", "")) ?? "",
-			field: "hcaptcha-response",
-		};
-	}
 	return { provider: "none", siteKey: "", field: "" };
 }
 
@@ -67,22 +58,13 @@ export async function verifyCaptcha(
 
 	if (!cfg.siteKey) return false;
 
-	const secretKey: string =
-		cfg.provider === "turnstile"
-			? "turnstile_secret"
-			: cfg.provider === "recaptcha"
-				? "recaptcha_secret"
-				: "hcaptcha_secret";
+	const secretKey =
+		cfg.provider === "turnstile" ? "turnstile_secret" : "recaptcha_secret";
 	const secret = (await siteSettings.get(secretKey, "")) ?? "";
 	if (!secret) return false;
 	if (!token) return false;
 
-	const url: string =
-		cfg.provider === "turnstile"
-			? TURNSTILE_URL
-			: cfg.provider === "recaptcha"
-				? RECAPTCHA_URL
-				: HCAPTCHA_URL;
+	const url = cfg.provider === "turnstile" ? TURNSTILE_URL : RECAPTCHA_URL;
 	const body = new URLSearchParams({ secret, response: token });
 	if (remoteIp) body.set("remoteip", remoteIp);
 

src/lib/services/catalog-audit.ts

@@ -16,7 +16,6 @@ import {
 	repairFurniData,
 	repairOrphanedCatalog,
 } from "./catalog-repair";
-import { readFurniData } from "./furni-data";
 import { ensureDirectories } from "./furni-import";
 import {
 	assetNameCandidates,
@@ -56,11 +55,7 @@ export interface AuditEvent {
 	sqlCount?: number;
 	applied?: number;
 	sqlFailed?: number;
-	furniData?: {
-		added: number;
-		removedDuplicates: number;
-		removedIdConflicts: number;
-	};
+	furniData?: { added: number; removedDuplicates: number };
 	structure?: {
 		orphanedRemoved: number;
 		orphanedCleaned: number;
@@ -123,7 +118,6 @@ export interface AuditSummary {
 	duplicatesMerged: number;
 	duplicateRowsRemoved: number;
 	remappedReferences: number;
-	furniDataIdConflicts: number;
 }
 
 export interface CatalogAuditOptions {
@@ -134,7 +128,6 @@ export interface CatalogAuditOptions {
 	organizeSql?: boolean;
 	repairFurniData?: boolean;
 	repairStructure?: boolean;
-	checkFurniDataIds?: boolean;
 }
 
 export async function runCatalogAudit(
@@ -719,7 +712,6 @@ export async function runCatalogAudit(
 				furniData: {
 					added: result.added,
 					removedDuplicates: result.removedDuplicates,
-					removedIdConflicts: result.removedIdConflicts,
 				},
 			});
 		} catch (err) {
@@ -730,60 +722,6 @@ export async function runCatalogAudit(
 		}
 	}
 
-	// ── FurnitureData.json id conflict check ──────────────
-	let furniDataIdConflicts: {
-		classname: string;
-		itemId: number;
-		conflictingId: number;
-		existingClassname: string;
-	}[] = [];
-	if (options?.checkFurniDataIds) {
-		onEvent?.({
-			type: "progress",
-			message: "Checking FurnitureData.json for spriteId conflicts…",
-		});
-		try {
-			const furniData = (await readFurniData()) as Record<
-				string,
-				{ furnitype: Array<Record<string, unknown>> }
-			>;
-			// Build map of id → classname from both sections
-			const idToClassname = new Map<number, string>();
-			for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
-				for (const e of furniData[section]?.furnitype ?? []) {
-					const id = Number(e?.id);
-					const classname = typeof e?.classname === "string" ? e.classname : "";
-					if (!Number.isFinite(id) || id <= 0 || !classname) continue;
-					const existing = idToClassname.get(id);
-					if (existing && existing !== classname) {
-						// Conflict: same id used by different classname
-						furniDataIdConflicts.push({
-							classname,
-							itemId: id,
-							conflictingId: id,
-							existingClassname: existing,
-						});
-					} else if (!existing) {
-						idToClassname.set(id, classname);
-					}
-				}
-			}
-			// Remove duplicates (same classname + id pair counted once)
-			const seen = new Set<string>();
-			furniDataIdConflicts = furniDataIdConflicts.filter((c) => {
-				const key = `${c.classname}:${c.conflictingId}`;
-				if (seen.has(key)) return false;
-				seen.add(key);
-				return true;
-			});
-		} catch (err) {
-			onEvent?.({
-				type: "error",
-				message: `FurnitureData id check failed: ${(err as Error).message}`,
-			});
-		}
-	}
-
 	onEvent?.({ type: "progress", message: "Comparing with clone sources…" });
 
 	const sources = await listSources();
@@ -873,7 +811,6 @@ export async function runCatalogAudit(
 		duplicatesMerged,
 		duplicateRowsRemoved,
 		remappedReferences,
-		furniDataIdConflicts: furniDataIdConflicts.length,
 	};
 
 	onEvent?.({

src/lib/services/catalog-repair.ts

@@ -620,7 +620,6 @@ export async function repairDuplicateClassnames(): Promise<DuplicateClassnameRes
 export interface FurniDataRepairResult {
 	added: number;
 	removedDuplicates: number;
-	removedIdConflicts: number;
 }
 
 function buildMinimalFurniEntry(item: {
@@ -659,8 +658,7 @@ function buildMinimalFurniEntry(item: {
 
 /**
  * Add FurnitureData.json entries for items_base rows that are missing from the
- * file, remove duplicate classnames, and resolve spriteId conflicts
- * (keeping the first classname per id, removing conflicting ones).
+ * file, and remove duplicate classnames (keeping the first occurrence).
  */
 export async function repairFurniData(
 	items: Array<{
@@ -670,8 +668,7 @@ export async function repairFurniData(
 		type: string;
 	}>,
 ): Promise<FurniDataRepairResult> {
-	if (items.length === 0)
-		return { added: 0, removedDuplicates: 0, removedIdConflicts: 0 };
+	if (items.length === 0) return { added: 0, removedDuplicates: 0 };
 
 	return withFurniDataLock(async () => {
 		const furniData = (await readFurniData()) as Record<
@@ -700,33 +697,7 @@ export async function repairFurniData(
 			}
 		}
 
-		// 2) Resolve spriteId conflicts (same id used by different classnames) — keep first, remove others.
-		let removedIdConflicts = 0;
-		for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
-			const sec = furniData[section];
-			if (!sec?.furnitype) continue;
-			const idToClassname = new Map<number, string>();
-			const deduped = sec.furnitype.filter((e) => {
-				const id = Number(e?.id);
-				const classname = typeof e.classname === "string" ? e.classname : "";
-				if (!Number.isFinite(id) || id <= 0 || !classname) return true;
-				const existing = idToClassname.get(id);
-				if (existing && existing !== classname) {
-					// Conflict: same id used by different classname — keep first, remove this
-					removedIdConflicts++;
-					return false;
-				}
-				if (!existing) {
-					idToClassname.set(id, classname);
-				}
-				return true;
-			});
-			if (deduped.length !== sec.furnitype.length) {
-				furniData[section].furnitype = deduped;
-			}
-		}
-
-		// 3) Add entries for items_base rows missing from the file.
+		// 2) Add entries for items_base rows missing from the file.
 		const existing = new Set<string>();
 		for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
 			for (const e of furniData[section]?.furnitype ?? []) {
@@ -743,8 +714,8 @@ export async function repairFurniData(
 			});
 		}
 
-		// 4) Write once if anything changed.
-		if (removedDuplicates > 0 || removedIdConflicts > 0 || added.length > 0) {
+		// 3) Write once if anything changed.
+		if (removedDuplicates > 0 || added.length > 0) {
 			for (const { entry, itemType } of added) {
 				const sectionKey = itemType === "i" ? "wallitemtypes" : "roomitemtypes";
 				if (!furniData[sectionKey]) {
@@ -754,6 +725,6 @@ export async function repairFurniData(
 			}
 			await writeFurniData(furniData as Record<string, unknown>);
 		}
-		return { added: added.length, removedDuplicates, removedIdConflicts };
+		return { added: added.length, removedDuplicates };
 	});
 }

src/lib/services/catalog-tree.ts

@@ -60,17 +60,7 @@ export async function getCatalogItemCounts(
  */
 export async function getTreeFlat(): Promise<TreeNode[]> {
 	const allPages = await db
-		.select({
-			id: CatalogPages.id,
-			parentId: CatalogPages.parentId,
-			caption: CatalogPages.caption,
-			pageLayout: CatalogPages.pageLayout,
-			iconColor: CatalogPages.iconColor,
-			iconImage: CatalogPages.iconImage,
-			orderNum: CatalogPages.orderNum,
-			visible: CatalogPages.visible,
-			enabled: CatalogPages.enabled,
-		})
+		.select()
 		.from(CatalogPages)
 		.orderBy(asc(CatalogPages.orderNum));
 	const itemCountMap = await getCatalogItemCounts();

src/lib/services/furni-data.ts

@@ -106,77 +106,6 @@ async function acquireDiskLock(lockPath: string): Promise<void> {
 	}
 }
 
-/** Build a map of sprite id → classname from both sections of the furnidata.
- *  If multiple entries share the same id, the first encountered classname wins. */
-function furniDataIdOwners(
-	data: Record<string, { furnitype: Array<Record<string, unknown>> }>,
-): Map<number, string> {
-	const owners = new Map<number, string>();
-	for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
-		for (const e of data[section]?.furnitype ?? []) {
-			const id = Number(e?.id);
-			if (!Number.isFinite(id) || id <= 0) continue;
-			const classname = typeof e?.classname === "string" ? e.classname : "";
-			if (!classname) continue;
-			if (!owners.has(id)) owners.set(id, classname);
-		}
-	}
-	return owners;
-}
-
-/** Assert that no entry in `entries` has a spriteId already used by a different classname
- *  in the existing furnidata or within this batch.  Throws if a conflict is found. */
-function assertNoFurniDataIdConflicts(
-	existingOwners: Map<number, string>,
-	entries: Array<{ entry: Record<string, unknown>; itemType: string }>,
-): void {
-	const conflicts: string[] = [];
-	for (const { entry } of entries) {
-		const id = Number(entry?.id);
-		if (!Number.isFinite(id) || id <= 0) continue;
-		const classname =
-			typeof entry?.classname === "string" ? entry.classname : "";
-		const existing = existingOwners.get(id);
-		if (existing !== undefined && existing !== classname) {
-			conflicts.push(
-				`spriteId ${id} already used by "${existing}" in FurnitureData.json ` +
-					`(attempted "${classname}")`,
-			);
-			continue;
-		}
-		// reserve the id within this batch so a second entry with the same id + different classname
-		// is also caught (even though the file hasn't been written yet).
-		existingOwners.set(id, classname);
-	}
-	if (conflicts.length > 0) {
-		throw new Error(
-			`FurnitureData spriteId conflicts: ${conflicts.join("; ")}`,
-		);
-	}
-}
-
-/** Check if a spriteId is already used by a different classname in the local
- *  FurnitureData.json. Returns the existing classname if there's a conflict,
- *  or null if the spriteId is free or the file couldn't be read. */
-export async function findFurniDataIdConflict(
-	spriteId: number,
-	classname: string,
-): Promise<string | null> {
-	try {
-		const furniData = await readFurniData();
-		const owners = furniDataIdOwners(
-			furniData as Record<
-				string,
-				{ furnitype: Array<Record<string, unknown>> }
-			>,
-		);
-		const existing = owners.get(spriteId);
-		return existing !== undefined && existing !== classname ? existing : null;
-	} catch {
-		return null; // if file missing/unreadable, treat as no conflict
-	}
-}
-
 export async function withFurniDataLock<T>(fn: () => Promise<T>): Promise<T> {
 	let release!: () => void;
 	const acquired = new Promise<void>((r) => {
@@ -299,11 +228,6 @@ export async function appendFurniEntry(
 			string,
 			{ furnitype: Array<Record<string, unknown>> }
 		>;
-
-		// Guard: ensure the spriteId is not already used by a different classname in the file.
-		const existingOwners = furniDataIdOwners(furniData);
-		assertNoFurniDataIdConflicts(existingOwners, [{ entry, itemType }]);
-
 		if (itemType === "i") {
 			if (!furniData.wallitemtypes) furniData.wallitemtypes = { furnitype: [] };
 			upsertEntryInSection(furniData.wallitemtypes, entry);
@@ -407,17 +331,6 @@ export async function appendFurniEntriesBatch(
 			string,
 			{ furnitype: unknown[] }
 		>;
-
-		// Guard: ensure no spriteId conflicts with existing file entries
-		// or within this batch (same id + different classname).
-		const existingOwners = furniDataIdOwners(
-			furniData as Record<
-				string,
-				{ furnitype: Array<Record<string, unknown>> }
-			>,
-		);
-		assertNoFurniDataIdConflicts(existingOwners, entries);
-
 		for (const { entry, itemType } of entries) {
 			if (itemType === "i") {
 				if (!furniData.wallitemtypes)

src/lib/services/furni-import.test.ts

@@ -11,7 +11,6 @@ vi.mock("@/lib/services/furni-data", () => ({
 	appendFurniEntry: vi.fn(),
 	buildFurniEntry: vi.fn(),
 	removeFurniEntry: vi.fn(),
-	findFurniDataIdConflict: vi.fn(),
 }));
 
 vi.mock("@/lib/services/habbo-furnidata-cache", () => ({

src/lib/services/furni-import.ts

@@ -1,7 +1,7 @@
 import { existsSync, promises as fs } from "node:fs";
 import path from "node:path";
 import { and, eq, type SQL, sql } from "drizzle-orm";
-import { CatalogPages, db, ItemsBase, LogsFurniImports } from "@/lib/db";
+import { CatalogPages, db, ItemsBase } from "@/lib/db";
 import { officialHabboEnrichmentWarning } from "@/lib/habbo-gamedata-hotel";
 import { logger } from "@/lib/logger";
 import {
@@ -14,7 +14,6 @@ import {
 import {
 	appendFurniEntry,
 	buildFurniEntry,
-	findFurniDataIdConflict,
 	removeFurniEntry,
 } from "@/lib/services/furni-data";
 import {
@@ -424,7 +423,6 @@ export async function importSingleFurni(params: {
 	revision: number;
 	category: string;
 	skipFurniDataWrite?: boolean;
-	updateExisting?: boolean;
 	onProgress?: (status: string) => void;
 	/** Per-source SWF download base URL (e.g. "https://virtualc.nl/dcr"). */
 	sourceSwfBaseUrl?: string;
@@ -441,7 +439,6 @@ export async function importSingleFurni(params: {
 		revision,
 		category,
 		skipFurniDataWrite,
-		updateExisting,
 		onProgress,
 		sourceSwfBaseUrl,
 		nitroBaseUrl: sourceNitroBaseUrl,
@@ -456,38 +453,22 @@ export async function importSingleFurni(params: {
 		.where(eq(ItemsBase.itemName, classname))
 		.limit(1);
 	if (existsByName) {
-		if (!updateExisting) {
-			return {
-				ok: false,
-				warnings,
-				error: `Item "${classname}" already exists (id: ${existsByName.id})`,
-			};
-		}
-		// Update existing item - fall through to update logic
+		return {
+			ok: false,
+			warnings,
+			error: `Item "${classname}" already exists (id: ${existsByName.id})`,
+		};
 	}
 	const [existsById] = await db
 		.select({ itemName: ItemsBase.itemName })
 		.from(ItemsBase)
 		.where(eq(ItemsBase.id, originalId))
 		.limit(1);
-	if (existsById && (!existsByName || existsById.itemName !== classname)) {
-		if (!updateExisting) {
-			return {
-				ok: false,
-				warnings,
-				error: `spriteId ${originalId} already used by "${existsById.itemName}"`,
-			};
-		}
-		// Update existing item - fall through to update logic
-	}
-
-	// ── Check if spriteId already used in FurnitureData.json ──
-	const takenBy = await findFurniDataIdConflict(originalId, classname);
-	if (takenBy && !updateExisting) {
+	if (existsById) {
 		return {
 			ok: false,
 			warnings,
-			error: `spriteId ${originalId} already used by "${takenBy}" in FurnitureData.json`,
+			error: `spriteId ${originalId} already used by "${existsById.itemName}"`,
 		};
 	}
 
@@ -832,7 +813,6 @@ export async function importSingleFurni(params: {
 
 	// ── Create catalog entry (with duplicate check + category sub-page) ──
 	let catalogItemId: number | null = null;
-	let catalogUpdated = false;
 	try {
 		const itemIdStr = String(spriteId);
 
@@ -843,28 +823,9 @@ export async function importSingleFurni(params: {
 
 		if (existingCatalog.length > 0) {
 			catalogItemId = existingCatalog[0].id;
-			if (updateExisting) {
-				// Update existing catalog entry: price, page, etc.
-				const categoryPageId = await getOrCreateCategoryPage(
-					classname,
-					itemType,
-				);
-				const pageIdStr = String(categoryPageId);
-				const price = autoPriceFurni(classname);
-				await db.execute(sql`
-          UPDATE catalog_items
-          SET page_id = ${pageIdStr}, cost_credits = ${price.credits}, cost_points = ${price.points}, points_type = ${price.pointsType}
-          WHERE id = ${catalogItemId}
-        `);
-				catalogUpdated = true;
-				warnings.push(
-					`Item updated in catalog (catalog_item #${catalogItemId}, page ${categoryPageId})`,
-				);
-			} else {
-				warnings.push(
-					`Item already in catalog (catalog_item #${catalogItemId}, page ${existingCatalog[0].page_id}) — skipped duplicate`,
-				);
-			}
+			warnings.push(
+				`Item already in catalog (catalog_item #${catalogItemId}, page ${existingCatalog[0].page_id}) — skipped duplicate`,
+			);
 		} else {
 			// Get or create the right category sub-page based on classname
 			const categoryPageId = await getOrCreateCategoryPage(classname, itemType);
@@ -889,7 +850,6 @@ export async function importSingleFurni(params: {
 		ok: true,
 		itemId: spriteId,
 		catalogItemId,
-		catalogUpdated,
 		dimensions: dims,
 		spriteCount: conversionResult?.spriteCount,
 		warnings,
@@ -1027,182 +987,3 @@ export async function cleanupConvertedSwfs(): Promise<{
 		errors,
 	};
 }
-
-/** Rollback a furni import by import log ID. Returns { ok, rolledBack: number, errors: string[] }. */
-export async function rollbackFurniImport(
-	importId: number,
-	rolledBackBy: number,
-): Promise<{
-	ok: boolean;
-	rolledBack: number;
-	errors: string[];
-}> {
-	const errors: string[] = [];
-	let rolledBack = 0;
-
-	// Get the import log
-	const [importLog] = await db
-		.select()
-		.from(LogsFurniImports)
-		.where(eq(LogsFurniImports.id, importId))
-		.limit(1);
-
-	if (!importLog) {
-		return {
-			ok: false,
-			rolledBack: 0,
-			errors: [`Import log ${importId} not found`],
-		};
-	}
-
-	if (importLog.rolledBack) {
-		return {
-			ok: false,
-			rolledBack: 0,
-			errors: [
-				`Import ${importId} already rolled back at ${importLog.rolledBackAt}`,
-			],
-		};
-	}
-
-	let details: {
-		items?: Array<{
-			classname: string;
-			spriteId: number;
-			baseClassname?: string;
-			iconFileName?: string;
-		}>;
-	} = {};
-	try {
-		details = JSON.parse(importLog.details);
-	} catch {
-		return {
-			ok: false,
-			rolledBack: 0,
-			errors: ["Invalid import details JSON"],
-		};
-	}
-
-	if (!details.items || !Array.isArray(details.items)) {
-		return { ok: false, rolledBack: 0, errors: ["No items to rollback"] };
-	}
-
-	const assetTargets = await getFurniAssetWriteTargets();
-	const { swfDir, iconDir, nitroDir } = assetTargets;
-
-	for (const item of details.items) {
-		const { classname, spriteId: _spriteId, baseClassname } = item;
-		const base = baseClassname || classname.split("*")[0] || classname;
-
-		const errorsForItem: string[] = [];
-
-		// 1. Delete from catalog_items
-		try {
-			await db.execute(
-				sql`DELETE FROM catalog_items WHERE item_ids = ${String(item.spriteId)} AND catalog_name = ${item.classname}`,
-			);
-		} catch (err) {
-			errorsForItem.push(`catalog_items: ${(err as Error).message}`);
-		}
-
-		// 2. Delete from items_base
-		try {
-			await db.execute(
-				sql`DELETE FROM items_base WHERE id = ${item.spriteId} AND item_name = ${item.classname}`,
-			);
-		} catch (err) {
-			errorsForItem.push(`items_base: ${(err as Error).message}`);
-		}
-
-		// 3. Remove from FurnitureData.json
-		try {
-			const { readFurniData, writeFurniData } = await import(
-				"@/lib/services/furni-data"
-			);
-			const furniData = (await readFurniData()) as {
-				roomitemtypes?: { furnitype?: Array<{ classname?: string }> };
-				wallitemtypes?: { furnitype?: Array<{ classname?: string }> };
-			};
-
-			let changed = false;
-			for (const section of ["roomitemtypes", "wallitemtypes"] as const) {
-				const sec = furniData[section] as
-					| { furnitype: Array<{ classname?: string }> }
-					| undefined;
-				if (!sec) continue;
-				const furnitype = sec.furnitype ?? [];
-				const filtered = furnitype.filter(
-					(e) =>
-						typeof e.classname !== "string" || e.classname !== item.classname,
-				);
-				if (filtered.length !== furnitype.length) {
-					(
-						furniData[section] as { furnitype: Array<{ classname?: string }> }
-					).furnitype = filtered;
-					changed = true;
-				}
-			}
-			if (changed) {
-				await writeFurniData(furniData as Record<string, unknown>);
-			}
-		} catch (err) {
-			errorsForItem.push(`FurnitureData.json: ${(err as Error).message}`);
-		}
-
-		// 4. Delete asset files
-		const filesToDelete = [
-			path.join(nitroDir, `${base}.nitro`),
-			path.join(swfDir, `${base}.swf`),
-			path.join(iconDir, `${classname.replace(/\*/g, "_")}_icon.png`),
-		];
-
-		for (const filePath of filesToDelete) {
-			if (existsSync(filePath)) {
-				try {
-					await fs.unlink(filePath);
-				} catch (err) {
-					errorsForItem.push(
-						`delete ${path.basename(filePath)}: ${(err as Error).message}`,
-					);
-				}
-			}
-		}
-
-		// Mirror directories
-		for (const dirs of assetTargets.mirrorDirs) {
-			for (const filePath of [
-				path.join(dirs.nitroDir, `${classname.split("*")[0]}.nitro`),
-				path.join(dirs.swfDir, `${classname.split("*")[0]}.swf`),
-				path.join(dirs.iconDir, `${classname.replace(/\*/g, "_")}_icon.png`),
-			]) {
-				if (existsSync(filePath)) {
-					try {
-						await fs.unlink(filePath);
-					} catch {
-						/* ignore */
-					}
-				}
-			}
-		}
-
-		if (errorsForItem.length === 0) {
-			rolledBack++;
-		} else {
-			errors.push(`${item.classname}: ${errorsForItem.join(", ")}`);
-		}
-	}
-
-	// Mark as rolled back
-	if (rolledBack > 0) {
-		await db
-			.update(LogsFurniImports)
-			.set({
-				rolledBack: 1,
-				rolledBackAt: Math.floor(Date.now() / 1000),
-				rolledBackBy,
-			})
-			.where(eq(LogsFurniImports.id, importId));
-	}
-
-	return { ok: errors.length === 0, rolledBack, errors };
-}

src/lib/services/news-list.ts

@@ -1,57 +0,0 @@
-import "server-only";
-
-import { desc } from "drizzle-orm";
-import { cached } from "@/lib/cache";
-import { db, WebsiteArticles } from "@/lib/db";
-
-export interface NewsListItem {
-	slug: string;
-	title: string;
-	shortStory: string;
-	image: string;
-	createdAt: Date | null;
-}
-
-interface NewsListRow {
-	slug: string;
-	title: string;
-	shortStory: string;
-	image: string;
-	createdAt: Date | null;
-}
-
-const TTL_MS = 300_000;
-const CACHE_KEY = "news_list";
-const FETCH_LIMIT = 30;
-
-/**
- * Shared, cached news list used by both the homepage and the news archive so
- * a single "news_list" cache entry serves both routes. Returns at most
- * `limit` rows with `createdAt` normalized to a Date (the cache round-trip
- * serializes timestamps to ISO strings).
- */
-export async function getNewsList(limit: number): Promise<NewsListItem[]> {
-	try {
-		const rows = await cached<NewsListRow[]>(CACHE_KEY, TTL_MS, () =>
-			db
-				.select({
-					slug: WebsiteArticles.slug,
-					title: WebsiteArticles.title,
-					shortStory: WebsiteArticles.shortStory,
-					image: WebsiteArticles.image,
-					createdAt: WebsiteArticles.createdAt,
-				})
-				.from(WebsiteArticles)
-				.orderBy(desc(WebsiteArticles.createdAt))
-				.limit(FETCH_LIMIT),
-		);
-		return rows
-			.map((a) => ({
-				...a,
-				createdAt: a.createdAt ? new Date(a.createdAt) : null,
-			}))
-			.slice(0, limit);
-	} catch {
-		return [];
-	}
-}

src/lib/services/radio.ts

@@ -27,21 +27,6 @@ export interface NowPlaying {
 	artist: string | null;
 }
 
-// Shared in-process poll cache: every connected SSE client (players, widgets)
-// would otherwise hit the radio API once per 10s each. With one cache entry per
-// endpoint, N connections cost 1 request per interval regardless of N.
-const POLL_CACHE_TTL_MS = 10_000;
-const pollCache = new Map<string, { data: unknown; expiresAt: number }>();
-
-async function cachedFetchJson(url: string, ms = 4000): Promise<unknown> {
-	const now = Date.now();
-	const hit = pollCache.get(url);
-	if (hit && hit.expiresAt > now) return hit.data;
-	const data = await fetchJson(url, ms);
-	pollCache.set(url, { data, expiresAt: now + POLL_CACHE_TTL_MS });
-	return data;
-}
-
 async function fetchJson(url: string, ms = 4000): Promise<unknown> {
 	if (!isSafeUrl(url)) return null;
 	const controller = new AbortController();
@@ -103,13 +88,13 @@ function parseNowPlaying(d: unknown): NowPlaying | null {
 export async function fetchNowPlaying(): Promise<NowPlaying | null> {
 	const url = (await siteSettings.get("radio_now_playing_api_url", "")) ?? "";
 	if (!url) return null;
-	return parseNowPlaying(await cachedFetchJson(url));
+	return parseNowPlaying(await fetchJson(url));
 }
 
 export async function fetchListeners(): Promise<number | null> {
 	const url = (await siteSettings.get("radio_listeners_api_url", "")) ?? "";
 	if (!url) return null;
-	const d = await cachedFetchJson(url);
+	const d = await fetchJson(url);
 	if (d == null) return null;
 	const obj = d as { listeners?: unknown; current_listeners?: unknown };
 	const raw =

src/lib/services/site-settings.ts

@@ -15,20 +15,9 @@ const DEFAULTS: Record<string, string> = {
 
 const CACHE_TTL_MS = 300_000;
 const REDIS_CACHE_KEY = "site_settings";
-// Short in-process window so repeated getters in one request (header, nav,
-// footer all read hotel_name / logo) don't each pay a Redis round-trip.
-// Redis stays the source of truth across instances.
-const MEMORY_TTL_MS = 60_000;
-
-// During `next build`, pages are prerendered and `Date.now()` is treated as an
-// unstable prerender value — always serve the in-process cache then (settings
-// cannot change mid-build). Runtime keeps the normal TTL check.
-const IS_PRERENDER =
-	process.env.NEXT_PHASE === "phase-production-build" ||
-	process.env.NEXT_PHASE === "phase-production-compile";
 
 class SiteSettings {
-	private cache: { map: Map<string, string>; expiresAt: number } | null = null;
+	private cache: Map<string, string> | null = null;
 
 	private async loadFromDb(): Promise<Map<string, string>> {
 		try {
@@ -43,31 +32,22 @@ class SiteSettings {
 	}
 
 	private async load(): Promise<Map<string, string>> {
-		if (this.cache !== null) {
-			if (IS_PRERENDER || this.cache.expiresAt > Date.now()) {
-				return this.cache.map;
-			}
-		}
-
 		if (redis) {
 			try {
 				const cached = await redis.get(REDIS_CACHE_KEY);
 				if (cached) {
 					const parsed = JSON.parse(cached) as Record<string, string>;
-					const map = new Map(Object.entries(parsed));
-					this.cache = { map, expiresAt: Date.now() + MEMORY_TTL_MS };
-					return map;
+					return new Map(Object.entries(parsed));
 				}
 			} catch {
 				logger.warn("Redis cache read failed for site settings");
 			}
 		}
 
-		// Expired but usable fallback — keeps the site up if both Redis and DB fail.
-		if (this.cache !== null) return this.cache.map;
+		if (this.cache !== null) return this.cache;
 
 		const map = await this.loadFromDb();
-		this.cache = { map, expiresAt: Date.now() + MEMORY_TTL_MS };
+		this.cache = map;
 
 		if (redis) {
 			try {

src/messages/nl.json

@@ -29,7 +29,7 @@
 	"header": {
 		"online": "{count} {hotel} online",
 		"nitroClient": "Nitro client",
-		"tagline": "Een online virtuele wereld waar je je eigen avatar kunt maken, vrienden kunt maken, kunt chatten, kamers kunt maken en nog veel meer! Leeftijdsvereiste: 18+",
+		"tagline": "Een online virtuele wereld waar je je eigen avatar kunt maken, vrienden kunt maken, kunt chatten, kamers kunt maken en nog veel meer!",
 		"login": "Inloggen",
 		"or": "Of",
 		"createAccount": "Account aanmaken"
@@ -919,7 +919,6 @@
 			"passwordError": "Wachtwoord moet minimaal 6 tekens bevatten.",
 			"confirmPasswordError": "Wachtwoorden komen niet overeen.",
 			"termsRequired": "Je moet de voorwaarden & regels accepteren.",
-			"ageVerified": "Ik ben 18+ en ga akkoord met de leeftijdsvereiste.",
 			"usernameRequired": "Gebruikersnaam is verplicht.",
 			"emailRequired": "E-mail is verplicht.",
 			"passwordRequired": "Wachtwoord is verplicht.",

src/types/furni.ts

@@ -93,7 +93,6 @@ export interface ImportSingleResult {
 	ok: boolean;
 	itemId?: number;
 	catalogItemId?: number | null;
-	catalogUpdated?: boolean;
 	dimensions?: { x: number; y: number; z: number };
 	spriteCount?: number;
 	warnings: string[];

vitest.config.ts

@@ -18,7 +18,6 @@ export default defineConfig({
 		// Modules under test transitively import @/env; skip its strict parse so
 		// unit tests run without a populated .env.
 		env: { SKIP_ENV_VALIDATION: "1" },
-		testTimeout: 10000,
 		exclude: ["e2e/**", "node_modules/**", ".next/**", ".next.prev/**"],
 		coverage: {
 			enabled: true,