From fbefd0f10a9b687e43598cd57b99eb40b097e09f Mon Sep 17 00:00:00 2001 From: Essem Date: Thu, 2 Dec 2021 18:12:42 -0600 Subject: [PATCH] Tweak zamn, switch Eris to stable, added playing message, fix ping sending multiple messages --- commands/general/ping.js | 2 +- commands/image-editing/zamn.js | 4 ++-- messages.json | 1 + package-lock.json | 21 +++++++++++---------- package.json | 2 +- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/commands/general/ping.js b/commands/general/ping.js index 19f033a..2cbfd02 100644 --- a/commands/general/ping.js +++ b/commands/general/ping.js @@ -5,7 +5,7 @@ class PingCommand extends Command { const pingMessage = await this.client.createMessage(this.message.channel.id, Object.assign({ content: "🏓 Ping?" }, this.reference)); - return pingMessage.edit(`🏓 Pong!\n\`\`\`\nLatency: ${pingMessage.timestamp - this.message.timestamp}ms${this.message.channel.guild ? `\nShard Latency: ${Math.round(this.client.shards.get(this.client.guildShardMap[this.message.channel.guild.id]).latency)}ms` : ""}\n\`\`\``); + pingMessage.edit(`🏓 Pong!\n\`\`\`\nLatency: ${pingMessage.timestamp - this.message.timestamp}ms${this.message.channel.guild ? `\nShard Latency: ${Math.round(this.client.shards.get(this.client.guildShardMap[this.message.channel.guild.id]).latency)}ms` : ""}\n\`\`\``); } static description = "Pings Discord's servers"; diff --git a/commands/image-editing/zamn.js b/commands/image-editing/zamn.js index 4a15b25..1a9ad45 100644 --- a/commands/image-editing/zamn.js +++ b/commands/image-editing/zamn.js @@ -1,9 +1,9 @@ import ImageCommand from "../../classes/imageCommand.js"; class ZamnCommand extends ImageCommand { - static description = "ZAMN! SHES 12?"; + static description = "Adds a \"ZAMN\" reaction to an image"; - static noImage = "You need to provide an image to zamn at!"; + static noImage = "You need to provide an image to \"ZAMN\" at!"; static command = "zamn"; } diff --git a/messages.json b/messages.json index 3204719..f9ea7f3 100644 --- a/messages.json +++ b/messages.json @@ -148,6 +148,7 @@ "Something big is coming.", "This image has expired.", "The GIF File Format", + "Scrimblo Bimblo", "The clock is ticking." ] } \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 6390195..7133930 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13,7 +13,7 @@ "cowsay2": "^2.0.4", "dotenv": "^10.0.0", "emoji-regex": "^10.0.0", - "eris": "github:abalabahaha/eris#dev", + "eris": "^0.16.1", "eris-fleet": "github:esmBot/eris-fleet#development", "file-type": "^16.1.0", "format-duration": "^1.4.0", @@ -1138,9 +1138,9 @@ } }, "node_modules/eris": { - "version": "0.16.2-dev", - "resolved": "git+ssh://git@github.com/abalabahaha/eris.git#29a3a635a241a4ab8725c25afa839f29542e1731", - "license": "MIT", + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/eris/-/eris-0.16.1.tgz", + "integrity": "sha512-fqjgaddSvUlUjA7s85OvZimLrgCwX58Z6FXOIxdNFJdT6XReJ/LOWZKdew2CaalM8BvN2JKzn98HmKYb3zMhKg==", "dependencies": { "ws": "^8.2.3" }, @@ -1153,8 +1153,8 @@ } }, "node_modules/eris-fleet": { - "version": "0.3.9-dev", - "resolved": "git+ssh://git@github.com/esmBot/eris-fleet.git#991e0cf502134d917676ec43c761b584a217878a", + "version": "0.3.9-dev.0", + "resolved": "git+ssh://git@github.com/esmBot/eris-fleet.git#c9646800a2a6b9259d912f2051d6362860f88098", "license": "MIT", "peerDependencies": { "eris": "*" @@ -4542,8 +4542,9 @@ } }, "eris": { - "version": "git+ssh://git@github.com/abalabahaha/eris.git#29a3a635a241a4ab8725c25afa839f29542e1731", - "from": "eris@github:abalabahaha/eris#dev", + "version": "0.16.1", + "resolved": "https://registry.npmjs.org/eris/-/eris-0.16.1.tgz", + "integrity": "sha512-fqjgaddSvUlUjA7s85OvZimLrgCwX58Z6FXOIxdNFJdT6XReJ/LOWZKdew2CaalM8BvN2JKzn98HmKYb3zMhKg==", "requires": { "opusscript": "^0.0.8", "tweetnacl": "^1.0.3", @@ -4551,8 +4552,8 @@ } }, "eris-fleet": { - "version": "git+ssh://git@github.com/esmBot/eris-fleet.git#991e0cf502134d917676ec43c761b584a217878a", - "from": "eris-fleet@github:esmBot/eris-fleet#development", + "version": "git+ssh://git@github.com/esmBot/eris-fleet.git#c9646800a2a6b9259d912f2051d6362860f88098", + "from": "eris-fleet@esmBot/eris-fleet#development", "requires": {} }, "erlpack": { diff --git a/package.json b/package.json index e10a516..d8aeabf 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "cowsay2": "^2.0.4", "dotenv": "^10.0.0", "emoji-regex": "^10.0.0", - "eris": "github:abalabahaha/eris#dev", + "eris": "^0.16.1", "eris-fleet": "github:esmBot/eris-fleet#development", "file-type": "^16.1.0", "format-duration": "^1.4.0",