chore: bite me

vladfrangu · Jun 14, 2024 · 564d0e5 · 564d0e5
1 parent e104b74
commit 564d0e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/src/lib/utils/db.ts b/src/lib/utils/db.ts
@@ -1,18 +1,6 @@
 import type { Member } from '@prisma/client';
 import { container } from '@sapphire/framework';
 
-interface RawMember {
-	guild_id: string;
-	regular_expressions: string[] | null;
-	user_id: string;
-	words: string[] | null;
-}
-
-interface RawIgnored {
-	ignored_channels: null[] | string[] | null;
-	ignored_users: null[] | string[] | null;
-}
-
 export interface FullMember extends Member {
 	ignoredChannels: string[];
 	ignoredUsers: string[];
@@ -21,16 +9,21 @@ export interface FullMember extends Member {
 export async function getDatabaseMember(guildId: string, userId: string): Promise<FullMember> {
 	const [_, [rawMember], [rawIgnored]] = await container.prisma.$transaction([
 		container.prisma.$queryRaw`INSERT INTO users (id) VALUES (${userId}) ON CONFLICT (id) DO NOTHING`,
-		// eslint-disable-next-line @ts-safeql/check-sql
-		container.prisma.$queryRaw<[RawMember]>`
+		container.prisma.$queryRaw<
+			{
+				guild_id: string | null;
+				regular_expressions: string[] | null;
+				user_id: string | null;
+				words: string[] | null;
+			}[]
+		>`
 	INSERT INTO members (guild_id, user_id)
 	VALUES (${guildId}, ${userId})
 	ON CONFLICT (guild_id, user_id) DO
 		UPDATE SET user_id = ${userId}
 	RETURNING *
 `,
-		// eslint-disable-next-line @ts-safeql/check-sql
-		container.prisma.$queryRaw<[RawIgnored]>`
+		container.prisma.$queryRaw<{ ignored_channels: string[] | null; ignored_users: (string | null)[] | null }[]>`
 	SELECT
 		array_agg(guild_ignored_channels.ignored_channel_id) as ignored_channels,
 		array_agg(guild_ignored_users.ignored_user_id) as ignored_users
@@ -56,8 +49,8 @@ export async function getDatabaseMember(guildId: string, userId: string): Promis
 	}
 
 	return {
-		guildId: rawMember.guild_id,
-		userId: rawMember.user_id,
+		guildId: rawMember.guild_id!,
+		userId: rawMember.user_id!,
 		words: rawMember.words ?? [],
 		regularExpressions: rawMember.regular_expressions ?? [],
 		ignoredUsers,

diff --git a/src/listeners/miscEvents/ready.ts b/src/listeners/miscEvents/ready.ts
@@ -72,7 +72,7 @@ export class ClientReadyListener extends Listener<typeof Events.ClientReady> {
 	private async ensureAllGuildsAreInDatabase() {
 		const { prisma, client } = this.container;
 
-		// eslint-disable-next-line @ts-safeql/check-sql -- This is validated to work but its SO JANK
+		// eslint-disable-next-line -- This is validated to work but its SO JANK
 		await prisma.$executeRaw`INSERT INTO guilds (guild_id) VALUES ${Prisma.join(
 			[...client.guilds.cache.keys()],
 			'), (',