Revert "Merge pull request 'Complete Housekeeping migration and /ase cutover' (#52) from codex/housekeeping-complete into main"

This reverts commit 488b6e57c4, reversing
changes made to b506b4499a.

src/actions/admin-ip.ts

@@ -1,60 +1,72 @@
 "use server";
 
+import { eq } from "drizzle-orm";
 import { revalidatePath } from "next/cache";
-import {
-	createPeopleMutationInvocation,
-	peopleMutationService,
-} from "@/features/housekeeping/domains/people/services/mutations";
-import { createCorrelationId } from "@/features/housekeeping/foundation/contracts";
 import { requirePermission } from "@/lib/admin/guard";
-import { formPositiveBigInt } from "@/lib/form-data";
+import { db, WebsiteIpBlacklist, WebsiteIpWhitelist } from "@/lib/db";
 import { PERMS } from "@/lib/permissions";
 
-function parse(formData: FormData, key: string): string {
-	return String(formData.get(key) ?? "")
+function parseIp(formData: FormData): string {
+	return String(formData.get("ipAddress") ?? "")
 		.normalize("NFC")
 		.trim()
 		.slice(0, 255);
 }
 
-async function run(
-	formData: FormData,
-	action:
-		| "add-whitelist"
-		| "delete-whitelist"
-		| "add-blacklist"
-		| "delete-blacklist",
-): Promise<void> {
-	const staff = await requirePermission(PERMS.SETTINGS_EDIT);
-	const adding = action.startsWith("add-");
-	const rawId = adding ? null : formPositiveBigInt(formData, "id");
-	const input = adding
-		? {
-				action,
-				ipAddress: parse(formData, "ipAddress"),
-				asn: parse(formData, "asn"),
-			}
-		: { action, id: rawId?.toString() ?? "" };
-	if (adding && !("ipAddress" in input && input.ipAddress)) return;
-	if (!adding && !rawId) return;
-	const result = await peopleMutationService.execute(
-		createPeopleMutationInvocation(staff, createCorrelationId()),
-		"ip.action",
-		input,
-	);
-	if (!result.ok) throw new Error("Could not update IP rules");
-	revalidatePath("/ase/people/moderation/ip");
+function parseAsn(formData: FormData): string | null {
+	const asn = String(formData.get("asn") ?? "")
+		.normalize("NFC")
+		.trim()
+		.slice(0, 255);
+	return asn || null;
 }
 
 export async function addWhitelist(formData: FormData): Promise<void> {
-	return run(formData, "add-whitelist");
+	await requirePermission(PERMS.SETTINGS_EDIT);
+	const ipAddress = parseIp(formData);
+	if (!ipAddress) return;
+	const asn = parseAsn(formData);
+	await db.insert(WebsiteIpWhitelist).values({
+		ipAddress,
+		asn,
+		whitelistAsn: asn != null,
+	});
+	revalidatePath("/admin/ip");
 }
+
 export async function deleteWhitelist(formData: FormData): Promise<void> {
-	return run(formData, "delete-whitelist");
+	await requirePermission(PERMS.SETTINGS_EDIT);
+	const raw = String(formData.get("id") ?? "")
+		.normalize("NFC")
+		.trim();
+	if (!raw) return;
+	await db
+		.delete(WebsiteIpWhitelist)
+		.where(eq(WebsiteIpWhitelist.id, BigInt(raw)));
+	revalidatePath("/admin/ip");
 }
+
 export async function addBlacklist(formData: FormData): Promise<void> {
-	return run(formData, "add-blacklist");
+	await requirePermission(PERMS.SETTINGS_EDIT);
+	const ipAddress = parseIp(formData);
+	if (!ipAddress) return;
+	const asn = parseAsn(formData);
+	await db.insert(WebsiteIpBlacklist).values({
+		ipAddress,
+		asn,
+		blacklistAsn: asn != null,
+	});
+	revalidatePath("/admin/ip");
 }
+
 export async function deleteBlacklist(formData: FormData): Promise<void> {
-	return run(formData, "delete-blacklist");
+	await requirePermission(PERMS.SETTINGS_EDIT);
+	const raw = String(formData.get("id") ?? "")
+		.normalize("NFC")
+		.trim();
+	if (!raw) return;
+	await db
+		.delete(WebsiteIpBlacklist)
+		.where(eq(WebsiteIpBlacklist.id, BigInt(raw)));
+	revalidatePath("/admin/ip");
 }