diff --git a/.gitignore b/.gitignore index 9e1cc15..4df232c 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ package-lock.json config/ +!plugins/commands/config # Build build/ diff --git a/src/handlers/deployCommands/index.ts b/src/handlers/deployCommands/index.ts index 492e1ab..264b562 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) => { - logger.error(`${error}`); + throw new Error(`Could not update command list: ${error}`); }); if (devMode) { @@ -52,7 +52,7 @@ export default async (client: Client) => { }) .then(async () => logger.info(`Finished updating guild command list.`)) .catch(async (error) => { - logger.error(`${error}`); + throw new Error(`Could not update guild command list: ${error}`); }); } }; diff --git a/src/index.ts b/src/index.ts index 4327353..780ff30 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,19 +1,16 @@ import { token, intents } from "./config/discord"; -import { Client } from "discord.js"; // discord.js +import { Client } from "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 0063c61..b988838 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) => { - logger.error("Could not connect to database", e); + throw new Error(`Error connecting to database: ${e}`); }); mongoose.connection.on("error", async (error) => { - logger.error(`${error}`); + throw new Error(`Could not connect to database: ${error}`); }); mongoose.connection.on("warn", async (warning) => { diff --git a/src/managers/event/index.ts b/src/managers/event/index.ts index 348e138..447c8f0 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) => { - logger.error(`${err}`); + throw new Error(`Error executing event ${eventName}: ${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 84b2350..0a8099b 100644 --- a/src/plugins/commands/credits/modules/gift/index.ts +++ b/src/plugins/commands/credits/modules/gift/index.ts @@ -201,17 +201,9 @@ export default { } catch (error) { await session.abortTransaction(); session.endSession(); - logger.error(`${error}`); - - return interaction.editReply({ - embeds: [ - embed - .setDescription( - "An error occurred while trying to gift credits. Please try again." - ) - .setColor(errorColor), - ], - }); + throw new Error( + `There was an error while saving the transaction: ${error}` + ); } 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 dca0091..26c5a6b 100644 --- a/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts +++ b/src/plugins/commands/manage/modules/credits/modules/transfer/index.ts @@ -210,21 +210,9 @@ export default { } catch (error) { await session.abortTransaction(); session.endSession(); - 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 }), - ], - }); + throw new Error( + `There was an error while transferring credits. ${error}` + ); } finally { // ending the session session.endSession(); diff --git a/src/plugins/events/interactionCreate/audits.ts b/src/plugins/events/interactionCreate/audits.ts index 183ff5a..b36bdb9 100644 --- a/src/plugins/events/interactionCreate/audits.ts +++ b/src/plugins/events/interactionCreate/audits.ts @@ -57,7 +57,7 @@ export default { ); }) .catch(async () => { - logger.error( + throw new 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 1a3c7a3..7f65243 100644 --- a/src/plugins/events/messageCreate/modules/counters/index.ts +++ b/src/plugins/events/messageCreate/modules/counters/index.ts @@ -58,10 +58,7 @@ export default { ); }) .catch(async (err) => { - logger.error( - `Error saving counter for guild ${guildId} and channel ${channelId}`, - err - ); + throw new Error(`There was an error saving the counter: ${err}`); }); logger.silly( diff --git a/src/plugins/events/messageCreate/modules/credits/index.ts b/src/plugins/events/messageCreate/modules/credits/index.ts index 24a5ce2..eade570 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) => { - logger.error( - `Error saving credits for user ${userId} in guild ${guildId} - ${err}` + throw new Error( + `Error saving 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 ed18003..2564904 100644 --- a/src/plugins/events/messageCreate/modules/points/index.ts +++ b/src/plugins/events/messageCreate/modules/points/index.ts @@ -35,10 +35,7 @@ export default { ); }) .catch(async (err) => { - logger.error( - `Error saving points for user ${author.tag} (${author.id}) in guild: ${guild?.name} (${guild?.id})`, - err - ); + throw new Error(`There was an error saving the user: ${err}`); }); logger.silly( diff --git a/src/plugins/events/messageDelete/audits.ts b/src/plugins/events/messageDelete/audits.ts index 4b5d5a2..29c3cac 100644 --- a/src/plugins/events/messageDelete/audits.ts +++ b/src/plugins/events/messageDelete/audits.ts @@ -58,9 +58,7 @@ export default { ); }) .catch(async () => { - logger.error( - `Audit log failed to send for event messageDelete in guild ${message?.guild?.name} (${message?.guild?.id})` - ); + throw new Error(`There was an error sending the audit log`); }); }, }; diff --git a/src/plugins/events/messageUpdate/audits.ts b/src/plugins/events/messageUpdate/audits.ts index 515a090..716ba6a 100644 --- a/src/plugins/events/messageUpdate/audits.ts +++ b/src/plugins/events/messageUpdate/audits.ts @@ -60,7 +60,7 @@ export default { ); }) .catch(async () => { - logger.error( + throw new Error( `Audit log failed to send for event messageUpdate in guild ${newMessage?.guild?.name} (${newMessage?.guild?.id})` ); });