From a8298d4faa38d7720fd3af0949070bb454fd4ce2 Mon Sep 17 00:00:00 2001
From: almeidx <almeidx@pm.me>
Date: Thu, 29 Jul 2021 01:43:50 +0100
Subject: [PATCH] fixed jumbo cmd, simplified checks and fixed ping cmd

---
 .../src/plugins/Utility/commands/JumboCmd.ts  | 35 +++++++++----------
 .../src/plugins/Utility/commands/PingCmd.ts   |  5 ++-
 .../Utility/commands/VcdisconnectCmd.ts       |  2 +-
 .../src/plugins/Utility/commands/VcmoveCmd.ts |  2 +-
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/backend/src/plugins/Utility/commands/JumboCmd.ts b/backend/src/plugins/Utility/commands/JumboCmd.ts
index 4e2e99a7..bc117d45 100644
--- a/backend/src/plugins/Utility/commands/JumboCmd.ts
+++ b/backend/src/plugins/Utility/commands/JumboCmd.ts
@@ -1,3 +1,4 @@
+import { MessageAttachment } from "discord.js";
 import fs from "fs";
 import sharp from "sharp";
 import twemoji from "twemoji";
@@ -39,8 +40,8 @@ export const JumboCmd = utilityCmd({
     const size = config.jumbo_size > 2048 ? 2048 : config.jumbo_size;
     const emojiRegex = new RegExp(`(<.*:).*:(\\d+)`);
     const results = emojiRegex.exec(args.emoji);
-    let extention = ".png";
-    let file;
+    let extension = ".png";
+    let file: MessageAttachment | undefined;
 
     if (!isEmoji(args.emoji)) {
       sendErrorMessage(pluginData, msg.channel, "Invalid emoji");
@@ -50,25 +51,19 @@ export const JumboCmd = utilityCmd({
     if (results) {
       let url = "https://cdn.discordapp.com/emojis/";
       if (results[1] === "<a:") {
-        extention = ".gif";
+        extension = ".gif";
       }
-      url += `${results[2]}${extention}`;
-      if (extention === ".png") {
+      url += `${results[2]}${extension}`;
+      if (extension === ".png") {
         const image = await resizeBuffer(await getBufferFromUrl(url), size, size);
-        file = {
-          name: `emoji${extention}`,
-          file: image,
-        };
+        file = new MessageAttachment(image, `emoji${extension}`);
       } else {
         const image = await getBufferFromUrl(url);
-        file = {
-          name: `emoji${extention}`,
-          file: image,
-        };
+        file = new MessageAttachment(image, `emoji${extension}`);
       }
     } else {
       let url = CDN_URL + `/${twemoji.convert.toCodePoint(args.emoji)}.svg`;
-      let image;
+      let image: Buffer | undefined;
       try {
         image = await resizeBuffer(await getBufferFromUrl(url), size, size);
       } catch {
@@ -77,12 +72,14 @@ export const JumboCmd = utilityCmd({
           image = await resizeBuffer(await getBufferFromUrl(url), size, size);
         }
       }
-      file = {
-        name: `emoji.png`,
-        file: image,
-      };
+      if (!image) {
+        sendErrorMessage(pluginData, msg.channel, "Invalid emoji");
+        return;
+      }
+
+      file = new MessageAttachment(image, "emoji.png");
     }
 
-    msg.channel.send({ content: "", files: [file] });
+    msg.channel.send({ files: [file] });
   },
 });
diff --git a/backend/src/plugins/Utility/commands/PingCmd.ts b/backend/src/plugins/Utility/commands/PingCmd.ts
index 8739bfde..842d3742 100644
--- a/backend/src/plugins/Utility/commands/PingCmd.ts
+++ b/backend/src/plugins/Utility/commands/PingCmd.ts
@@ -29,8 +29,6 @@ export const PingCmd = utilityCmd({
     const lowest = Math.round(Math.min(...times));
     const mean = Math.round(times.reduce((total, ms) => total + ms, 0) / times.length);
 
-    // const shard = pluginData.client.shards.get(pluginData.client.guildShardMap[pluginData.guild.id])!; FIXME sharding stuff
-
     msg.channel.send(
       trimLines(`
       **Ping:**
@@ -38,7 +36,8 @@ export const PingCmd = utilityCmd({
       Highest: **${highest}ms**
       Mean: **${mean}ms**
       Time between ping command and first reply: **${msgToMsgDelay!}ms**
-    `), // Omitted line: Shard latency: **${shard.latency}ms**
+      Shard latency: **${pluginData.client.ws.ping}ms**
+    `),
     );
 
     // Clean up test messages
diff --git a/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts b/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts
index d473b491..c5d4b14d 100644
--- a/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts
+++ b/backend/src/plugins/Utility/commands/VcdisconnectCmd.ts
@@ -25,7 +25,7 @@ export const VcdisconnectCmd = utilityCmd({
       return;
     }
 
-    if (!args.member.voice || !args.member.voice.channelId) {
+    if (!args.member.voice?.channelId) {
       sendErrorMessage(pluginData, msg.channel, "Member is not in a voice channel");
       return;
     }
diff --git a/backend/src/plugins/Utility/commands/VcmoveCmd.ts b/backend/src/plugins/Utility/commands/VcmoveCmd.ts
index 0e7bface..9e51dd5b 100644
--- a/backend/src/plugins/Utility/commands/VcmoveCmd.ts
+++ b/backend/src/plugins/Utility/commands/VcmoveCmd.ts
@@ -57,7 +57,7 @@ export const VcmoveCmd = utilityCmd({
       channel = closestMatch;
     }
 
-    if (!args.member.voice || !args.member.voice.channelId) {
+    if (!args.member.voice?.channelId) {
       sendErrorMessage(pluginData, msg.channel, "Member is not in a voice channel");
       return;
     }