Merge pull request #357 from symposion/develop

fix(rests): Fix error when resting as player not GM (again!)
symposion · Feb 26, 2017 · acfe73a · acfe73a
2 parents 109a543 + b7baff9
commit acfe73a
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/command-parser.js b/lib/command-parser.js
@@ -191,13 +191,14 @@ class Command {
     }
 
     if (!playerIsGM) {
-      _.compact([].concat(finalOptions.selected && finalOptions.selected.character).concat(finalOptions.character))
-        .forEach((character) => {
-          if (!character.controlledby ||
-            (!character.controlledby.contains(playerId) && !character.controlledby.contains('all'))) {
-            throw new UserError(`You do not have permission to make changes to character ${character.get('name')}`);
-          }
-        });
+      const characters = _.compact([].concat(finalOptions.selected && finalOptions.selected.character)
+        .concat(finalOptions.character));
+      characters.forEach((character) => {
+        const controlledby = character.get('controlledby');
+        if (!controlledby || (controlledby.indexOf(playerId) === -1 && controlledby.indexOf('all') === -1)) {
+          throw new UserError(`You do not have permission to make changes to character ${character.get('name')}`);
+        }
+      });
     }
 
     return this.handler(finalOptions);