From 0cba164f3d33b646ea118c684969a0d6c2b086ff Mon Sep 17 00:00:00 2001
From: Dmytro Meleshko <dmytro.meleshko@gmail.com>
Date: Fri, 29 Jan 2021 19:15:18 +0200
Subject: [PATCH] get rid of @ts-ignore or something

---
 src/commands/admin.ts |  9 +++++----
 src/commands/info.ts  | 24 +++++++++---------------
 src/core/lib.ts       |  1 -
 3 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/commands/admin.ts b/src/commands/admin.ts
index 47279f9..35c3ff2 100644
--- a/src/commands/admin.ts
+++ b/src/commands/admin.ts
@@ -124,14 +124,15 @@ export default new Command({
             number: new Command({
                 description: "Amount of messages to delete.",
                 async run($: CommonLibrary): Promise<any> {
+                    if ($.channel.type === "dm") {
+                        await $.channel.send("Can't clear messages in the DMs!");
+                        return;
+                    }
                     $.message.delete();
                     const fetched = await $.channel.messages.fetch({
                         limit: $.args[0]
                     });
-                    $.channel
-                        /// @ts-ignore
-                        .bulkDelete(fetched)
-                        .catch((error: any) => $.channel.send(`Error: ${error}`));
+                    await $.channel.bulkDelete(fetched);
                 }
             })
         }),
diff --git a/src/commands/info.ts b/src/commands/info.ts
index 2de35d0..56b5277 100644
--- a/src/commands/info.ts
+++ b/src/commands/info.ts
@@ -1,6 +1,4 @@
 import {MessageEmbed, version as djsversion} from "discord.js";
-/// @ts-ignore
-import {version} from "../../package.json";
 import ms from "ms";
 import os from "os";
 import Command from "../core/command";
@@ -9,6 +7,8 @@ import {verificationLevels, filterLevels, regions, flags} from "../defs/info";
 import moment from "moment";
 import utc from "moment";
 
+const {version} = require("../../package.json");
+
 export default new Command({
     description: "Command to provide all sorts of info about the current server, a user, etc.",
     run: "Please provide an argument.\nFor help, run `%prefix%help info`.",
@@ -36,13 +36,6 @@ export default new Command({
             async run($: CommonLibrary): Promise<any> {
                 const core = os.cpus()[0];
                 const embed = new MessageEmbed()
-                    .setThumbnail(
-                        /// @ts-ignore
-                        $.client.user?.displayAvatarURL({
-                            dynamic: true,
-                            size: 2048
-                        })
-                    )
                     .setColor($.guild?.me?.displayHexColor || "BLUE")
                     .addField("General", [
                         `**❯ Client:** ${$.client.user?.tag} (${$.client.user?.id})`,
@@ -71,6 +64,11 @@ export default new Command({
                         `\u3000 • Used: ${formatBytes(process.memoryUsage().heapUsed)}`
                     ])
                     .setTimestamp();
+                const avatarURL = $.client.user?.displayAvatarURL({
+                    dynamic: true,
+                    size: 2048
+                });
+                if (avatarURL) embed.setThumbnail(avatarURL);
                 $.channel.send(embed);
             }
         }),
@@ -156,8 +154,7 @@ export default new Command({
                 .sort((a: {position: number}, b: {position: number}) => b.position - a.position)
                 .map((role: {toString: () => any}) => role.toString())
                 .slice(0, -1);
-            // @ts-ignore - Discord.js' typings seem to be outdated here. According to their v12 docs, it's User.fetchFlags() instead of User.flags.
-            const userFlags = ((await member.user.fetchFlags()) as UserFlags).toArray();
+            const userFlags = (await member.user.fetchFlags()).toArray();
 
             const embed = new MessageEmbed()
                 .setThumbnail(member.user.displayAvatarURL({dynamic: true, size: 512}))
@@ -183,10 +180,7 @@ export default new Command({
                     `**❯ Server Join Date:** ${moment(member.joinedAt).format("LL LTS")}`,
                     `**❯ Hoist Role:** ${member.roles.hoist ? member.roles.hoist.name : "None"}`,
                     `**❯ Roles:** [${roles.length}]: ${
-                        roles.length == 0 ? "None"
-                            : roles.length <= 10
-                                ? roles.join(", ")
-                                : trimArray(roles).join(", ")
+                        roles.length == 0 ? "None" : roles.length <= 10 ? roles.join(", ") : trimArray(roles).join(", ")
                     }`
                 ]);
             $.channel.send(embed);
diff --git a/src/core/lib.ts b/src/core/lib.ts
index 73231b4..0f5f193 100644
--- a/src/core/lib.ts
+++ b/src/core/lib.ts
@@ -554,7 +554,6 @@ export abstract class GenericStructure {
 
     public save(asynchronous = true) {
         const tag = this.__meta__;
-        /// @ts-ignore
         delete this.__meta__;
         FileManager.write(tag, this, asynchronous);
         this.__meta__ = tag;