From ffdc228e90b0b21dcc5d702012e875715e376bfc Mon Sep 17 00:00:00 2001 From: Vermium Sifell Date: Tue, 21 Jun 2022 18:01:25 +0200 Subject: [PATCH] =?UTF-8?q?Revert=20"=F0=9F=9A=91=20config=20plugin=20was?= =?UTF-8?q?=20excluded=20by=20.gitignore"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - src/handlers/deployCommands/index.ts | 4 ++-- src/index.ts | 5 ++++- src/managers/database/index.ts | 4 ++-- src/managers/event/index.ts | 2 +- .../commands/credits/modules/gift/index.ts | 14 +++++++++++--- .../modules/credits/modules/transfer/index.ts | 18 +++++++++++++++--- src/plugins/events/interactionCreate/audits.ts | 2 +- .../messageCreate/modules/counters/index.ts | 5 ++++- .../messageCreate/modules/credits/index.ts | 4 ++-- .../messageCreate/modules/points/index.ts | 5 ++++- src/plugins/events/messageDelete/audits.ts | 4 +++- src/plugins/events/messageUpdate/audits.ts | 2 +- 13 files changed, 50 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 4df232c..9e1cc15 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,6 @@ package-lock.json config/ -!plugins/commands/config # Build build/ diff --git a/src/handlers/deployCommands/index.ts b/src/handlers/deployCommands/index.ts index 264b562..492e1ab 100644 --- a/src/handlers/deployCommands/index.ts +++ b/src/handlers/deployCommands/index.ts @@ -42,7 +42,7 @@ export default async (client: Client) => { logger.info(`Finished updating command list.`); }) .catch(async (error) => { - throw new Error(`Could not update command list: ${error}`); + logger.error(`${error}`); }); if (devMode) { @@ -52,7 +52,7 @@ export default async (client: Client) => { }) .then(async () => logger.info(`Finished updating guild command list.`)) .catch(async (error) => { - throw new Error(`Could not update guild command list: ${error}`); + logger.error(`${error}`); }); } }; diff --git a/src/index.ts b/src/index.ts index 780ff30..4327353 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,16 +1,19 @@ import { token, intents } from "./config/discord"; -import { Client } from "discord.js"; +import { Client } from "discord.js"; // discord.js import * as managers from "./managers"; +// Main process that starts all other sub processes const main = async () => { + // Initiate client object const client = new Client({ intents, }); await managers.start(client); + // Authorize with Discord's API await client.login(token); }; diff --git a/src/managers/database/index.ts b/src/managers/database/index.ts index b988838..0063c61 100644 --- a/src/managers/database/index.ts +++ b/src/managers/database/index.ts @@ -14,11 +14,11 @@ export const start = async () => { logger.info(`Connected to database: ${connection.connection.name}`); }) .catch(async (e) => { - throw new Error(`Error connecting to database: ${e}`); + logger.error("Could not connect to database", e); }); mongoose.connection.on("error", async (error) => { - throw new Error(`Could not connect to database: ${error}`); + logger.error(`${error}`); }); mongoose.connection.on("warn", async (warning) => { diff --git a/src/managers/event/index.ts b/src/managers/event/index.ts index 447c8f0..348e138 100644 --- a/src/managers/event/index.ts +++ b/src/managers/event/index.ts @@ -12,7 +12,7 @@ export const register = async (client: Client) => { const event: IEvent = await import(`../../plugins/events/${eventName}`); const eventExecutor = async (...args: Promise[]) => event.execute(...args).catch(async (err) => { - throw new Error(`Error executing event ${eventName}: ${err}`); + logger.error(`${err}`); }); if (!event.options?.type) return; diff --git a/src/plugins/commands/credits/modules/gift/index.ts b/src/plugins/commands/credits/modules/gift/index.ts index 0a8099b..84b2350 100644 --- a/src/plugins/commands/credits/modules/gift/index.ts +++ b/src/plugins/commands/credits/modules/gift/index.ts @@ -201,9 +201,17 @@ export default { } catch (error) { await session.abortTransaction(); session.endSession(); - throw new Error( - `There was an error while saving the transaction: ${error}` - ); + logger.error(`${error}`); + + return interaction.editReply({ + embeds: [ + embed + .setDescription( + "An error occurred while trying to gift credits. Please try again." + ) + .setColor(errorColor), + ], + }); } finally { // ending the session session.endSession(); diff --git a/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts b/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts index 26c5a6b..dca0091 100644 --- a/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts @@ -210,9 +210,21 @@ export default { } catch (error) { await session.abortTransaction(); session.endSession(); - throw new Error( - `There was an error while transferring credits. ${error}` - ); + logger.error(`${error}`); + + return interaction.editReply({ + embeds: [ + new MessageEmbed() + .setTitle("[:toolbox:] Manage - Credits (Transfer)") + .setDescription( + "An error occurred while trying to gift credits. Please try again." + ) + .setColor(errorColor) + .setTimestamp(new Date()) + .setColor(successColor) + .setFooter({ text: footerText, iconURL: footerIcon }), + ], + }); } finally { // ending the session session.endSession(); diff --git a/src/plugins/events/interactionCreate/audits.ts b/src/plugins/events/interactionCreate/audits.ts index b36bdb9..183ff5a 100644 --- a/src/plugins/events/interactionCreate/audits.ts +++ b/src/plugins/events/interactionCreate/audits.ts @@ -57,7 +57,7 @@ export default { ); }) .catch(async () => { - throw new Error( + logger.error( `Audit log failed to send for event interactionCreate in guild ${interaction?.guild?.name} (${interaction?.guild?.id})` ); }); diff --git a/src/plugins/events/messageCreate/modules/counters/index.ts b/src/plugins/events/messageCreate/modules/counters/index.ts index 7f65243..1a3c7a3 100644 --- a/src/plugins/events/messageCreate/modules/counters/index.ts +++ b/src/plugins/events/messageCreate/modules/counters/index.ts @@ -58,7 +58,10 @@ export default { ); }) .catch(async (err) => { - throw new Error(`There was an error saving the counter: ${err}`); + logger.error( + `Error saving counter for guild ${guildId} and channel ${channelId}`, + err + ); }); logger.silly( diff --git a/src/plugins/events/messageCreate/modules/credits/index.ts b/src/plugins/events/messageCreate/modules/credits/index.ts index eade570..24a5ce2 100644 --- a/src/plugins/events/messageCreate/modules/credits/index.ts +++ b/src/plugins/events/messageCreate/modules/credits/index.ts @@ -38,8 +38,8 @@ export default { ); }) .catch(async (err) => { - throw new Error( - `Error saving user ${userId} in guild ${guildId}: ${err}` + logger.error( + `Error saving credits for user ${userId} in guild ${guildId} - ${err}` ); }); }, diff --git a/src/plugins/events/messageCreate/modules/points/index.ts b/src/plugins/events/messageCreate/modules/points/index.ts index 2564904..ed18003 100644 --- a/src/plugins/events/messageCreate/modules/points/index.ts +++ b/src/plugins/events/messageCreate/modules/points/index.ts @@ -35,7 +35,10 @@ export default { ); }) .catch(async (err) => { - throw new Error(`There was an error saving the user: ${err}`); + logger.error( + `Error saving points for user ${author.tag} (${author.id}) in guild: ${guild?.name} (${guild?.id})`, + err + ); }); logger.silly( diff --git a/src/plugins/events/messageDelete/audits.ts b/src/plugins/events/messageDelete/audits.ts index 29c3cac..4b5d5a2 100644 --- a/src/plugins/events/messageDelete/audits.ts +++ b/src/plugins/events/messageDelete/audits.ts @@ -58,7 +58,9 @@ export default { ); }) .catch(async () => { - throw new Error(`There was an error sending the audit log`); + logger.error( + `Audit log failed to send for event messageDelete in guild ${message?.guild?.name} (${message?.guild?.id})` + ); }); }, }; diff --git a/src/plugins/events/messageUpdate/audits.ts b/src/plugins/events/messageUpdate/audits.ts index 716ba6a..515a090 100644 --- a/src/plugins/events/messageUpdate/audits.ts +++ b/src/plugins/events/messageUpdate/audits.ts @@ -60,7 +60,7 @@ export default { ); }) .catch(async () => { - throw new Error( + logger.error( `Audit log failed to send for event messageUpdate in guild ${newMessage?.guild?.name} (${newMessage?.guild?.id})` ); });