catto.js 1.4.3 → 1.4.5

package/.github/workflows/publish.yml

@@ -1,32 +1,21 @@
-name: Publish
+name: Publish to NPM
 
 on:
   release:
     types: [created]
 
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
-        with:
-          node-version: 20
-      - run: npm i --package-lock-only
-      - run: npm ci
-      - run: npm test
+permissions:
+  id-token: write
+  contents: read
 
+jobs:
   publish-npm:
-    needs: build
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: 20
+          node-version: 24
           registry-url: https://registry.npmjs.org/
-      - run: npm i --package-lock-only
-      - run: npm ci
+      - run: npm i
       - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

package/Bot.js

@@ -3,6 +3,7 @@ var events = require("events");
 var Discord = require("discord.js");
 var djsws = require("@discordjs/ws");
 var { ClusterManager, ClusterClient, getInfo, ReClusterManager } = require("discord-hybrid-sharding");
+var fs = require("fs");
 var path = require("path");
 var User = require("./User");
 var MessageBuilder = require("./MessageBuilder");
@@ -23,7 +24,10 @@ module.exports = class extends EventEmitter {
       "debug": !1,
       "mobile": !1,
       "sharded": !1,
-      "partials": !1
+      "partials": !1,
+      "messageDeleteExecutor": !1,
+      "auditIndexation": !1,
+      "auditFile": null
     }, options || {});
     if (client) {
       this.client = client;
@@ -241,6 +245,26 @@ module.exports = class extends EventEmitter {
           });
         });
       }
+      if (this.options.auditIndexation) {
+        this.auditDatabase = {};
+        for (var server of this.servers) {
+          if (!server.members.me.permissions.has(Discord.PermissionsBitField.Flags.VIEW_AUDIT_LOG)) {
+            continue;
+          }
+          try {
+            var fetchedLogs = (await server.fetchAuditLogs({
+              "limit": 100,
+              "type": 72
+            })).entries.filter(log => log.targetType == "Message");
+            for (var log of fetchedLogs.values()) {
+              this.auditDatabase[log.id] = log.extra.count;
+            }
+          } catch {}
+        }
+        if (this.options.auditFile) {
+          fs.writeFileSync(this.options.auditFile.replace("%", this.cluster ? this.cluster.id.toString() : "0"), JSON.stringify(this.auditDatabase, null, 2));
+        }
+      }
       this.emit("running", { Discord });
       if (this.cluster && this.cluster.id == (this.cluster.count - 1)) {
         this.cluster.broadcastEval(client => client.emit("_runningFull"));
@@ -272,13 +296,48 @@ module.exports = class extends EventEmitter {
       }
       this.emit("message", message);
     });
