refactor(badge): fix parameter types

Discord-InterChat · Aug 20, 2023 · aad351c · aad351c
1 parent 726fc9a
commit aad351c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/src/Commands/Staff/badge.ts b/src/Commands/Staff/badge.ts
@@ -1,5 +1,4 @@
 import { ChatInputCommandInteraction, SlashCommandBuilder } from 'discord.js';
-import { getDb } from '../../Utils/functions/utils';
 
 export default {
   staff: true,
@@ -69,14 +68,11 @@ export default {
     const user = interaction.options.getUser('user');
     const badge = interaction.options.getString('badge');
 
-    const database = getDb();
-    const userBadges = database?.userBadges;
-
     if (subcommand === 'list') {
-      require('../../Scripts/badge/list').execute(interaction, userBadges, user);
+      require('../../Scripts/badge/list').execute(interaction, user);
     }
     else {
-      require(`../../Scripts/badge/${subcommand}`).execute(interaction, userBadges, user, badge);
+      require(`../../Scripts/badge/${subcommand}`).execute(interaction, user, badge);
     }
   },
 };
diff --git a/src/Scripts/badge/add.ts b/src/Scripts/badge/add.ts
@@ -1,14 +1,14 @@
-import { Prisma } from '@prisma/client';
 import { ChatInputCommandInteraction, User } from 'discord.js';
+import { getDb } from '../../Utils/functions/utils';
 
 module.exports = {
   async execute(
     interaction: ChatInputCommandInteraction,
-    dbCollection: Prisma.userBadgesDelegate<Prisma.RejectOnNotFound | Prisma.RejectPerOperation | undefined>,
     user: User,
     badge: string,
   ) {
-    const userInCollection = await dbCollection.findFirst({ where: { userId: user.id } });
+    const db = getDb();
+    const userInCollection = await db.userBadges.findFirst({ where: { userId: user.id } });
 
     if (userInCollection) {
       const userBadges = userInCollection.badges;
@@ -18,13 +18,13 @@ module.exports = {
         return;
       }
       else {
-        await dbCollection.update({ where: { userId: user.id }, data: { badges: [...userBadges, badge] } });
+        await db.userBadges.update({ where: { userId: user.id }, data: { badges: [...userBadges, badge] } });
         await interaction.reply(`Badge \`${badge}\` added to ${user.username}.`);
         return;
       }
     }
     else {
-      await dbCollection.create({ data: { userId: user.id, badges: [badge] } });
+      await db.userBadges.create({ data: { userId: user.id, badges: [badge] } });
       await interaction.reply(`Badge \`${badge}\` added to ${user.username}.`);
       return;
     }

diff --git a/src/Scripts/badge/list.ts b/src/Scripts/badge/list.ts
@@ -1,13 +1,13 @@
-import { Prisma } from '@prisma/client';
 import { ChatInputCommandInteraction, User } from 'discord.js';
+import { getDb } from '../../Utils/functions/utils';
 
 export = {
   async execute(
     interaction: ChatInputCommandInteraction,
-    dbCollection: Prisma.userBadgesDelegate<Prisma.RejectOnNotFound | Prisma.RejectPerOperation | undefined>,
     user: User,
   ) {
-    const userInCollection = await dbCollection.findFirst({ where: { userId: user.id } });
+    const db = getDb();
+    const userInCollection = await db.userBadges.findFirst({ where: { userId: user.id } });
     if (!userInCollection) {
       await interaction.reply(`User ${user.username} doesn't have any badges!`);
     }

diff --git a/src/Scripts/badge/remove.ts b/src/Scripts/badge/remove.ts
@@ -1,21 +1,21 @@
-import { Prisma } from '@prisma/client';
 import { ChatInputCommandInteraction, User } from 'discord.js';
+import { getDb } from '../../Utils/functions/utils';
 
 export = {
   async execute(
     interaction: ChatInputCommandInteraction,
-    dbCollection: Prisma.userBadgesDelegate<Prisma.RejectOnNotFound | Prisma.RejectPerOperation | undefined>,
     user: User,
     badge: string,
   ) {
-    const userInCollection = await dbCollection.findFirst({ where: { userId: user.id } });
+    const db = getDb();
+    const userInCollection = await db.userBadges.findFirst({ where: { userId: user.id } });
 
     if (userInCollection) {
       const userBadges = userInCollection.badges;
 
       if (userBadges.includes(badge)) {
         userBadges.splice(userBadges.indexOf(badge), 1);
-        await dbCollection.update({ where: { userId: user.id }, data: { badges: userBadges } });
+        await db.userBadges.update({ where: { userId: user.id }, data: { badges: userBadges } });
         await interaction.reply(`Removed badge \`${badge}\` from user ${user.username}.`);
       }
       else {