new

appujet · Aug 26, 2023 · eb947cd · eb947cd
1 parent b6a49f1
commit eb947cd
Show file tree

Hide file tree

Showing 7 changed files with 165 additions and 113 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,11 +1,11 @@
 {
   "name": "lavamusic",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "LavaMusic is a music bot for Discord, written in JavaScript using the Discord.js, Typescript, Shoukaku (Lavalink) library.",
   "type": "module",
   "main": "dist/index.js",
   "scripts": {
-    "start": "npm run prisma:generate && npm run start:bot",
+    "start": "npm run start:bot",
     "prisma:generate": "npx prisma generate",
     "start:bot": "npm run build && node --enable-source-maps dist/index.js",
     "build": "tsc --project tsconfig.json"
@@ -31,14 +31,14 @@
   },
   "homepage": "https://github.com/brblacky/lavamusic#readme",
   "devDependencies": {
-    "@types/node": "^20.5.1",
+    "@types/node": "^20.5.6",
     "@types/signale": "^1.4.4",
-    "prisma": "^5.1.1",
+    "prisma": "^5.2.0",
     "ts-node": "^10.9.1",
-    "typescript": "^5.1.6"
+    "typescript": "^5.2.2"
   },
   "dependencies": {
-    "@prisma/client": "^5.1.1",
+    "@prisma/client": "^5.2.0",
     "discord.js": "^14.13.0",
     "dotenv": "^16.3.1",
     "shoukaku": "^3.4.0",

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
@@ -20,7 +20,6 @@ model Guild {
   dj         Dj?
   botchannel Botchannel?
   premium    Premium?
-  tracks     Tracks[]
 }
 
 model Setup {
@@ -96,15 +95,3 @@ model Premium {
   user      User?   @relation(fields: [userId], references: [userId])
   guild     Guild?  @relation(fields: [guildId], references: [guildId])
 }
-
-model Tracks {
-  id         String  @id @default(auto()) @map("_id") @db.ObjectId
-  trackId    String  @unique
-  title      String
-  url        String
-  duration   String
-  thumbnail  String
-  played     Int     @default(0)
-  guildId    String
-  guild      Guild?  @relation(fields: [guildId], references: [guildId])
-}
diff --git a/src/commands/config/247.ts b/src/commands/config/247.ts
@@ -1,4 +1,5 @@
 import { Command, Lavamusic, Context } from '../../structures/index.js';
+import ServerData from '../../database/server.js';
 
 export default class _247 extends Command {
   constructor(client: Lavamusic) {
@@ -39,13 +40,7 @@ export default class _247 extends Command {
     });
     const vc = ctx.member as any;
     if (!data) {
-      await client.prisma.stay.create({
-        data: {
-          guildId: ctx.guild.id,
-          textId: ctx.channel.id,
-          voiceId: vc.voice.channelId,
-        },
-      });
+      await ServerData.set_247(ctx.guild.id, ctx.channel.id, vc.voice.channelId);
       if (!player)
         player = await client.queue.create(ctx.guild, vc.voice.channel, ctx.channel, client.shoukaku.getNode());
       return ctx.sendMessage({
@@ -57,7 +52,6 @@ export default class _247 extends Command {
           guildId: ctx.guild.id,
         },
       });
-
       return ctx.sendMessage({
         embeds: [embed.setDescription(`**247 mode has been disabled**`).setColor(client.color.red)],
       });

diff --git a/src/commands/config/Dj.ts b/src/commands/config/Dj.ts
@@ -1,5 +1,6 @@
 import { Command, Lavamusic, Context } from '../../structures/index.js';
 import { ApplicationCommandOptionType } from 'discord.js';
+import ServerData from '../../database/server.js';
 
 export default class Dj extends Command {
   constructor(client: Lavamusic) {
@@ -96,34 +97,12 @@ export default class Dj extends Command {
         });
 
       if (!dj) {
-        await this.client.prisma.dj.create({
-          data: {
-            guildId: ctx.guild.id,
-            roles: {
-              create: {
-                roleId: role.id,
-              },
-            },
-            mode: true,
-          },
-        });
+        await ServerData.setDj(ctx.guild.id, role.id);
         return await ctx.sendMessage({
           embeds: [embed.setDescription(`The dj role <@&${role.id}> has been added`)],
         });
       } else {
-        await this.client.prisma.dj.update({
-          where: {
-            guildId: ctx.guild.id,
-          },
-          data: {
-            mode: true,
-            roles: {
-              create: {
-                roleId: role.id,
-              },
-            },
-          },
-        });
+        await ServerData.setDj(ctx.guild.id, role.id);
         return await ctx.sendMessage({
           embeds: [embed.setDescription(`The dj role <@&${role.id}> has been added`)],
         });
@@ -149,17 +128,7 @@ export default class Dj extends Command {
         return await ctx.sendMessage({
           embeds: [embed.setDescription('There are no dj roles to clear')],
         });
-      await this.client.prisma.roles.deleteMany({
-        where: { guildId: ctx.guild.id },
-      });
-      await this.client.prisma.dj.update({
-        where: {
-          guildId: ctx.guild.id,
-        },
-        data: {
-          mode: false,
-        },
-      });
+      await ServerData.setDj(ctx.guild.id);
       return await ctx.sendMessage({
         embeds: [embed.setDescription(`All dj roles have been removed`)],
       });

diff --git a/src/commands/config/Prefix.ts b/src/commands/config/Prefix.ts
@@ -1,4 +1,5 @@
 import { Command, Lavamusic, Context } from '../../structures/index.js';
+import ServerData from '../../database/server.js';
 
 export default class Prefix extends Command {
   constructor(client: Lavamusic) {
@@ -49,11 +50,7 @@ export default class Prefix extends Command {
   }
   public async run(client: Lavamusic, ctx: Context, args: string[]): Promise<void> {
     const embed = client.embed().setColor(client.color.main);
-    let prefix = (await this.client.prisma.guild.findUnique({
-      where: {
-        guildId: ctx.guild.id,
-      },
-    })) as any;
+    let prefix = await ServerData.get(ctx.guild.id);
 
     let subCommand: string;
     let pre: string;
@@ -76,24 +73,14 @@ export default class Prefix extends Command {
           });
 
         if (!prefix) {
-          prefix = await this.client.prisma.guild.create({
-            data: {
-              guildId: ctx.guild.id,
-              prefix: pre,
-            },
-          });
+          await ServerData.setPrefix(ctx.guild.id, pre);
+          prefix = await ServerData.get(ctx.guild.id);
           return await ctx.sendMessage({
             embeds: [embed.setDescription(`The prefix for this server is now \`${prefix.prefix}\``)],
           });
         } else {
-          prefix = await this.client.prisma.guild.update({
-            where: {
-              guildId: ctx.guild.id,
-            },
-            data: {
-              prefix: pre,
-            },
-          });
+          await ServerData.setPrefix(ctx.guild.id, pre);
+          prefix = await ServerData.get(ctx.guild.id);
           return await ctx.sendMessage({
             embeds: [embed.setDescription(`The prefix for this server is now \`${prefix.prefix}\``)],
           });
@@ -103,14 +90,8 @@ export default class Prefix extends Command {
           return await ctx.sendMessage({
             embeds: [embed.setDescription(`The prefix for this server is \`${client.config.prefix}\``)],
           });
-        prefix = await this.client.prisma.guild.update({
-          where: {
-            guildId: ctx.guild.id,
-          },
-          data: {
-            prefix: client.config.prefix,
-          },
-        });
+        await ServerData.setPrefix(ctx.guild.id, client.config.prefix);
+        prefix = await ServerData.get(ctx.guild.id);
         return await ctx.sendMessage({
           embeds: [embed.setDescription(`The prefix for this server is now \`${client.config.prefix}\``)],
         });