From b6b810b4de38fd6b4e75bd1c5d71860e5087c756 Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 9 May 2020 16:43:30 +1000 Subject: [PATCH 1/3] fixed skip + rate --- src/commands/rate.js | 5 +++++ src/modules/music.js | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/commands/rate.js b/src/commands/rate.js index d4f0eac..64ded10 100644 --- a/src/commands/rate.js +++ b/src/commands/rate.js @@ -16,6 +16,11 @@ var rating = [ "9/10", "10/10" ]; + +if (message.content.includes("@everyone")) { + return message.channel.send('>:('); +} + let mess = rating.random(); message.channel.send(`<:star:618393201501536258> I give ${args.join(" ")} a **${mess}**`); }; diff --git a/src/modules/music.js b/src/modules/music.js index a3bb99e..d5b5d86 100644 --- a/src/modules/music.js +++ b/src/modules/music.js @@ -240,6 +240,8 @@ exports.setVolume = function (guild, target) { exports.skip = function (guild, reason) { const g = exports.getGuild(guild.id) + g.skippers = [] + if (g.dispatcher) { g.dispatcher.end(reason) } From e633c6b65a0c5e08f0a54329404da0c4e0d0be6b Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 9 May 2020 16:47:06 +1000 Subject: [PATCH 2/3] update version --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 67e2097..f09800b 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "number": "1.3.0", + "number": "1.3.1", "changelog": "**1.3.0 Changelog:**\n> • Music module has been rewritten for better stability and lots more features\n> • Force disconnecting Woomy from a voice channel no longer breaks music\n> • Music should (hopefully) break less in general\n> • Existing music commands have been rewritten\n> • Added the following new commands: fixmusic, movehere, movesong, playnext, shuffle, songinfo, volume\n> • Updated ship command\n**Notes:**\n> • This will be the final major update to Woomy V1, as we are shifting our focus to Woomy V2, which is a complete rewrite." } From 7c33e44e00abbb1e95a2c25c3dbbe17ddb548a1b Mon Sep 17 00:00:00 2001 From: mudkipscience Date: Sat, 9 May 2020 16:48:25 +1000 Subject: [PATCH 3/3] disable typing for music --- src/modules/music.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/music.js b/src/modules/music.js index d5b5d86..7e3083e 100644 --- a/src/modules/music.js +++ b/src/modules/music.js @@ -69,7 +69,7 @@ exports.play = async function (client, message, query, playNext, ignoreQueue) { const guild = exports.getGuild(message.guild.id) guild.message = message - message.channel.startTyping() + // message.channel.startTyping() if (!message.member.voice.channel && !guild.voiceChannel) { message.channel.stopTyping() @@ -240,9 +240,7 @@ exports.setVolume = function (guild, target) { exports.skip = function (guild, reason) { const g = exports.getGuild(guild.id) - g.skippers = [] - if (g.dispatcher) { g.dispatcher.end(reason) } -} +} \ No newline at end of file