More bug fixes

WritheM · Aug 1, 2015 · 0bea856 · 0bea856
1 parent cdf39a1
commit 0bea856
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git 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
@@ -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);
                     }
 
                 }