-    this.client.on("messageDelete", message => {
+    this.client.on("messageDelete", async message => {
       if (message.author && !(message.author instanceof User)) {
         message.author = new User(message.author, this);
       }
       if (message.member && message.member.user && !(message.member.user instanceof User)) {
         message.member.user = new User(message.member.user, this);
       }
+      if (!this.options.messageDeleteExecutor) {
+        return this.emit("messageDeleted", message);
+      }
+      if (!message.guild.members.me.permissions.has(Discord.PermissionsBitField.Flags.VIEW_AUDIT_LOG)) {
+        return this.emit("messageDeleted", message);
+      }
+      try {
+        var fetchedLogs = (await message.guild.fetchAuditLogs({
+          "limit": 100,
+          "type": 72
+        })).entries.filter(log => log.targetType == "Message");
+      } catch {
+        return this.emit("messageDeleted", message);
+      }
+      var found = !1;
+      for (var log of fetchedLogs.values()) {
+        if (log.targetId != message.author.id || log.extra.channel.id != message.channel.id) {
+          continue;
+        }
+        if (this.auditDatabase[log.id] !== log.extra.count) {
+          if (!found) {
+            found = true;
+            message.deletedBy = new User(log.executor, this);
+            message.deletedById = log.executorId;
+          }
+          this.auditDatabase[log.id] = log.extra.count;
+        }
+      }
+      if (this.options.auditFile) {
+        fs.writeFileSync(this.options.auditFile.replace("%", this.cluster ? this.cluster.id.toString() : "0"), JSON.stringify(this.auditDatabase, null, 2));
+      }
+      if (!found) {
+        message.deletedBy = message.author;
+        message.deletedById = message.author.id;
+      }
       this.emit("messageDeleted", message);
     });
     this.client.on("guildCreate", guild => {
@@ -287,6 +346,13 @@ module.exports = class extends EventEmitter {
     this.client.on("guildDelete", guild => {
       this.emit("botDelete", guild);
     });
+    this.auditDatabase = {};
+    if (this.options.auditFile) {
+      if (!fs.existsSync(this.options.auditFile.replace("%", this.cluster ? this.cluster.id.toString() : "0"))) {
+        fs.writeFileSync(this.options.auditFile.replace("%", this.cluster ? this.cluster.id.toString() : "0"), "{}");
+      }
+      this.auditDatabase = JSON.parse(fs.readFileSync(this.options.auditFile.replace("%", this.cluster ? this.cluster.id.toString() : "0")).toString("utf-8"));
+    }
   }
   get cluster() {
     return this.client.cluster;
@@ -305,6 +371,12 @@ module.exports = class extends EventEmitter {
   get channels() {
     var r = Array.from(this.client.channels.cache.values());
     r.count = r.length;
+    if (this.options.sharded) {
+      return new Promise(async res => {
+        r.count = (await this.cluster.broadcastEval("this.channels.cache.size")).reduce((a, b) => a + b, 0);
+        res(r);
+      });
+    }
     return r;
   }
   slashCommand(basic, options, executor) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "catto.js",
-  "version": "1.4.3",
+  "version": "1.4.5",
   "description": "Universal module for everything.",
   "main": "index.js",
   "scripts": {
@@ -40,20 +40,20 @@
   },
   "homepage": "https://github.com/BoryaGames/catto.js#readme",
   "dependencies": {
-    "body-parser": "^1.20.2",
-    "discord-hybrid-sharding": "^3.0.0",
-    "discord.js": "^14.24.1",
+    "body-parser": "^1.20.4",
+    "discord-hybrid-sharding": "^3.0.1",
+    "discord.js": "^14.25.1",
     "ejs": "^3.1.10",
-    "express": "^4.19.2",
-    "express-session": "^1.18.0",
+    "express": "^4.22.1",
+    "express-session": "^1.18.2",
     "express-ws": "^5.0.2",
     "node-fetch": "^3.3.2",
-    "oci-common": "^2.118.0",
+    "oci-common": "^2.122.2",
     "session-file-store": "^1.5.0",
     "telegraf": "^4.16.3",
     "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "jest": "^30.0.5"
+    "jest": "^30.2.0"
   }
 }

package/utils.js

@@ -1,18 +1,35 @@
-Array.prototype.remove = function(index) {
-  return this.splice(index, 1)[0];
-};
-Array.prototype.has = function(data) {
-  return this.includes(data);
-};
-String.prototype.replaceAsync = async function(regex, asyncFn) {
-  var promises = [];
-  this.replace(regex, (full, ...args) => {
-    promises.push(asyncFn(full, ...args));
-    return full;
-  });
-  var data = await Promise.all(promises);
-  return this.replace(regex, () => data.shift());
-};
+Object.defineProperty(Array.prototype, "remove", {
+  "value": function(index) {
+    return this.splice(index, 1)[0];
+  },
+  "enumerable": false
+});
+Object.defineProperty(Array.prototype, "has", {
+  "value": function(data) {
+    return this.includes(data);
+  },
+  "enumerable": false
+});
+Object.defineProperty(Array.prototype, "random", {
+  "value": function() {
+    return this[Math.floor(Math.random() *this.length)];
+  },
+  "enumerable": false
+});
+
+Object.defineProperty(String.prototype, "replaceAsync", {
+  "value": async function(regex, asyncFn) {
+    var promises = [];
+    this.replace(regex, (full, ...args) => {
+      promises.push(asyncFn(full, ...args));
+      return full;
+    });
+    var data = await Promise.all(promises);
+    return this.replace(regex, () => data.shift());
+  },
+  "enumerable": false
+});
+
 var utils = {};
 utils.waitFor = (obj, prop) => {
   return new Promise(r => {