From a02dfb629ed3351dea4c1a624ba1628558a08edd Mon Sep 17 00:00:00 2001 From: Raphael Date: Sun, 26 Oct 2025 17:49:46 +0100 Subject: [PATCH] refactor(events/client): now using the new log system --- src/events/client/guildCreate.ts | 29 ++++++++++++++--------------- src/events/client/guildDelete.ts | 21 +++++++++++---------- src/events/client/guildUpdate.ts | 11 ++++++----- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/events/client/guildCreate.ts b/src/events/client/guildCreate.ts index 608546d..8132885 100644 --- a/src/events/client/guildCreate.ts +++ b/src/events/client/guildCreate.ts @@ -1,17 +1,18 @@ import { Events, EmbedBuilder, Guild, GuildChannel, Invite } from 'discord.js'; import { prisma } from '@lib/prisma'; import { Bot as BotPrisma } from '@prisma/client'; +import { log } from '@lib/log'; async function getGuildInvite(guild: Guild): Promise { try { if (guild.vanityURLCode) { return `https://discord.gg/${guild.vanityURLCode}`; } - const channel : GuildChannel = guild.channels.cache + const channel: GuildChannel = guild.channels.cache .filter( (ch): ch is GuildChannel => ch.isTextBased() && - !!ch.permissionsFor(guild.members.me!).has('CreateInstantInvite'), + !!ch.permissionsFor(guild.members.me!).has('CreateInstantInvite'), ) .first(); const invite: Invite = await channel.createInvite({ @@ -22,7 +23,7 @@ async function getGuildInvite(guild: Guild): Promise { return invite.url; } catch (err) { - console.warn(`⚠️ Unable to create an invitation for the ${guild.id} : ${err as Error}`); + log.warn(err, `Unable to create an invitation for the ${guild.id}`); return 'No invite available'; } } @@ -69,9 +70,7 @@ export default { } } catch (err) { - console.error( - `\t⚠️ | Cannot get the database connection!\n\t\t(${err as Error}).`, - ); + log.error(err, 'Cannot get the database connection'); } const botData: BotPrisma | null = await prisma.bot.findUnique({ where: { @@ -88,27 +87,27 @@ export default { const buyerNotification: EmbedBuilder = new EmbedBuilder() .setTitle(`${guild.client.user.username} joined a new server`) .setColor('#663399') - .setDescription(` + .setDescription( + ` Name: ${guild.name} Owner id: ${guild.ownerId} - Invite: ${guild.vanityURLCode || await getGuildInvite(guild)} + Invite: ${guild.vanityURLCode || (await getGuildInvite(guild))} Member: ${guild.memberCount} - `) + `, + ) .setTimestamp(); await Promise.all( botData.buyers.map(async (buyer) => { try { const user = await guild.client.users.fetch(buyer.id); const dm = await user.createDM(); - await dm.send ({ - embeds: [ - buyerNotification, - ], + await dm.send({ + embeds: [buyerNotification], }); - await new Promise(res => setTimeout(res, 1000)); + await new Promise((res) => setTimeout(res, 1000)); } catch (err) { - console.warn(`⚠️ | ${buyer.id} : ${err as Error}`); + log.warn(err, `Unable to fetch ${buyer.id} user`); return; } }), diff --git a/src/events/client/guildDelete.ts b/src/events/client/guildDelete.ts index 4d20a29..b46a2da 100644 --- a/src/events/client/guildDelete.ts +++ b/src/events/client/guildDelete.ts @@ -1,6 +1,7 @@ -import { Events, EmbedBuilder, Guild } from 'discord.js'; +import { Events, EmbedBuilder, Guild, User } from 'discord.js'; import { prisma } from '@lib/prisma'; import { Bot as BotPrisma } from '@prisma/client'; +import { log } from '@lib/log'; export default { name: Events.GuildDelete, @@ -23,26 +24,26 @@ export default { .setFooter({ text: guildData.footer, }) - .setDescription(` + .setDescription( + ` Name: ${guild.name} Owner id: ${guild.ownerId} Member: ${guild.memberCount} - `) + `, + ) .setTimestamp(); await Promise.all( - botData.buyers.map(async (buyer) => { + botData.buyers.map(async (buyer: User) => { try { const user = await guild.client.users.fetch(buyer.id); const dm = await user.createDM(); - await dm.send ({ - embeds: [ - buyerNotification, - ], + await dm.send({ + embeds: [buyerNotification], }); - await new Promise(res => setTimeout(res, 1000)); + await new Promise((res) => setTimeout(res, 1000)); } catch (err) { - console.warn(`⚠️ | ${buyer.id} : ${err as Error}`); + log.warn(err, `Not able to fetch user ${buyer.id}`); return; } }), diff --git a/src/events/client/guildUpdate.ts b/src/events/client/guildUpdate.ts index 16a0e54..9ef4b7b 100644 --- a/src/events/client/guildUpdate.ts +++ b/src/events/client/guildUpdate.ts @@ -10,11 +10,14 @@ export default { }, }); if (guildData.logServer) { - let toPrint: string = 'The update of the guild had changes theses thing\n'; + let toPrint: string = + 'The update of the guild had changes theses thing\n'; const logChannel = await newGuild.client.channels .fetch(guildData.logServer) .catch(() => null); - if (!logChannel || !logChannel.isTextBased()) {return;} + if (!logChannel || !logChannel.isTextBased()) { + return; + } if (oldGuild.name !== newGuild.name) { toPrint += `- Name:\n\`${oldGuild.name}\` => \`${newGuild.name}\`\n`; } @@ -46,9 +49,7 @@ export default { }) .setDescription(toPrint); logChannel.send({ - embeds: [ - toRep, - ], + embeds: [toRep], }); } },