From 0775437ea506807cb20491e0c99af699adf7b2f1 Mon Sep 17 00:00:00 2001 From: Johannes Andersen Date: Fri, 11 Mar 2016 09:10:20 +0100 Subject: [PATCH 1/3] Fixed "!locksip " Adds #71 Fixed #69 issue Added #71 100% tested. ready to merge --- basicBot.js | 54 +++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 46 insertions(+), 8 deletions(-) diff --git a/basicBot.js b/basicBot.js index da9d0d57..a8b243a2 100644 --- a/basicBot.js +++ b/basicBot.js @@ -2598,6 +2598,7 @@ if (this.type === 'exact' && chat.message.length !== cmd.length) return void (0); if (!basicBot.commands.executable(this.rank, chat)) return void (0); else { + $.getJSON('https://stg.plug.dj/_/rooms/state', function(data) { if (basicBot.room.skippable) { var dj = API.getDJ(); var id = dj.id; @@ -2607,7 +2608,22 @@ if (chat.message.length === cmd.length) { API.sendChat(subChat(basicBot.chat.usedlockskip, {name: chat.un})); - basicBot.roomUtilities.booth.lockBooth(); + + if (data.data[0].booth.shouldCycle) { + setTimeout(function (id) { + API.moderateForceSkip(); + basicBot.room.skippable = false; + setTimeout(function () { + basicBot.room.skippable = true + }, 5 * 1000); + setTimeout(function (id) { + basicBot.userUtilities.moveUser(id, basicBot.settings.lockskipPosition, false); + basicBot.room.queueable = true; + }, 1500, id); + }, 1000, id); + + }else if (!data.data[0].booth.shouldCycle) { + basicBot.roomUtilities.changeDJCycle(); setTimeout(function (id) { API.moderateForceSkip(); basicBot.room.skippable = false; @@ -2618,25 +2634,42 @@ basicBot.userUtilities.moveUser(id, basicBot.settings.lockskipPosition, false); basicBot.room.queueable = true; setTimeout(function () { - basicBot.roomUtilities.booth.unlockBooth(); + basicBot.roomUtilities.changeDJCycle(); }, 1000); }, 1500, id); }, 1000, id); + } + return void (0); } var validReason = false; var msg = chat.message; var reason = msg.substring(cmd.length + 1); - for (var i = 0; i < basicBot.settings.lockskipReasons.length; i++) { - var r = basicBot.settings.lockskipReasons[i][0]; + for (var i = 0; i < basicBot.settings.skipReasons.length; i++) { + var r = basicBot.settings.skipReasons[i][0]; if (reason.indexOf(r) !== -1) { validReason = true; - msgSend += basicBot.settings.lockskipReasons[i][1]; + msgSend += basicBot.settings.skipReasons[i][1]; } } if (validReason) { API.sendChat(subChat(basicBot.chat.usedlockskip, {name: chat.un})); - basicBot.roomUtilities.booth.lockBooth(); + if (data.data[0].booth.shouldCycle) { + setTimeout(function (id) { + API.moderateForceSkip(); + basicBot.room.skippable = false; + API.sendChat(msgSend); + setTimeout(function () { + basicBot.room.skippable = true + }, 5 * 1000); + setTimeout(function (id) { + basicBot.userUtilities.moveUser(id, basicBot.settings.lockskipPosition, false); + basicBot.room.queueable = true; + }, 1500, id); + }, 1000, id); + + }else { + basicBot.roomUtilities.changeDJCycle(); setTimeout(function (id) { API.moderateForceSkip(); basicBot.room.skippable = false; @@ -2648,15 +2681,20 @@ basicBot.userUtilities.moveUser(id, basicBot.settings.lockskipPosition, false); basicBot.room.queueable = true; setTimeout(function () { - basicBot.roomUtilities.booth.unlockBooth(); + basicBot.roomUtilities.changeDJCycle(); }, 1000); }, 1500, id); }, 1000, id); + + } + + return void (0); } } + }); } - } + } }, locktimerCommand: { From 6fa4d65a2a30017123445e476aedefad965648b7 Mon Sep 17 00:00:00 2001 From: Johannes Andersen Date: Fri, 11 Mar 2016 10:01:28 +0100 Subject: [PATCH 2/3] Updated the smartSkip Not tested, should work. --- basicBot.js | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/basicBot.js b/basicBot.js index a8b243a2..73b9e555 100644 --- a/basicBot.js +++ b/basicBot.js @@ -713,9 +713,11 @@ var waitlistlength = API.getWaitList().length; var locked = false; basicBot.room.queueable = false; - + $.getJSON('https://stg.plug.dj/_/rooms/state', function(data) { if (waitlistlength == 50) { - basicBot.roomUtilities.booth.lockBooth(); + if (data.data[0].booth.shouldCycle) { + basicBot.roomUtilities.changeDJCycle(); + } locked = true; } setTimeout(function (id) { @@ -734,11 +736,12 @@ basicBot.room.queueable = true; if (locked) { setTimeout(function () { - basicBot.roomUtilities.booth.unlockBooth(); + basicBot.roomUtilities.changeDJCycle(); }, 1000); } }, 1500, id); }, 1000, id); + }); }, changeDJCycle: function () { $.getJSON('https://stg.plug.dj/_/rooms/state', function(data) { From e1557e7777592797dbe4633329387edd708ac3c6 Mon Sep 17 00:00:00 2001 From: Johannes Andersen Date: Mon, 29 Aug 2016 10:20:31 +0200 Subject: [PATCH 3/3] rip ";" --- basicBot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basicBot.js b/basicBot.js index 73b9e555..bd5b7ba4 100644 --- a/basicBot.js +++ b/basicBot.js @@ -2663,7 +2663,7 @@ basicBot.room.skippable = false; API.sendChat(msgSend); setTimeout(function () { - basicBot.room.skippable = true + basicBot.room.skippable = true; }, 5 * 1000); setTimeout(function (id) { basicBot.userUtilities.moveUser(id, basicBot.settings.lockskipPosition, false);