catto.js 0.3.5 → 0.3.7

package/Bot.js

@@ -3,7 +3,8 @@ var events = require("events");
 var Discord = require("discord.js");
 var User = require("./User");
 var MessageBuilder = require("./MessageBuilder");
-if (typeof EventEmitter !== "undefined") {} else {
+var Base64 = require("./Base64");
+if (typeof EventEmitter === "undefined") {
   var { EventEmitter } = events;
 }
 module.exports = class extends EventEmitter {
@@ -14,7 +15,8 @@ module.exports = class extends EventEmitter {
       "intents": 98045,
       "apiv": 10,
       "slashListener": !0,
-      "publicKey": ""
+      "publicKey": "",
+      "debug": !1
     }, options || {});
     if (client) {
       this.client = client;
@@ -34,6 +36,9 @@ module.exports = class extends EventEmitter {
     this.buttons = new Map();
     this.commands = new Map();
     this.slashCommands = new Map();
+    if (this.options.debug) {
+      this.client.on("debug", console.log);
+    }
     this.client.on("ready", () => {
       var cmds = [];
       for (var cmd of this.slashCommands.values()) {
@@ -126,7 +131,7 @@ module.exports = class extends EventEmitter {
       if (this.options.slashListener) {
         this.client.application.commands.set(cmds);
       }
-      this.emit("running");
+      this.emit("running", { Discord, MessageBuilder });
     });
     this.client.on("interactionCreate", this.handleInteractionCreate.bind(this));
     this.client.on("messageCreate", message => {
@@ -154,6 +159,33 @@ module.exports = class extends EventEmitter {
       }
       this.emit("message", message);
     });
+    this.deleteKey = "";
+    this.client.on("messageDelete", message => {
+      message.author = new User(message.author, this);
+      if (message.member) {
+        message.member.user = new User(message.member.user, this);
+      }
+      var deleteCache = JSON.parse(Base64.decode(this.deleteKey));
+      setTimeout(async() => {
+        var log = await message.guild.fetchAuditLogs({
+          "type": 72,
+          "limit": 50
+        });
+        var now = log.entries.filter(l => l.targetId == message.author.id).first();
+        if (deleteCache[message.author.id] && now.id == deleteCache[message.author.id].id) {
+          if (now.extra.count > deleteCache[message.author.id].extra.count) {
+            message.deletedBy = new User(now.executor, this);
+          } else {
+            message.deletedBy = message.author;
+          }
+        } else {
+          message.deletedBy = new User(now.executor, this);
+        }
+        deleteCache[message.author.id] = now;
+        this.deleteKey = Base64.encode(JSON.stringify(deleteCache));
+        this.emit("messageDeleted", message);
+      }, 1e3);
+    });
     this.client.on("guildCreate", guild => {
       this.emit("botAdd", guild);
     });
@@ -161,6 +193,11 @@ module.exports = class extends EventEmitter {
       this.emit("botDelete", guild);
     });
   }
+  get servers() {
+    var r = Array.from(this.client.guilds.values());
+    r.count = r.length;
+    return r;
+  }
   slashCommand(basic, options, executor) {
     if (!basic.name.startsWith("/")) {
       throw new Error("Slash command starts with /.");
@@ -213,38 +250,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.");
@@ -252,11 +258,11 @@ module.exports = class extends EventEmitter {
     }
   }
   handleInteractionCreate(interaction) {
+    interaction.user = new User(interaction.user, this);
+    if (interaction.member) {
+      interaction.member.user = new User(interaction.member.user, this);
+    }
     if (interaction.isChatInputCommand()) {
-      interaction.user = new User(interaction.user, this);
-      if (interaction.member) {
-        interaction.member.user = new User(interaction.member.user, this);
-      }
       var command = this.slashCommands.get(interaction.commandName);
       if (command) {
         try {
@@ -274,12 +280,7 @@ module.exports = class extends EventEmitter {
       } else {
         interaction.reply({}).catch(() => {});
       }
-    }
-    if (interaction.isButton()) {
-      interaction.user = new User(interaction.user, this);
-      if (interaction.member) {
-        interaction.member.user = new User(interaction.member.user, this);
-      }
+    } else if (interaction.isButton()) {
       var button = this.buttons.get(interaction.customId);
       if (button) {
         try {
@@ -298,6 +299,8 @@ module.exports = class extends EventEmitter {
       } else {
         interaction.reply({}).catch(() => {});
       }
+    } else {
+      this.emit("interaction", interaction);
     }
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catto.js",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "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;