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: {