Bug fixes

.gitignore

@@ -1,6 +1,6 @@
 node_modules
 .vscode
 package-lock.json
-config.js
 .env
-yarn.lock
+yarn.lock
+/src/config.js

package.json

@@ -31,6 +31,7 @@
   "dependencies": {
     "@discordjs/rest": "^1.0.0",
     "chalk": "^4.1.2",
+    "cheerio": "^1.0.0-rc.12",
     "delay": "^5.0.0",
     "discord.js": "14.3.0",
     "dotenv": "^10.0.0",

src/commands/Music/autoplay.js

@@ -13,38 +13,38 @@ module.exports = {
   inVoiceChannel: true,
   sameVoiceChannel: true,
   execute: async (message, args, client, prefix) => {
-
     const player = client.manager.get(message.guild.id);
 
     const autoplay = player.get("autoplay");
 
     const emojireplay = client.emoji.autoplay;
-    
+
     if (!player.queue.current)
       return message.reply({
         content: `Please play a song before using this command.`,
       });
-
-    if (autoplay === false) {
-      const identifier = player.queue.current.identifier;
-      player.set("autoplay", true);
-      player.set("requester", message.author);
-      player.set("identifier", identifier);
-      const search = `https://www.youtube.com/watch?v=${identifier}&list=RD${identifier}`;
-      res = await player.search(search, message.author);
-      player.queue.add(res.tracks[1]);
+
+    if (autoplay) {
+      player.set("autoplay", false);
       let thing = new EmbedBuilder()
         .setColor(client.embedColor)
         .setTimestamp()
-        .setDescription(`${emojireplay} Autoplay is now **enabled**.`);
+        .setDescription(`${emojireplay} Autoplay is now **disabled**.`);
       return message.channel.send({ embeds: [thing] });
     } else {
-      player.set("autoplay", false);
-      player.queue.clear();
+      const identifier = player.queue.current.identifier;
+      player.set("autoplay", true);
+      player.set("requester", client.user);
+      player.set("identifier", identifier);
+      const search = `https://www.youtube.com/watch?v=${identifier}&list=RD${identifier}`;
+      const res = await player.search(search, message.author);
+      player.queue.add(
+        res.tracks[Math.floor(Math.random() * res.tracks.length) ?? 1]
+      );
       let thing = new EmbedBuilder()
         .setColor(client.embedColor)
         .setTimestamp()
-        .setDescription(`${emojireplay} Autoplay is now **disabled**.`);
+        .setDescription(`${emojireplay} Autoplay is now **enabled**.`);
 
       return message.channel.send({ embeds: [thing] });
     }

src/commands/Music/play.js

@@ -1,5 +1,6 @@
 const { EmbedBuilder, PermissionsBitField } = require("discord.js");
-const { convertTime } = require('../../utils/convert.js');
+const { convertTime } = require("../../utils/convert.js");
+const { Player } = require("erela.js");
 
 module.exports = {
   name: "play",
@@ -14,43 +15,89 @@ module.exports = {
   inVoiceChannel: true,
   sameVoiceChannel: true,
   execute: async (message, args, client, prefix) => {
-
-    if (!message.guild.members.me.permissions.has(PermissionsBitField.resolve(['Speak', 'Connect']))) return message.channel.send({ embeds: [new EmbedBuilder().setColor(client.embedColor).setDescription(`I don't have enough permissions to execute this command! Please give me permission to \`CONNECT\` or \`SPEAK\`.`)] });
+    if (
+      !message.guild.members.me.permissions.has(
+        PermissionsBitField.resolve(["Speak", "Connect"])
+      )
+    )
+      return message.channel.send({
+        embeds: [
+          new EmbedBuilder()
+            .setColor(client.embedColor)
+            .setDescription(
+              `I don't have enough permissions to execute this command! Please give me permission to \`CONNECT\` or \`SPEAK\`.`
+            ),
+        ],
+      });
     const { channel } = message.member.voice;
-    if (!message.guild.members.cache.get(client.user.id).permissionsIn(channel).has(PermissionsBitField.resolve(['Speak', 'Connect']))) return message.channel.send({ embeds: [new EmbedBuilder().setColor(client.embedColor).setDescription(`I don't have enough permissions connect your VC! Please give me permission to \`CONNECT\` or \`SPEAK\`.`)] });
+    if (
+      !message.guild.members.cache
+        .get(client.user.id)
+        .permissionsIn(channel)
+        .has(PermissionsBitField.resolve(["Speak", "Connect"]))
+    )
+      return message.channel.send({
+        embeds: [
+          new EmbedBuilder()
+            .setColor(client.embedColor)
+            .setDescription(
+              `I don't have enough permissions connect your VC! Please give me permission to \`CONNECT\` or \`SPEAK\`.`
+            ),
+        ],
+      });
 
-
     const emojiaddsong = message.client.emoji.addsong;
-    const emojiplaylist = message.client.emoji.playlist
+    const emojiplaylist = message.client.emoji.playlist;
 
-    const player = client.manager.create({
-      guild: message.guild.id,
-      voiceChannel: message.member.voice.channel.id,
-      textChannel: message.channel.id,
-      selfDeafen: true,
-      volume: 80,
-    });
+    /**
+     * @type {Player}
+     */
+    let player = client.manager.get(message.guild.id);
+
+    if (!player)
+      player = await client.manager.create({
+        guild: message.guild.id,
+        voiceChannel: message.member.voice.channel.id,
+        textChannel: message.channel.id,
+        selfDeafen: true,
+        volume: 80,
+      });
 
     if (player.state != "CONNECTED") await player.connect();
-    const search = args.join(' ');
+    const search = args.join(" ");
     let res;
-
     try {
       res = await player.search(search, message.author);
       if (!player)
-        return message.channel.send({ embeds: [new EmbedBuilder().setColor(client.embedColor).setTimestamp().setDescription("Nothing is playing right now...")] });
-      if (res.loadType === 'LOAD_FAILED') {
+        return message.channel.send({
+          embeds: [
+            new EmbedBuilder()
+              .setColor(client.embedColor)
+              .setTimestamp()
+              .setDescription("Nothing is playing right now..."),
+          ],
+        });
+      if (res.loadType === "LOAD_FAILED") {
         if (!player.queue.current) player.destroy();
         throw res.exception;
       }
     } catch (err) {
-      return message.reply(`There was an error while searching: ${err.message}`);
+      return message.reply(
+        `There was an error while searching: ${err.message}`
+      );
     }
     switch (res.loadType) {
-      case 'NO_MATCHES':
+      case "NO_MATCHES":
         if (!player.queue.current) player.destroy();
-        return message.channel.send({ embeds: [new EmbedBuilder().setColor(client.embedColor).setTimestamp().setDescription(`❌ | No matches found for - ${search}`)]});
-      case 'TRACK_LOADED':
+        return message.channel.send({
+          embeds: [
+            new EmbedBuilder()
+              .setColor(client.embedColor)
+              .setTimestamp()
+              .setDescription(`❌ | No matches found for - ${search}`),
+          ],
+        });
+      case "TRACK_LOADED":
         var track = res.tracks[0];
         player.queue.add(track);
         if (!player.playing && !player.paused && !player.queue.size) {
@@ -59,19 +106,37 @@ module.exports = {
           const thing = new EmbedBuilder()
             .setColor(client.embedColor)
             .setTimestamp()
-            .setThumbnail(track.displayThumbnail("hqdefault"))
-            .setDescription(`${emojiaddsong} **Added song to queue**\n[${track.title}](${track.uri}) - \`[${convertTime(track.duration)}]\``)
+            .setThumbnail(
+              track.displayThumbnail("hqdefault") ??
+                (await client.manager.getMetaThumbnail(track.uri))
+            )
+            .setDescription(
+              `${emojiaddsong} **Added song to queue**\n[${track.title}](${
+                track.uri
+              }) - \`[${convertTime(track.duration)}]\``
+            );
           return message.channel.send({ embeds: [thing] });
         }
-      case 'PLAYLIST_LOADED':
+      case "PLAYLIST_LOADED":
         player.queue.add(res.tracks);
-        if (!player.playing && !player.paused && player.queue.totalSize === res.tracks.length) player.play();
+        if (
+          !player.playing &&
+          !player.paused &&
+          player.queue.totalSize === res.tracks.length
+        )
+          player.play();
         const thing = new EmbedBuilder()
           .setColor(client.embedColor)
           .setTimestamp()
-          .setDescription(`${emojiplaylist} **Added playlist to queue**\n${res.tracks.length} Songs [${res.playlist.name}](${search}) - \`[${convertTime(res.playlist.duration)}]\``)
+          .setDescription(
+            `${emojiplaylist} **Added playlist to queue**\n${
+              res.tracks.length
+            } Songs [${res.playlist.name}](${search}) - \`[${convertTime(
+              res.playlist.duration
+            )}]\``
+          );
         return message.channel.send({ embeds: [thing] });
-      case 'SEARCH_RESULT':
+      case "SEARCH_RESULT":
         var track = res.tracks[0];
         player.queue.add(track);
         if (!player.playing && !player.paused && !player.queue.size) {
@@ -80,10 +145,19 @@ module.exports = {
           const thing = new EmbedBuilder()
             .setColor(client.embedColor)
             .setTimestamp()
-            .setThumbnail(track.displayThumbnail("hqdefault"))
-            .setDescription(`${emojiaddsong} **Added song to queue**\n[${track.title}](${track.uri}) - \`[${convertTime(track.duration)}]\`[<@${track.requester.id}>]`)
+            .setThumbnail(
+              track.displayThumbnail("hqdefault") ??
+                (await client.manager.getMetaThumbnail(track.uri))
+            )
+            .setDescription(
+              `${emojiaddsong} **Added song to queue**\n[${track.title}](${
+                track.uri
+              }) - \`[${convertTime(track.duration)}]\`[<@${
+                track.requester.id
+              }>]`
+            );
           return message.channel.send({ embeds: [thing] });
         }
     }
-  }
-}
+  },
+};

src/commands/Music/skip.js

@@ -1,40 +1,41 @@
 const { EmbedBuilder } = require("discord.js");
 
 module.exports = {
-	name: "skip",
-	aliases: ["s"],
-	category: "Music",
-	description: "Skip the song currently playing.",
-	args: false,
+  name: "skip",
+  aliases: ["s"],
+  category: "Music",
+  description: "Skip the song currently playing.",
+  args: false,
   usage: "",
   userPerms: [],
   dj: true,
   owner: false,
   player: true,
   inVoiceChannel: true,
   sameVoiceChannel: true,
-execute: async (message, args, client, prefix) => {
-
-		const player = message.client.manager.get(message.guild.id);
+  execute: async (message, args, client, prefix) => {
+    const player = message.client.manager.get(message.guild.id);
 
-        if (!player.queue.current) {
-            let thing = new EmbedBuilder()
-                .setColor("Red")
-                .setDescription("There is no music playing.");
-         return message.reply({embeds: [thing]});
-        }
-        const song = player.queue.current;
+    if (!player.queue.current) {
+      let thing = new EmbedBuilder()
+        .setColor("Red")
+        .setDescription("There is no music playing.");
+      return message.reply({ embeds: [thing] });
+    }
+    const song = player.queue.current;
 
-           player.stop();
-
-		const emojiskip = message.client.emoji.skip;
+    player.stop();
 
-		let thing = new EmbedBuilder()
-			.setDescription(`${emojiskip} **Skipped**\n[${song.title}](${song.uri})`)
-			.setColor(message.client.embedColor)
-			.setTimestamp()
-		return message.reply({embeds: [thing]}).then(msg => { setTimeout(() => {msg.delete()}, 3000);
-       })
-
-    }
+    const emojiskip = message.client.emoji.skip;
+
+    let thing = new EmbedBuilder()
+      .setDescription(`${emojiskip} **Skipped**\n[${song.title}](${song.uri})`)
+      .setColor(message.client.embedColor)
+      .setTimestamp();
+    return message.reply({ embeds: [thing] }).then((msg) => {
+      setTimeout(() => {
+        msg.delete();
+      }, 3000);
+    });
+  },
 };