args and more

commands/response/roll.js

@@ -11,26 +11,23 @@ module.exports = class RollChooseCommand extends commando.Command {
             group: 'response',
             memberName: 'roll',
             description: 'Rolls a Dice of your choice. (;roll 6)',
-            examples: [';roll 6']
+            examples: [';roll 6'],
+            args: [{
+                key: 'number',
+                prompt: 'Which number do you want to roll?',
+                type: 'integer',
+                default: 6
+            }]
         });
     }
 
-    run(message) {
+    run(message, args) {
         if (message.channel.type !== 'dm') {
             if (!message.channel.permissionsFor(this.client.user).hasPermission(['SEND_MESSAGES', 'READ_MESSAGES'])) return;
         }
         console.log(`[Command] ${message.content}`);
-        let [value] = message.content.split(" ").slice(1);
-        if (!value) {
-            let roll = Math.floor(Math.random() * 6) + 1;
-            return message.channel.send(`You rolled a ${roll}.`);
-        }
-        else if (value.match(/^[0-9]+$/)) {
-            let roll = Math.floor(Math.random() * value) + 1;
-            return message.channel.send(`You rolled a ${roll}.`);
-        }
-        else {
-            return message.channel.send(":x: Error! Your message either contains a number but the number is invalid, or the number is in the wrong place.\n:notepad_spiral: (Note: When using numbers such as 1,000, do not use a comma)");
-        }
+        let value = args.number;
+        let roll = Math.floor(Math.random() * value) + 1;
+        return message.channel.send(`You rolled a ${roll}.`);
     }
 };