Update queueManager.js

commands/play.js

@@ -45,8 +45,8 @@ module.exports = {
 
                     message.channel.send({ embeds: [embed] });
 
-                    addToQueue(message.guild.id, tempFilePath, title);
-                    playNextInQueue(message.guild.id, voiceChannel);
+                    addToQueue(message.guild.id, tempFilePath, title, voiceChannel);
+                    playNextInQueue(message.guild.id);
                     return;
                 } else {
                     return message.reply('Only MP3 files are supported for uploads.');
@@ -54,38 +54,12 @@ module.exports = {
             }
 
             if (isValidURL(searchQuery)) {
-                if (searchQuery.includes('cdn.discordapp.com')) {
-                    title = path.basename(searchQuery.split('?')[0]);
-                    tempFilePath = path.join(__dirname, '../utils/tmp', title);
-
-                    console.log(`Discord CDN link received: ${searchQuery}`);
-                    console.log(`Downloading to: ${tempFilePath}`);
-
-                    const response = await fetch(searchQuery);
-                    if (!response.ok) throw new Error('Failed to download MP3 file.');
-                    const buffer = await response.buffer();
-                    fs.writeFileSync(tempFilePath, buffer);
-
-                    console.log(`Downloaded and saved: ${tempFilePath}`);
-
-                    const embed = new EmbedBuilder()
-                        .setColor('#0099ff')
-                        .setTitle('Now Playing')
-                        .setDescription(`**${title}**`)
-                        .setFooter({ text: `Requested by ${message.author.username}`, iconURL: message.author.displayAvatarURL() })
-                        .setTimestamp();
-
-                    message.channel.send({ embeds: [embed] });
-
-                    addToQueue(message.guild.id, tempFilePath, title);
-                    playNextInQueue(message.guild.id, voiceChannel);
-                    return;
-                } else if (searchQuery.endsWith('.mp3')) {
+                if (searchQuery.endsWith('.mp3')) {
                     title = path.basename(searchQuery.split('?')[0]);
                     tempFilePath = path.join(__dirname, '../utils/tmp', `${uuidv4()}_${title}`);
 
-                    console.log(`Direct MP3 link received: ${searchQuery}`);
-                    console.log(`Downloading to: ${tempFilePath}`);
+                    console.log(`MP3 link received: ${searchQuery}`);
+                    console.log(`Downloading MP3 to: ${tempFilePath}`);
 
                     const response = await fetch(searchQuery);
                     if (!response.ok) throw new Error('Failed to download MP3 file.');
@@ -103,14 +77,38 @@ module.exports = {
 
                     message.channel.send({ embeds: [embed] });
 
-                    addToQueue(message.guild.id, tempFilePath, title);
-                    playNextInQueue(message.guild.id, voiceChannel);
+                    addToQueue(message.guild.id, tempFilePath, title, voiceChannel);
+                    playNextInQueue(message.guild.id);
+                    return;
+                } else if (searchQuery.includes("cdn.discordapp.com")) {
+                    title = path.basename(searchQuery.split('?')[0]);
+                    tempFilePath = path.join(__dirname, '../utils/tmp', `${uuidv4()}_${title}`);
+
+                    console.log(`Discord MP3 link received: ${searchQuery}`);
+                    console.log(`Downloading MP3 from Discord to: ${tempFilePath}`);
+
+                    const response = await fetch(searchQuery);
+                    if (!response.ok) throw new Error('Failed to download MP3 file from Discord.');
+                    const buffer = await response.buffer();
+                    fs.writeFileSync(tempFilePath, buffer);
+
+                    console.log(`Downloaded and saved: ${tempFilePath}`);
+
+                    const embed = new EmbedBuilder()
+                        .setColor('#0099ff')
+                        .setTitle('Now Playing')
+                        .setDescription(`**${title}**`)
+                        .setFooter({ text: `Requested by ${message.author.username}`, iconURL: message.author.displayAvatarURL() })
+                        .setTimestamp();
+
+                    message.channel.send({ embeds: [embed] });
+
+                    addToQueue(message.guild.id, tempFilePath, title, voiceChannel);
+                    playNextInQueue(message.guild.id);
                     return;
                 } else {
                     tempFilePath = path.join(__dirname, '../utils/tmp', `${uuidv4()}.mp3`);
 
-                    console.log(`YouTube link received: ${searchQuery}`);
-
                     exec(`yt-dlp --print title ${searchQuery}`, (error, stdout, stderr) => {
                         if (error) {
                             console.error(`Error getting title: ${error}`);
@@ -128,8 +126,6 @@ module.exports = {
                                 return;
                             }
 
-                            console.log(`Downloaded and saved: ${tempFilePath}`);
-
                             const embed = new EmbedBuilder()
                                 .setColor('#0099ff')
                                 .setTitle('Now Playing')
@@ -139,8 +135,8 @@ module.exports = {
 
                             message.channel.send({ embeds: [embed] });
 
-                            addToQueue(message.guild.id, tempFilePath, title);
-                            playNextInQueue(message.guild.id, voiceChannel);
+                            addToQueue(message.guild.id, tempFilePath, title, voiceChannel);
+                            playNextInQueue(message.guild.id);
                         });
                     });
                 }
@@ -166,8 +162,6 @@ module.exports = {
                             return;
                         }
 
-                        console.log(`Downloaded and saved: ${tempFilePath}`);
-
                         const embed = new EmbedBuilder()
                             .setColor('#0099ff')
                             .setTitle('Now Playing')
@@ -177,8 +171,8 @@ module.exports = {
 
                         message.channel.send({ embeds: [embed] });
 
-                        addToQueue(message.guild.id, tempFilePath, title);
-                        playNextInQueue(message.guild.id, voiceChannel);
+                        addToQueue(message.guild.id, tempFilePath, title, voiceChannel);
+                        playNextInQueue(message.guild.id);
                     });
                 });
             }

