Wizzard
/
DZ-Musicbot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update play.js

This commit is contained in:
Wizzard 2024-08-17 16:52:44 -04:00
parent f478894002
commit fb027bc7a6
1 changed files with 37 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
commands/play.js
View File

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