From 810fabc79481c220fe7e976f08216c708b00fe09 Mon Sep 17 00:00:00 2001
From: Vermium Sifell <vermium@zyner.org>
Date: Fri, 21 Oct 2022 20:14:14 +0200
Subject: [PATCH 1/4] =?UTF-8?q?=F0=9F=9A=A8=20Fixed=20some=20JS-C1003?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/index.ts                | 12 ++++++------
 src/schedules/shop/index.ts |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index b65b076..3d1cefe 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,8 +1,8 @@
 import { Client, Collection, GatewayIntentBits } from "discord.js"; // discord.js
 import "dotenv/config";
-import * as command from "./handlers/command";
-import * as event from "./handlers/event";
-import * as schedule from "./handlers/schedule";
+import { register as commandRegister } from "./handlers/command";
+import { register as eventRegister } from "./handlers/event";
+import { start as scheduleStart } from "./handlers/schedule";
 
 // Main process that starts all other sub processes
 const main = async () => {
@@ -19,9 +19,9 @@ const main = async () => {
   // Create command collection
   client.commands = new Collection();
 
-  await schedule.start(client);
-  await event.register(client);
-  await command.register(client);
+  await scheduleStart(client);
+  await eventRegister(client);
+  await commandRegister(client);
 
   // Authorize with Discord's API
   await client.login(process.env.DISCORD_TOKEN);
diff --git a/src/schedules/shop/index.ts b/src/schedules/shop/index.ts
index b2ef366..b1782c2 100644
--- a/src/schedules/shop/index.ts
+++ b/src/schedules/shop/index.ts
@@ -1,12 +1,12 @@
 // Dependencies
 import { Client } from "discord.js";
 
-import * as roles from "./modules/roles";
+import { execute as RolesExecute } from "./modules/roles";
 
 export const options = {
   schedule: "*/5 * * * *", // https://crontab.guru/
 };
 
 export const execute = async (client: Client) => {
-  await roles.execute(client);
+  await RolesExecute(client);
 };

From 6be605a8e3413fe1dea79525d8e5906faa033ed3 Mon Sep 17 00:00:00 2001
From: Vermium Sifell <vermium@zyner.org>
Date: Fri, 21 Oct 2022 20:19:04 +0200
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9A=A8=20Fixed=20some=20JS-0116?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/events/guildCreate/index.ts       | 2 +-
 src/events/guildDelete/index.ts       | 2 +-
 src/events/guildMemberAdd/index.ts    | 2 +-
 src/events/guildMemberRemove/index.ts | 2 +-
 src/events/ready/index.ts             | 2 +-
 src/handlers/cooldown/index.ts        | 6 +++---
 src/handlers/deployCommands/index.ts  | 8 +-------
 src/handlers/devMode/index.ts         | 4 ++--
 src/handlers/updatePresence/index.ts  | 2 +-
 src/helpers/addSeconds/index.ts       | 2 +-
 src/helpers/checkDirectory/index.ts   | 3 ++-
 src/schedules/timeouts/index.ts       | 2 +-
 12 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/events/guildCreate/index.ts b/src/events/guildCreate/index.ts
index 7250535..3d69ad2 100644
--- a/src/events/guildCreate/index.ts
+++ b/src/events/guildCreate/index.ts
@@ -11,7 +11,7 @@ export const options: IEventOptions = {
 export const execute = async (guild: Guild) => {
   const { client } = guild;
 
-  await updatePresence(client);
+  updatePresence(client);
 
   // Create guildMember object
   const createGuildMember = await prisma.guildMember.upsert({
diff --git a/src/events/guildDelete/index.ts b/src/events/guildDelete/index.ts
index 3258d70..dee5dc2 100644
--- a/src/events/guildDelete/index.ts
+++ b/src/events/guildDelete/index.ts
@@ -12,7 +12,7 @@ export const options: IEventOptions = {
 export const execute = async (guild: Guild) => {
   const { client } = guild;
 
-  await updatePresence(client);
+  updatePresence(client);
 
   // Delete guildMember objects
   const deleteGuildMembers = prisma.guildMember.deleteMany({
diff --git a/src/events/guildMemberAdd/index.ts b/src/events/guildMemberAdd/index.ts
index 2777b78..9296d4f 100644
--- a/src/events/guildMemberAdd/index.ts
+++ b/src/events/guildMemberAdd/index.ts
@@ -20,7 +20,7 @@ export const execute = async (member: GuildMember) => {
 
   await audits.execute(member);
   await joinMessage.execute(member);
-  await updatePresence(client);
+  updatePresence(client);
 
   // Create guildMember object
   const createGuildMember = await prisma.guildMember.upsert({
diff --git a/src/events/guildMemberRemove/index.ts b/src/events/guildMemberRemove/index.ts
index 7306b25..da262ba 100644
--- a/src/events/guildMemberRemove/index.ts
+++ b/src/events/guildMemberRemove/index.ts
@@ -20,7 +20,7 @@ export const execute = async (member: GuildMember) => {
 
   await audits.execute(member);
   await leaveMessage.execute(member);
-  await updatePresence(client);
+  updatePresence(client);
 
   // Delete guildMember object
   const deleteGuildMember = await prisma.guildMember.deleteMany({
diff --git a/src/events/ready/index.ts b/src/events/ready/index.ts
index d292d43..efb0c36 100644
--- a/src/events/ready/index.ts
+++ b/src/events/ready/index.ts
@@ -14,7 +14,7 @@ export const options: IEventOptions = {
 export const execute = async (client: Client) => {
   logger.info("Discord's API client is ready!");
 
-  await updatePresence(client);
+  updatePresence(client);
   await devMode(client);
   await deployCommands(client);
 };
diff --git a/src/handlers/cooldown/index.ts b/src/handlers/cooldown/index.ts
index cf443cb..e9b705c 100644
--- a/src/handlers/cooldown/index.ts
+++ b/src/handlers/cooldown/index.ts
@@ -25,7 +25,7 @@ export const command = async (i: CommandInteraction, cooldown: number) => {
   // If user is not on timeout
   if (hasTimeout) {
     const { userId, timeoutId, createdAt } = hasTimeout;
-    const overDue = (await addSeconds(cooldown, createdAt)) < new Date();
+    const overDue = addSeconds(cooldown, createdAt) < new Date();
 
     if (!overDue) {
       const diff = Math.round(
@@ -115,7 +115,7 @@ export const button = async (i: ButtonInteraction, cooldown: number) => {
   // If user is not on timeout
   if (hasTimeout) {
     const { userId, timeoutId, createdAt } = hasTimeout;
-    const overDue = (await addSeconds(cooldown, createdAt)) < new Date();
+    const overDue = addSeconds(cooldown, createdAt) < new Date();
 
     if (!overDue) {
       const diff = Math.round(
@@ -206,7 +206,7 @@ export const message = async (msg: Message, cooldown: number, id: string) => {
   // If user is not on timeout
   if (hasTimeout) {
     const { userId, timeoutId, createdAt } = hasTimeout;
-    const overDue = (await addSeconds(cooldown, createdAt)) < new Date();
+    const overDue = addSeconds(cooldown, createdAt) < new Date();
 
     if (!overDue) {
       const diff = Math.round(
diff --git a/src/handlers/deployCommands/index.ts b/src/handlers/deployCommands/index.ts
index c8d175e..da16d33 100644
--- a/src/handlers/deployCommands/index.ts
+++ b/src/handlers/deployCommands/index.ts
@@ -30,17 +30,11 @@ export default async (client: Client) => {
     .set(commandList, process.env.DISCORD_GUILD_ID)
     .then(async () => {
       logger.info(`Finished updating command list.`);
-    })
-    .catch(async (error) => {
-      logger.error(`${error}`);
     });
 
   if (process.env.NODE_ENV !== "production") {
     await client.application?.commands
       .set(commandList)
-      .then(async () => logger.info(`Finished updating guild command list.`))
-      .catch(async (error) => {
-        logger.error(`${error}`);
-      });
+      .then(async () => logger.info(`Finished updating guild command list.`));
   }
 };
diff --git a/src/handlers/devMode/index.ts b/src/handlers/devMode/index.ts
index 6757156..1c69b66 100644
--- a/src/handlers/devMode/index.ts
+++ b/src/handlers/devMode/index.ts
@@ -3,9 +3,9 @@ import logger from "../../middlewares/logger";
 
 export default async (client: Client) => {
   if (process.env.NODE_ENV !== "production") {
-    return client?.application?.commands
+    await client?.application?.commands
       ?.set([], process.env.DISCORD_GUILD_ID)
-      .then(async () => {
+      .then(() => {
         return logger.verbose(`Development mode is disabled.`);
       });
   }
diff --git a/src/handlers/updatePresence/index.ts b/src/handlers/updatePresence/index.ts
index e3fbe34..55a7d95 100644
--- a/src/handlers/updatePresence/index.ts
+++ b/src/handlers/updatePresence/index.ts
@@ -3,7 +3,7 @@ import { ActivityType, Client } from "discord.js";
 import logger from "../../middlewares/logger";
 
 // Function
-export default async (client: Client) => {
+export default (client: Client) => {
   if (!client?.user) throw new Error("Client's user is undefined.");
   const { guilds } = client;
 
diff --git a/src/helpers/addSeconds/index.ts b/src/helpers/addSeconds/index.ts
index 6c47b18..baa7d83 100644
--- a/src/helpers/addSeconds/index.ts
+++ b/src/helpers/addSeconds/index.ts
@@ -1,4 +1,4 @@
-export default async (seconds: number, date: Date) => {
+export default (seconds: number, date: Date) => {
   date.setSeconds(date.getSeconds() + seconds);
   return date;
 };
diff --git a/src/helpers/checkDirectory/index.ts b/src/helpers/checkDirectory/index.ts
index d70afc5..30fa6bc 100644
--- a/src/helpers/checkDirectory/index.ts
+++ b/src/helpers/checkDirectory/index.ts
@@ -2,5 +2,6 @@ import fs from "fs";
 const fsPromises = fs.promises;
 
 export default async (path: string) => {
-  return fsPromises.readdir(path);
+  const result = fsPromises.readdir(path);
+  return result;
 };
diff --git a/src/schedules/timeouts/index.ts b/src/schedules/timeouts/index.ts
index 764d825..9964892 100644
--- a/src/schedules/timeouts/index.ts
+++ b/src/schedules/timeouts/index.ts
@@ -16,7 +16,7 @@ export const execute = async () => {
   for await (const timeout of getCooldown) {
     const { guildId, userId, timeoutId, cooldown, createdAt } = timeout;
 
-    const overDue = (await addSeconds(cooldown, createdAt)) < new Date();
+    const overDue = addSeconds(cooldown, createdAt) < new Date();
 
     if (overDue) {
       logger.info(timeout);

From f34cf8dd91f093807c21c6d899779ee7e7fcf867 Mon Sep 17 00:00:00 2001
From: Vermium Sifell <vermium@zyner.org>
Date: Fri, 21 Oct 2022 20:21:15 +0200
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=9A=A8=20Fixed=20more=20JS-0116?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/handlers/deployCommands/index.ts | 10 +++++-----
 src/helpers/checkDirectory/index.ts  |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/handlers/deployCommands/index.ts b/src/handlers/deployCommands/index.ts
index da16d33..4b30c96 100644
--- a/src/handlers/deployCommands/index.ts
+++ b/src/handlers/deployCommands/index.ts
@@ -13,28 +13,28 @@ export default async (client: Client) => {
   logger.info("Gathering command list");
 
   await Promise.all(
-    client.commands.map(async (commandData: ICommand) => {
+    client.commands.map((commandData: ICommand) => {
       commandList.push(commandData.builder.toJSON());
 
       logger.verbose(`${commandData.builder.name} pushed to list`);
     })
   )
-    .then(async () => {
+    .then(() => {
       logger.info(`Finished gathering command list.`);
     })
-    .catch(async (error) => {
+    .catch((error) => {
       throw new Error(`Could not gather command list: ${error}`);
     });
 
   await client.application?.commands
     .set(commandList, process.env.DISCORD_GUILD_ID)
-    .then(async () => {
+    .then(() => {
       logger.info(`Finished updating command list.`);
     });
 
   if (process.env.NODE_ENV !== "production") {
     await client.application?.commands
       .set(commandList)
-      .then(async () => logger.info(`Finished updating guild command list.`));
+      .then(() => logger.info(`Finished updating guild command list.`));
   }
 };
diff --git a/src/helpers/checkDirectory/index.ts b/src/helpers/checkDirectory/index.ts
index 30fa6bc..de33ba1 100644
--- a/src/helpers/checkDirectory/index.ts
+++ b/src/helpers/checkDirectory/index.ts
@@ -2,6 +2,6 @@ import fs from "fs";
 const fsPromises = fs.promises;
 
 export default async (path: string) => {
-  const result = fsPromises.readdir(path);
+  const result = await fsPromises.readdir(path);
   return result;
 };

From 426eb7a85c1e7164d0840928d878e7988db04c48 Mon Sep 17 00:00:00 2001
From: Vermium Sifell <vermium@zyner.org>
Date: Fri, 21 Oct 2022 20:24:05 +0200
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=9A=A8=20Fixed=20more=20code=20smells?=
 =?UTF-8?q?=20(JS-D1001)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/events/guildCreate/index.ts       | 1 +
 src/events/guildDelete/index.ts       | 1 +
 src/events/guildMemberAdd/index.ts    | 1 +
 src/events/guildMemberRemove/index.ts | 1 +
 src/events/ready/index.ts             | 1 +
 src/handlers/cooldown/index.ts        | 3 +++
 src/schedules/shop/index.ts           | 1 +
 7 files changed, 9 insertions(+)

diff --git a/src/events/guildCreate/index.ts b/src/events/guildCreate/index.ts
index 3d69ad2..42653b0 100644
--- a/src/events/guildCreate/index.ts
+++ b/src/events/guildCreate/index.ts
@@ -8,6 +8,7 @@ export const options: IEventOptions = {
   type: "on",
 };
 
+// Execute the function
 export const execute = async (guild: Guild) => {
   const { client } = guild;
 
diff --git a/src/events/guildDelete/index.ts b/src/events/guildDelete/index.ts
index dee5dc2..3bac8bd 100644
--- a/src/events/guildDelete/index.ts
+++ b/src/events/guildDelete/index.ts
@@ -9,6 +9,7 @@ export const options: IEventOptions = {
   type: "on",
 };
 
+// Execute the function
 export const execute = async (guild: Guild) => {
   const { client } = guild;
 
diff --git a/src/events/guildMemberAdd/index.ts b/src/events/guildMemberAdd/index.ts
index 9296d4f..fc71e62 100644
--- a/src/events/guildMemberAdd/index.ts
+++ b/src/events/guildMemberAdd/index.ts
@@ -11,6 +11,7 @@ export const options: IEventOptions = {
   type: "on",
 };
 
+// Execute the function
 export const execute = async (member: GuildMember) => {
   const { client, user, guild } = member;
 
diff --git a/src/events/guildMemberRemove/index.ts b/src/events/guildMemberRemove/index.ts
index da262ba..bbe61ad 100644
--- a/src/events/guildMemberRemove/index.ts
+++ b/src/events/guildMemberRemove/index.ts
@@ -11,6 +11,7 @@ export const options: IEventOptions = {
   type: "on",
 };
 
+// Execute the function
 export const execute = async (member: GuildMember) => {
   const { client, user, guild } = member;
 
diff --git a/src/events/ready/index.ts b/src/events/ready/index.ts
index efb0c36..b91a36a 100644
--- a/src/events/ready/index.ts
+++ b/src/events/ready/index.ts
@@ -11,6 +11,7 @@ export const options: IEventOptions = {
   type: "once",
 };
 
+// Execute the event
 export const execute = async (client: Client) => {
   logger.info("Discord's API client is ready!");
 
diff --git a/src/handlers/cooldown/index.ts b/src/handlers/cooldown/index.ts
index e9b705c..6721ccd 100644
--- a/src/handlers/cooldown/index.ts
+++ b/src/handlers/cooldown/index.ts
@@ -4,6 +4,7 @@ import addSeconds from "../../helpers/addSeconds";
 import logger from "../../middlewares/logger";
 import prisma from "../database";
 
+// Command cooldown
 export const command = async (i: CommandInteraction, cooldown: number) => {
   const { guild, user, commandId } = i;
 
@@ -94,6 +95,7 @@ export const command = async (i: CommandInteraction, cooldown: number) => {
   logger.silly(createCooldown);
 };
 
+// Button cooldown
 export const button = async (i: ButtonInteraction, cooldown: number) => {
   const { guild, user, customId } = i;
 
@@ -184,6 +186,7 @@ export const button = async (i: ButtonInteraction, cooldown: number) => {
   logger.silly(createCooldown);
 };
 
+// Message cooldown
 export const message = async (msg: Message, cooldown: number, id: string) => {
   const { guild, member } = msg;
 
diff --git a/src/schedules/shop/index.ts b/src/schedules/shop/index.ts
index b1782c2..c99a542 100644
--- a/src/schedules/shop/index.ts
+++ b/src/schedules/shop/index.ts
@@ -7,6 +7,7 @@ export const options = {
   schedule: "*/5 * * * *", // https://crontab.guru/
 };
 
+// Execute the function
 export const execute = async (client: Client) => {
   await RolesExecute(client);
 };