From c7c3aae86781ffe5dd1812b8dabb48bf1f7cd58a Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Fri, 14 Oct 2022 12:59:34 +0200 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=A7=91=E2=80=8D=F0=9F=92=BB=20Fixed?= =?UTF-8?q?=20some=20more=20code=20smells=20again?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/events/messageUpdate/audits.ts | 13 +++++++------ src/plugins/events/messageUpdate/modules/counter.ts | 9 ++++----- src/plugins/events/rateLimit/index.ts | 5 ++--- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/plugins/events/messageUpdate/audits.ts b/src/plugins/events/messageUpdate/audits.ts index 81ab688..263bf5e 100644 --- a/src/plugins/events/messageUpdate/audits.ts +++ b/src/plugins/events/messageUpdate/audits.ts @@ -1,5 +1,5 @@ /* eslint-disable no-loops/no-loops */ -import { EmbedBuilder, Message, TextChannel } from "discord.js"; +import { ChannelType, EmbedBuilder, Message } from "discord.js"; import getEmbedConfig from "../../../helpers/getEmbedData"; import logger from "../../../middlewares/logger"; import guildSchema from "../../../models/guild"; @@ -29,9 +29,10 @@ export default { const channel = client.channels.cache.get(`${guildData.audits.channelId}`); - if (channel === null) return; + if (!channel) return; + if (channel.type !== ChannelType.GuildText) return; - (channel as TextChannel) + channel .send({ embeds: [ new EmbedBuilder() @@ -52,13 +53,13 @@ export default { }), ], }) - .then(async () => { + .then(() => { logger.info( `Audit log sent for event messageUpdate in guild ${newMessage?.guild?.name} (${newMessage?.guild?.id})` ); }) - .catch(async () => { - logger.error( + .catch(() => { + throw new Error( `Audit log failed to send for event messageUpdate in guild ${newMessage?.guild?.name} (${newMessage?.guild?.id})` ); }); diff --git a/src/plugins/events/messageUpdate/modules/counter.ts b/src/plugins/events/messageUpdate/modules/counter.ts index b969358..f0ed934 100644 --- a/src/plugins/events/messageUpdate/modules/counter.ts +++ b/src/plugins/events/messageUpdate/modules/counter.ts @@ -1,6 +1,5 @@ // Dependencies import { Message } from "discord.js"; - // Models import logger from "../../../../middlewares/logger"; import counterSchema from "../../../../models/counter"; @@ -24,12 +23,12 @@ export default async (message: Message) => { ); await message - ?.delete() - ?.then(async () => { + .delete() + .then(async () => { await channel?.send(`${author} said **${word}**.`); logger?.silly(`${author} said ${word} in ${channel}`); }) - ?.catch(async (error) => { - logger?.error(error); + .catch((error) => { + logger.error(error); }); }; diff --git a/src/plugins/events/rateLimit/index.ts b/src/plugins/events/rateLimit/index.ts index a96b144..36ade47 100644 --- a/src/plugins/events/rateLimit/index.ts +++ b/src/plugins/events/rateLimit/index.ts @@ -1,14 +1,13 @@ // Dependencies import { Client } from "discord.js"; -import logger from "../../../middlewares/logger"; - // Helpers import { IEventOptions } from "../../../interfaces/EventOptions"; +import logger from "../../../middlewares/logger"; export const options: IEventOptions = { type: "on", }; -export const execute = async (client: Client) => { +export const execute = (client: Client) => { logger.warn(`Discord's API client (${client?.user?.tag}) is rate-limited!`); }; From 6d44db1c2c328632ef86cc28435f9b1807b7b0de Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Fri, 14 Oct 2022 13:02:16 +0200 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=92=A1=20event.execute=20comment=20fo?= =?UTF-8?q?r=20rateLimit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/plugins/events/rateLimit/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/plugins/events/rateLimit/index.ts b/src/plugins/events/rateLimit/index.ts index 36ade47..d645ab2 100644 --- a/src/plugins/events/rateLimit/index.ts +++ b/src/plugins/events/rateLimit/index.ts @@ -8,6 +8,7 @@ export const options: IEventOptions = { type: "on", }; +// Function to execute the event export const execute = (client: Client) => { logger.warn(`Discord's API client (${client?.user?.tag}) is rate-limited!`); };