catto.js 0.3.4 → 0.3.6

package/Bot.js

@@ -213,38 +213,7 @@ module.exports = class extends EventEmitter {
             "type": 1
           });
         } else {
-          var interaction = new Discord.BaseInteraction(this.client, req.body);
-          if (interaction.isCommand()) {
-            interaction = new Discord.CommandInteraction(this.client, req.body);
-            if (interaction.isChatInputCommand()) {
-              interaction = new Discord.ChatInputCommandInteraction(this.client, req.body);
-            }
-          } else if (interaction.isButton()) {
-            interaction = new Discord.ButtonInteraction(this.client, req.body);
-          }
-          interaction.reply = async options => {
-            if (this.deferred || this.replied) {
-              throw new Error("Already deferred or replied.");
-	    }
-            if (options.ephemeral !== null && options.ephemeral !== undefined) {
-              this.ephemeral = options.ephemeral;
-	    } else {
-              this.ephemeral = !1;
-            }
-            var messagePayload = null;
-            if (options instanceof Discord.MessagePayload) {
-              messagePayload = options;
-            } else {
-              messagePayload = Discord.MessagePayload.create(this, options);
-            }
-            var { body: data, files } = await messagePayload.resolveBody().resolveFiles();
-            res.json({
-              "type": 4,
-              data
-            });
-            this.replied = !0;
-          }
-          this.handleInteractionCreate(interaction);
+          this.client.actions.InteractionCreate.handle(req.body);
         }
       } else {
         res.status(401).end("Invalid request signature.");
@@ -283,11 +252,13 @@ module.exports = class extends EventEmitter {
       var button = this.buttons.get(interaction.customId);
       if (button) {
         try {
-          button({
+          button.execute({
             Discord,
             User,
             MessageBuilder,
             interaction,
+            button,
+            "args": button.args,
             "bot": this
           });
         } catch(e) {

package/MessageBuilder.js

@@ -99,7 +99,9 @@ class MessageBuilder {
       if (this.bot.buttons.get(basic.id)) {
         throw new Error("ID must be unique.");
       }
-      this.bot.buttons.set(basic.id, execute);
+      this.bot.buttons.set(basic.id, Object.assign(basic, {
+        execute
+      }));
     }
     return this;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catto.js",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Universal module for everything.",
   "main": "index.js",
   "scripts": {
@@ -39,9 +39,9 @@
     "jest": "^29.4.1"
   },
   "dependencies": {
-    "body-parser": "^1.20.1",
-    "discord.js": "^14.7.1",
-    "ejs": "^3.1.8",
+    "body-parser": "^1.20.2",
+    "discord.js": "^14.8.0",
+    "ejs": "^3.1.9",
     "express": "^4.18.2",
     "express-session": "^1.17.3",
     "express-ws": "^5.0.2",

package/utils.js

@@ -4,3 +4,15 @@ Array.prototype.remove = function(index) {
 Array.prototype.has = function(data) {
   return this.includes(data);
 };
+var utils = {};
+utils.waitFor = (obj, prop) => {
+  return new Promise(r => {
+    var i = setInterval(() => {
+      if (obj[prop]) {
+        clearInterval(i);
+        r();
+      }
+    }, 1);
+  });
+};
+module.exports = utils;