f3d0r4/woomy
1
0
Fork 0
forked from embee/woomy
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'next' of https://www.github.com/mudkipscience/woomy into next

Browse source
This commit is contained in:
Emily 2020-04-22 22:57:25 +10:00
commit 7a3035e00b
6 changed files with 125 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

11
utils/music.js
View file

@ -66,6 +66,7 @@ exports.getVideoByQuery = async function (client, query) {
exports.play = async function (client, message, query, ignoreQueue) {
const guild = exports.getGuild(message.guild.id)
guild.message = message
if (!message.member.voice.channel && !guild.voiceChannel) {
return message.reply('You have to be connected to a voice channel to use this command!')
@ -92,8 +93,10 @@ exports.play = async function (client, message, query, ignoreQueue) {
// Fix the bot if somehow broken
// music "playing", nothing in queue
if ((guild.playing || guild.dispatcher) && guild.queue.length === 0) {
guild.queue = []
guild.playing = false
guild.dispatcher = null
guild.paused = false
guild.skippers = []
// music not playing, something is in queue
} else if (!guild.playing && !guild.dispatcher && guild.queue.length > 0) {
guild.queue = []
@ -169,7 +172,6 @@ exports.play = async function (client, message, query, ignoreQueue) {
guild.playing = true
guild.voiceChannel = vc
console.log(vc)
const connection = await vc.join()
@ -188,7 +190,10 @@ exports.play = async function (client, message, query, ignoreQueue) {
if (guild.queue.length > 0) {
exports.play(client, message, null, true)
} else {
guild.dispatcher = null
guild.queue = []
guild.playing = false
guild.paused = false
guild.skippers = []
connection.disconnect()
}