utils/queueManager.js

@@ -5,12 +5,23 @@ const queueMap = new Map();
 const playerMap = new Map();
 const currentTrackMap = new Map();
 const repeatMap = new Map();
+const voiceChannelMap = new Map();
 
-function addToQueue(guildId, filePath, title) {
+function addToQueue(guildId, filePath, title, voiceChannel) {
     if (!queueMap.has(guildId)) {
         queueMap.set(guildId, []);
     }
     queueMap.get(guildId).push({ filePath, title });
+
+    if (voiceChannel) {
+        voiceChannelMap.set(guildId, voiceChannel);
+    }
+
+    const audioPlayer = playerMap.get(guildId);
+
+    if (!audioPlayer || audioPlayer.state.status !== AudioPlayerStatus.Playing) {
+        playNextInQueue(guildId);
+    }
 }
 
 function getQueue(guildId) {
@@ -27,10 +38,16 @@ function toggleRepeat(guildId) {
     return !currentRepeat;
 }
 
-function playNextInQueue(guildId, voiceChannel) {
+function playNextInQueue(guildId) {
     const queue = getQueue(guildId);
     const currentTrack = getCurrentTrack(guildId);
     const repeat = repeatMap.get(guildId);
+    const voiceChannel = voiceChannelMap.get(guildId);
+
+    if (!voiceChannel) {
+        console.error("Voice channel is undefined. Cannot play track.");
+        return false;
+    }
 
     if (currentTrack && !repeat) {
         return false;
@@ -85,7 +102,7 @@ function playTrack(guildId, voiceChannel, track) {
 
         const queue = getQueue(guildId);
         if (queue.length > 0 || repeatMap.get(guildId)) {
-            playNextInQueue(guildId, voiceChannel);
+            playNextInQueue(guildId);
         } else {
             if (connection && connection.state.status !== 'destroyed') {
                 connection.destroy();
@@ -102,7 +119,7 @@ function playTrack(guildId, voiceChannel, track) {
     });
 }
 
-function skipTrack(guildId, voiceChannel) {
+function skipTrack(guildId) {
     const player = playerMap.get(guildId);
     const queue = getQueue(guildId);
 
@@ -115,7 +132,7 @@ function skipTrack(guildId, voiceChannel) {
     player.stop();
 
     if (queue.length > 0) {
-        playNextInQueue(guildId, voiceChannel);
+        playNextInQueue(guildId);
     } else {
         const connection = playerMap.get(guildId)?._state?.subscription?.connection;
         if (connection && connection.state.status !== 'destroyed') {