Cleanup storage helpers

Author: TheKodeToad

backend/eslint.config.js

@@ -49,6 +49,7 @@ export default defineConfig(
 					],
 				},
 			],
+			"@typescript-eslint/no-namespace": "off",
 			"no-var": "off",
 			"no-console": "warn",
 			"prefer-const": "warn",

backend/src/http/middleware/guildAuth.ts

@@ -1,5 +1,5 @@
 import { isSnowflake } from "#common/snowflakes.ts";
-import { getGuildOwnerID } from "#plugins/core/storage/guildInfo.ts";
+import { guildInfoTable } from "#plugins/core/storage/guildInfo.ts";
 import { createMiddleware } from "hono/factory";
 import { HTTPException } from "hono/http-exception";
 import type { Pool } from "pg";
@@ -27,7 +27,7 @@ export function guildAuthMiddleware(db: Pool) {
 			throw new HTTPException(400, { message: "Malformed guild id" });
 		}
 
-		const owner = await getGuildOwnerID(db, guildID);
+		const owner = await guildInfoTable.getOwnerID(db, guildID);
 
 		if (owner === null || owner !== discordUserID) {
 			throw new HTTPException(403, { message: "Missing permission" });

backend/src/http/route/api/v1/guilds.ts

@@ -8,7 +8,7 @@ import {
 	guildAuthMiddleware,
 	type GuildAuthVars,
 } from "#http/middleware/guildAuth.ts";
-import { getAPIGuildInfoByOwner } from "#plugins/core/storage/guildInfo.ts";
+import { guildInfoTable } from "#plugins/core/storage/guildInfo.ts";
 import { Hono } from "hono";
 
 export default (backendCtx: BackendHTTPContext): Hono => {
@@ -35,7 +35,10 @@ export default (backendCtx: BackendHTTPContext): Hono => {
 	app.route("/:guildID/plugins", guildRouter);
 	app.get("/", authMiddleware(backendCtx.db), async (ctx) =>
 		ctx.json(
-			await getAPIGuildInfoByOwner(backendCtx.db, ctx.var.discordUserID),
+			await guildInfoTable.getPublicByOwner(
+				backendCtx.db,
+				ctx.var.discordUserID,
+			),
 		),
 	);
 

backend/src/plugins/core/configSync.ts

@@ -12,10 +12,7 @@ import {
 } from "#plugins/core/guildInfoSync.ts";
 import type { ConfigStore } from "#plugins/core/public/configStore.ts";
 import { defineConfig } from "#plugins/core/public/extensionPoints.ts";
-import {
-	getGuildConfig,
-	insertGuildConfig,
-} from "#plugins/core/storage/configs.ts";
+import { guildConfigsTable } from "#plugins/core/storage/guildConfigs.ts";
 import AsyncLock from "async-lock";
 import type { Client } from "oceanic.js";
 import { parse as parseToml, TomlError } from "smol-toml";
@@ -136,7 +133,7 @@ async function createAndLoadConfigs(
 	await Promise.all(
 		defineConfig.contributions.entries().map(async ([plugin, config]) => {
 			await acquireConfig(guildID, plugin.id, async () => {
-				const inserted = await insertGuildConfig(
+				const inserted = await guildConfigsTable.insert(
 					ctx.db,
 					guildID,
 					plugin.id,
@@ -194,7 +191,7 @@ async function parseConfig(
 	pluginID: string,
 	configCache: ConfigStore,
 ): Promise<{} | null> {
-	const rawValue = await getGuildConfig(ctx.db, guildID, pluginID);
+	const rawValue = await guildConfigsTable.get(ctx.db, guildID, pluginID);
 
 	if (rawValue === null) {
 		return null;

backend/src/plugins/core/guildInfoSync.ts

@@ -8,17 +8,7 @@ import {
 	makeEventExtensionPoint,
 } from "#extensionPoint.ts";
 import { onBotEvent } from "#plugins/core/public/extensionPoints.ts";
-import {
-	cancelGuildInfoDeletion,
-	deleteExpiredGuildInfo,
-	getAllGuildInfo,
-	insertGuildInfo,
-	markGuildAllowed,
-	markGuildNotAllowed,
-	markUnknownGuildAllowed,
-	scheduleGuildInfoDeletion,
-	updateGuildInfo,
-} from "#plugins/core/storage/guildInfo.ts";
+import { guildInfoTable } from "#plugins/core/storage/guildInfo.ts";
 import type { Guild, JSONGuild } from "oceanic.js";
 import type { Pool } from "pg";
 
@@ -50,7 +40,7 @@ export default [
 async function init(ctx: BackendDiscordContext): Promise<void> {
 	logger.debug?.("Initializing guild info");
 
-	const guildsInfo = await getAllGuildInfo(ctx.db);
+	const guildsInfo = await guildInfoTable.all(ctx.db);
 	// guilds from env var, remove those which are already present
 	const missing = [...BOT_ALLOWED_GUILDS];
 
@@ -61,12 +51,12 @@ async function init(ctx: BackendDiscordContext): Promise<void> {
 			missing.splice(missingIndex, 1);
 
 			if (guildInfo.deleteAt !== null) {
-				await cancelGuildInfoDeletion(ctx.db, guildInfo.id);
+				await guildInfoTable.cancelDeletion(ctx.db, guildInfo.id);
 			}
 		} else if (!guildInfo.allowed) {
 			// was removed from env var
 			if (guildInfo.deleteAt === null) {
-				await scheduleGuildInfoDeletion(ctx.db, guildInfo.id);
+				await guildInfoTable.scheduleDeletion(ctx.db, guildInfo.id);
 			}
 
 			continue;
@@ -90,7 +80,7 @@ async function init(ctx: BackendDiscordContext): Promise<void> {
 			continue;
 		}
 
-		await updateGuildInfo(
+		await guildInfoTable.update(
 			ctx.db,
 			guildInfo.id,
 			realGuild.name,
@@ -102,7 +92,7 @@ async function init(ctx: BackendDiscordContext): Promise<void> {
 	for (const missingGuildID of missing) {
 		const realGuild = ctx.bot.guilds.get(missingGuildID);
 
-		await insertGuildInfo(
+		await guildInfoTable.insert(
 			ctx.db,
 			missingGuildID,
 			realGuild?.name ?? null,
@@ -122,7 +112,7 @@ export async function beginDeleteGuildInfoLoop(db: Pool): Promise<void> {
 	try {
 		logger.debug?.("Deleting expired guild info");
 
-		const deletedCount = await deleteExpiredGuildInfo(db);
+		const deletedCount = await guildInfoTable.deleteExpired(db);
 
 		logger.debug?.(`Deleted ${deletedCount} guilds`);
 	} finally {
@@ -132,7 +122,7 @@ export async function beginDeleteGuildInfoLoop(db: Pool): Promise<void> {
 
 async function handleCreate(db: Pool, guild: Guild): Promise<void> {
 	if (isGuildAllowed(guild.id)) {
-		await updateGuildInfo(
+		await guildInfoTable.update(
 			db,
 			guild.id,
 			guild.name,
@@ -163,7 +153,13 @@ async function handleUpdate(
 		return;
 	}
 
-	await updateGuildInfo(db, guild.id, guild.name, guild.icon, guild.ownerID);
+	await guildInfoTable.update(
+		db,
+		guild.id,
+		guild.name,
+		guild.icon,
+		guild.ownerID,
+	);
 }
 
 export function isGuildAllowed(id: string): boolean {
@@ -193,15 +189,15 @@ export async function grantAccess(
 	const realGuild = ctx.bot.guilds.get(id);
 
 	if (realGuild !== undefined) {
-		await markGuildAllowed(
+		await guildInfoTable.markAllowed(
 			ctx.db,
 			id,
 			realGuild?.name ?? null,
 			realGuild?.icon ?? null,
 			realGuild?.ownerID ?? null,
 		);
 	} else {
-		await markUnknownGuildAllowed(ctx.db, id);
+		await guildInfoTable.markUnknownAllowed(ctx.db, id);
 	}
 
 	allowedGuilds.add(id);
@@ -222,11 +218,11 @@ export async function revokeAccess(
 	}
 
 	if (BOT_ALLOWED_GUILDS.includes(id)) {
-		await markGuildNotAllowed(ctx.db, id);
+		await guildInfoTable.markNotAllowed(ctx.db, id);
 		allowedGuilds.delete(id);
 		return true;
 	} else {
-		const date = await scheduleGuildInfoDeletion(ctx.db, id);
+		const date = await guildInfoTable.scheduleDeletion(ctx.db, id);
 		allowedGuilds.delete(id);
 
 		await onGuildAccessRevoked.fire(ctx, id);

backend/src/plugins/core/http/configRoutes.ts

@@ -1,14 +1,11 @@
 import { defineGlobalPluginGuildRoutes } from "#http/extensionPoints.ts";
-import {
-	getGuildConfig,
-	updateGuildConfig,
-} from "#plugins/core/storage/configs.ts";
+import { guildConfigsTable } from "#plugins/core/storage/guildConfigs.ts";
 import { notifyChannel } from "#storage/notification.ts";
 import { HTTPException } from "hono/http-exception";
 
 export default defineGlobalPluginGuildRoutes((backendCtx, plugin, app) => {
 	app.get("/config", async (ctx) => {
-		const config = await getGuildConfig(
+		const config = await guildConfigsTable.get(
 			backendCtx.db,
 			ctx.var.discordGuildID,
 			plugin.id,
@@ -29,7 +26,7 @@ export default defineGlobalPluginGuildRoutes((backendCtx, plugin, app) => {
 		}
 
 		const body = await ctx.req.text();
-		const exists = await updateGuildConfig(
+		const exists = await guildConfigsTable.update(
 			backendCtx.db,
 			ctx.var.discordGuildID,
 			plugin.id,