From 0bea856ad8b4383103b39bf8a731c47814f207da Mon Sep 17 00:00:00 2001 From: Joe Carter Date: Sat, 1 Aug 2015 05:57:23 +0100 Subject: [PATCH] More bug fixes --- plugins/basicBot/cmds/move.js | 9 +++++++-- plugins/mediaskip/main.js | 6 +++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/plugins/basicBot/cmds/move.js b/plugins/basicBot/cmds/move.js index bb21399..c7b4018 100644 --- a/plugins/basicBot/cmds/move.js +++ b/plugins/basicBot/cmds/move.js @@ -3,8 +3,13 @@ module.exports = function (basicBot) { if (message.from.rank >= this.core.ranks.BOUNCER) { var user = message.getUser(0); var target = message.getUser(1); - var position = target?target.getWaitlistPosition():parseInt(message.args[1]); - var waitlist = this.plug.room.getWaitlist(); + var position; + if (target !== undefined) { + position = target.getWaitlistPosition(); + } + else { + position = parseInt(message.args[1]); + } if (!user) { message.sendReply("Error, couldn't find user"); diff --git a/plugins/mediaskip/main.js b/plugins/mediaskip/main.js index 52edd10..07ae21b 100644 --- a/plugins/mediaskip/main.js +++ b/plugins/mediaskip/main.js @@ -54,9 +54,9 @@ mediaskip.events.plug_advance = function (advance) { } } if (missing.length > 0) { - mediaskip.plug.sendChat("/me [Skipped] Video unavailable in: " + missing.join(" ")); - mediaskip.plug.sendChat("/me http://polsy.org.uk/stuff/ytrestrict.cgi?ytid=" + advance.media.cid); - mediaskip.plug.moderateForceSkip(); + mediaskip.plug.room.sendChat("/me [Skipped] Video unavailable in: " + missing.join(" ")); + mediaskip.plug.room.sendChat("/me http://polsy.org.uk/stuff/ytrestrict.cgi?ytid=" + advance.media.cid); + mediaskip.plugged.skipDJ(mediaskip.plugged.getCurrentDJ().id); } }