From a4c08eaae50ab8225928da433a81dd04fec2dc4d Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 26 Oct 2025 17:48:16 +0100 Subject: [PATCH] refactor(events/messages): now using the new log system --- src/events/messages/messageBulkDelete.ts | 13 ++++++++----- src/events/messages/messageCreate.ts | 3 ++- src/events/messages/messageDelete.ts | 9 ++++++--- src/events/messages/messageUpdate.ts | 9 ++++++--- 4 files changed, 22 insertions(+), 12 deletions(-) diff --git a/src/events/messages/messageBulkDelete.ts b/src/events/messages/messageBulkDelete.ts index cf99843..24fd9af 100644 --- a/src/events/messages/messageBulkDelete.ts +++ b/src/events/messages/messageBulkDelete.ts @@ -1,4 +1,5 @@ import { Events, EmbedBuilder, Message, Channel, Collection, Snowflake, PartialMessage } from 'discord.js'; +import { log } from '@lib/log'; import { prisma } from '@lib/prisma'; import { Guild as GuildPrisma } from '@prisma/client'; @@ -18,15 +19,15 @@ export default { try { fullMsg = await msg.fetch(); } - catch { - console.warn('BulkDelete cannot load a message'); + catch (err) { + log.warn(err, 'BulkDelete cannot load a message'); } } description += `**${fullMsg.author?.username ?? 'Unknown'}**: ${fullMsg.content || '[no content]'}\n`; } if (guildData.logMsg) { - const log = new EmbedBuilder() + const logEmbed = new EmbedBuilder() .setAuthor({ name: `${message.author.tag} (${message.author.id})`, iconURL: message.author.displayAvatarURL({ @@ -47,10 +48,12 @@ export default { `); const logChannel: Promise = await message.guild.client.channels .fetch(guildData.logMsg) - .catch((err) => { console.error(err); }); + .catch((err) => { + log.error(err, 'Unable to fetch the log channel'); + }); logChannel.send({ embeds: [ - log, + logEmbed, ], }); } diff --git a/src/events/messages/messageCreate.ts b/src/events/messages/messageCreate.ts index e48727a..bbdfd9d 100644 --- a/src/events/messages/messageCreate.ts +++ b/src/events/messages/messageCreate.ts @@ -1,6 +1,7 @@ import { Events, Message } from 'discord.js'; import { prisma } from '@lib/prisma'; import { User as UserPrisma } from '@prisma/client'; +import { GuildUser as GuildUserPrisma } from '@prisma/client'; const xpCooldown: Map = new Map(); @@ -28,7 +29,7 @@ export default { }, }); } - let guildUser = await prisma.guildUser.findUnique({ + let guildUser: GuildUserPrisma | null = await prisma.guildUser.findUnique({ where: { userId_guildId: { userId: message.author.id, diff --git a/src/events/messages/messageDelete.ts b/src/events/messages/messageDelete.ts index 02c31f0..6bfb2d3 100644 --- a/src/events/messages/messageDelete.ts +++ b/src/events/messages/messageDelete.ts @@ -1,5 +1,6 @@ import { Events, EmbedBuilder, Message, Channel } from 'discord.js'; import { prisma } from '@lib/prisma'; +import { log } from '@lib/log'; import { Guild as GuildPrisma } from '@prisma/client'; export default { @@ -11,7 +12,7 @@ export default { }, }); if (guildData.logMsg) { - const log = new EmbedBuilder() + const logEmbed = new EmbedBuilder() .setAuthor({ name: `${message.author.tag} (${message.author.id})`, iconURL: message.author.displayAvatarURL({ @@ -30,10 +31,12 @@ export default { `); const logChannel: Promise = await message.guild.client.channels .fetch(guildData.logMsg) - .catch((err) => { console.error(err); }); + .catch((err) => { + log.error(err, 'Unable to fetch the log channel'); + }); logChannel.send({ embeds: [ - log, + logEmbed, ], }); } diff --git a/src/events/messages/messageUpdate.ts b/src/events/messages/messageUpdate.ts index f28d594..9b3e984 100644 --- a/src/events/messages/messageUpdate.ts +++ b/src/events/messages/messageUpdate.ts @@ -1,5 +1,6 @@ import { Events, EmbedBuilder, Message, Channel } from 'discord.js'; import { prisma } from '@lib/prisma'; +import { log } from '@lib/log'; import { Guild as GuildPrisma } from '@prisma/client'; export default { @@ -11,7 +12,7 @@ export default { }, }); if (guildData.logMsg) { - const log = new EmbedBuilder() + const logEmbed = new EmbedBuilder() .setAuthor({ name: `${newMessage.author.tag} (${newMessage.author.id})`, iconURL: newMessage.author.displayAvatarURL({ @@ -31,10 +32,12 @@ export default { `); const logChannel: Promise = await newMessage.guild.client.channels .fetch(guildData.logMsg) - .catch((err) => { console.error(err); }); + .catch((err) => { + log.error(err, 'Unable to fetch the log channel'); + }); logChannel.send({ embeds: [ - log, + logEmbed, ], }); }