Merge branch 'dev'

Fuechschen · Jul 9, 2016 · 4ced246 · 4ced246
2 parents 4644baa + 01df209
commit 4ced246
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/lib/commands/blacklist.js b/lib/commands/blacklist.js
@@ -13,14 +13,27 @@ module.exports = {
     names: ['blacklist', 'bl'],
     enabled: true,
     handler: function (data) {
-        redis.hget('user:roles',data.id).then(function (perm) {
+        redis.hget('user:roles', data.id).then(function (perm) {
             redis.exists('meta:state:skipable').then(function (ex) {
                 perm = parseInt(perm, 10);
                 if (perm > 1 && ex === 0) {
                     var booth = utils.clone(plugged.getBooth());
                     var media = utils.clone(plugged.getMedia());
+                    //todo locksip option
                     plugged.sendChat(utils.replace(langfile.blacklist.default, {username: data.username}), 60);
-                    plugged.skipDJ(booth.dj);
+                    if (config.blacklist.lockskip) {
+                        plugged.setCyclePromise(true).then(function () {
+                            return plugged.skipDJPromise(booth.dj);
+                        }).then(function () {
+                            if (config.lockskip.move_pos !== undefined) plugged.moveDJ(booth.dj, config.lockskip.move_pos);
+                            return Promise.resolve();
+                        }).then(function () {
+                            if (booth.shouldCycle !== plugged.doesWaitlistCycle()) return plugged.setCyclePromise(booth.shouldCycle);
+                            else Promise.resolve();
+                        }).catch(function (err) {
+                            story.error('Error while lockskipping.', {attach: err});
+                        });
+                    } else plugged.skipDJ(booth.dj);
                     redis.set('meta:state:skipable', 1).then(function () {
                         redis.expire('meta:state:skipable', 2);
                     });

diff --git a/lib/commands/lockskip.js b/lib/commands/lockskip.js
@@ -18,19 +18,14 @@ module.exports = {
                     plugged.sendChat(utils.replace(langfile.skip.lockskip, {username: data.username}), 70);
                     var booth = utils.clone(plugged.getBooth());
                     var media = utils.clone(plugged.getMedia());
-                    plugged.setLockPromise(true, false).then(function () {
-                        return plugged.setCyclePromise(true);
-                    }).then(function () {
+                    plugged.setCyclePromise(true).then(function () {
                         return plugged.skipDJPromise(booth.dj);
                     }).then(function () {
                         if (config.lockskip.move_pos !== undefined) plugged.moveDJ(booth.dj, config.lockskip.move_pos);
                         return Promise.resolve();
                     }).then(function () {
                         if (booth.shouldCycle !== plugged.doesWaitlistCycle()) return plugged.setCyclePromise(booth.shouldCycle);
                         else Promise.resolve();
-                    }).then(function () {
-                        if (booth.isLocked !== plugged.isWaitlistLocked()) plugged.setLockPromise(booth.isLocked, false);
-                        else return Promise.resolve();
                     }).then(function () {
                         var split = data.message.trim().split(' ');
                         if (langfile.skip.reasons[split[1]] !== undefined) {

diff --git a/lib/eventhandlers/advance.js b/lib/eventhandlers/advance.js
@@ -32,19 +32,14 @@ module.exports = {
                 if (plugged.getMedia().id === now.media.id) {
                     plugged.sendChat(error.preskip);
                     if (error.do_lockskip) {
-                        plugged.setLockPromise(true, false).then(function () {
-                            return plugged.setCyclePromise(true);
-                        }).then(function () {
+                        plugged.setCyclePromise(true).then(function () {
                             return plugged.skipDJPromise(booth.dj);
                         }).then(function () {
                             if (config.lockskip.move_pos !== undefined) plugged.moveDJ(booth.dj, config.lockskip.move_pos);
                             return Promise.resolve();
                         }).then(function () {
                             if (booth.shouldCycle !== plugged.doesWaitlistCycle()) return plugged.setCyclePromise(booth.shouldCycle);
                             else Promise.resolve();
-                        }).then(function () {
-                            if (booth.isLocked !== plugged.isWaitlistLocked()) plugged.setLockPromise(booth.isLocked, false);
-                            else return Promise.resolve();
                         }).then(function () {
                             plugged.sendChat(error.afterskip);
                             if (error.blacklist) db.blacklist.add(now.media.format, now.media.cid, error.bl_reason || undefined);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "plugbot",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "main": "bot.js",
   "description": "A simple bot for plug.dj",
   "author": "Fuechschen <me@fuechschen.org>",