From 466ed4207b68471df1c20988ecbcc394aad3b48f Mon Sep 17 00:00:00 2001 From: Zerio <43386412+ZerioDev@users.noreply.github.com> Date: Sun, 15 Nov 2020 18:50:24 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Bug=20fixes=20&=20update=20(v2.0.0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- commands/play.js | 57 ++++-------------------------------------------- 1 file changed, 4 insertions(+), 53 deletions(-) diff --git a/commands/play.js b/commands/play.js index d808cf6..3b2b644 100644 --- a/commands/play.js +++ b/commands/play.js @@ -1,58 +1,9 @@ -const emotes = require ("../config/emojis.json"); -const Discord = require("discord.js") +const emotes = require("../config/emojis.json"); exports.run = async (client, message, args) => { - //If the member is not in a voice channel - if(!message.member.voice.channel) return message.channel.send(`You're not in a voice channel ${emotes.error}`); + if (!message.member.voice.channel) return message.channel.send(`You're not in a voice channel ${emotes.error}`); - //If no music is provided - if (!args[0]) return message.channel.send(`Please specify a song to play ${emotes.error}`); + client.player.play(message, args.join(" ")); - const aTrackIsAlreadyPlaying = client.player.isPlaying(message.guild.id); - - //If there's already a track playing - if(aTrackIsAlreadyPlaying){ - - //Add the track to the queue - const result = await client.player.addToQueue(message.guild.id, args.join(" ")).catch(() => {}); - if(!result) { - message.member.voice.channel.leave() - return message.channel.send(`This song provider is not supported.`) - }; - - if(result.type === 'playlist'){ - message.channel.send(`${result.tracks.length} songs added to the queue ${emotes.music}`); - } else { - message.channel.send(`${result.name} added to the queue ${emotes.music}`); - } - - } else { - - //Else, play the song - const result = await client.player.play(message.member.voice.channel, args.join(" ")).catch(() => {}); - if(!result) { - message.member.voice.channel.leave() - return message.channel.send(`This song provider is not supported.`) - }; - - if(result.type === 'playlist'){ - message.channel.send(`${result.tracks.length} songs added to the queue ${emotes.music}\nCurrently playing ${result.tracks[0].name}`); - } else { - message.channel.send(`Currently playing ${result.name} ${emotes.music}`); - } - - const queue = client.player.getQueue(message.guild.id) - - //Events - .on('end', () => { - message.channel.send(`There is no more music in the queue ${emotes.error}`); - }) - .on('trackChanged', (oldTrack, newTrack) => { - message.channel.send(`Now playing ${newTrack.name} ... ${emotes.music}`); - }) - .on('channelEmpty', () => { - message.channel.send(`Music stopped, there are no more members in the voice channel ${emotes.error}`); - }); - } - } +};