catto.js 0.6.6 → 0.6.8

package/Bot.js

@@ -38,6 +38,8 @@ module.exports = class extends EventEmitter {
     this.buttons = new Map();
     this.commands = new Map();
     this.slashCommands = new Map();
+    this.userContexts = new Map();
+    this.messageContexts = new Map();
     if (this.options.debug) {
       this.client.on("debug", console.log);
     }
@@ -134,12 +136,33 @@ module.exports = class extends EventEmitter {
               break;
           }
         }
-        cmds.push(cmdo);
+        cmds.push(Object.assign(cmdo.toJSON(), {
+          "integration_types": [0, 1].slice(0, (cmd.user ? 2 : 1)),
+          "contexts": [0, 1, 2].slice(0, (cmd.user ? 3 : 2)),
+        }));
+      }
+      for (var cmd of this.userContexts.values()) {
+        var cmdo = new Discord.ContextMenuCommandBuilder();
+        cmdo.setType(2).setName(cmd.name).setDMPermission(cmd.dm);
+        cmds.push(Object.assign(cmdo.toJSON(), {
+          "integration_types": [0, 1].slice(0, (cmd.user ? 2 : 1)),
+          "contexts": [0, 1, 2].slice(0, (cmd.user ? 3 : 2)),
+        }));
+      }
+      for (var cmd of this.messageContexts.values()) {
+        var cmdo = new Discord.ContextMenuCommandBuilder();
+        cmdo.setType(3).setName(cmd.name).setDMPermission(cmd.dm);
+        cmds.push(Object.assign(cmdo.toJSON(), {
+          "integration_types": [0, 1].slice(0, (cmd.user ? 2 : 1)),
+          "contexts": [0, 1, 2].slice(0, (cmd.user ? 3 : 2)),
+        }));
       }
       if (this.options.slashListener) {
-        this.client.application.commands.set(cmds);
+        this.client.rest.put(`/applications/${this.client.application.id}/commands`, {
+          "body": cmds
+        });
       }
-      this.emit("running", { Discord, MessageBuilder });
+      this.emit("running", { Discord });
     });
     this.client.on("interactionCreate", this.handleInteractionCreate.bind(this));
     this.client.on("messageCreate", message => {
@@ -155,7 +178,6 @@ module.exports = class extends EventEmitter {
           command.execute({
             Discord,
             User,
-            MessageBuilder,
             message,
             cmd,
             args,
@@ -203,6 +225,28 @@ module.exports = class extends EventEmitter {
     }));
     return this;
   }
+  userContext(basic, executor) {
+    if (typeof basic === "string") {
+      basic = {
+        "name": basic
+      };
+    }
+    this.userContexts.set(basic.name, Object.assign(basic, {
+      "execute": executor
+    }));
+    return this;
+  }
+  messageContext(basic, executor) {
+    if (typeof basic === "string") {
+      basic = {
+        "name": basic
+      };
+    }
+    this.messageContexts.set(basic.name, Object.assign(basic, {
+      "execute": executor
+    }));
+    return this;
+  }
   command(basic, executor) {
     if (typeof basic === "string") {
       basic = {
@@ -270,6 +314,42 @@ module.exports = class extends EventEmitter {
       } else {
         interaction.reply({}).catch(() => {});
       }
+    } else if (this.options.slashListener && interaction.isUserContextMenuCommand()) {
+      var command = this.userContexts.get(interaction.commandName);
+      if (command) {
+        try {
+          command.execute({
+            Discord,
+            User,
+            MessageBuilder,
+            interaction,
+            "cmd": command.name,
+            "bot": this
+          });
+        } catch(e) {
+          console.log(e);
+        }
+      } else {
+        interaction.reply({}).catch(() => {});
+      }
+    } else if (this.options.slashListener && interaction.isMessageContextMenuCommand()) {
+      var command = this.messageContexts.get(interaction.commandName);
+      if (command) {
+        try {
+          command.execute({
+            Discord,
+            User,
+            MessageBuilder,
+            interaction,
+            "cmd": command.name,
+            "bot": this
+          });
+        } catch(e) {
+          console.log(e);
+        }
+      } else {
+        interaction.reply({}).catch(() => {});
+      }
     } else if (this.options.buttonListener && interaction.isButton()) {
       var button = this.buttons.get(interaction.customId);
       if (button) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catto.js",
-  "version": "0.6.6",
+  "version": "0.6.8",
   "description": "Universal module for everything.",
   "main": "index.js",
   "scripts": {