diff --git a/src/events/guildMemberAdd/audits.ts b/src/events/guildMemberAdd/audits.ts index 6d76893..af99a77 100644 --- a/src/events/guildMemberAdd/audits.ts +++ b/src/events/guildMemberAdd/audits.ts @@ -20,24 +20,35 @@ export default { if (channel === null) return; - (channel as TextChannel).send({ - embeds: [ - new MessageEmbed() - .setColor(successColor) - .setAuthor({ - name: "Member Joined", - iconURL: member.user.displayAvatarURL(), - }) - .setDescription(`${member.user} ${member.user.tag}`) - .addFields([ - { name: "Account Age", value: `${member.user.createdAt}` }, - ]) - .setTimestamp() - .setFooter({ - text: footerText, - iconURL: footerIcon, - }), - ], - }); + (channel as TextChannel) + .send({ + embeds: [ + new MessageEmbed() + .setColor(successColor) + .setAuthor({ + name: "Member Joined", + iconURL: member.user.displayAvatarURL(), + }) + .setDescription(`${member.user} ${member.user.tag}`) + .addFields([ + { name: "Account Age", value: `${member.user.createdAt}` }, + ]) + .setTimestamp() + .setFooter({ + text: footerText, + iconURL: footerIcon, + }), + ], + }) + .then(async () => { + logger.info( + `Audit log sent for event guildMemberAdd in guild ${member.guild.name} (${member.guild.id})` + ); + }) + .catch(async () => { + logger.error( + `Audit log failed to send for event guildMemberAdd in guild ${member.guild.name} (${member.guild.id})` + ); + }); }, }; diff --git a/src/events/guildMemberRemove/audits.ts b/src/events/guildMemberRemove/audits.ts index e096814..3bbd8aa 100644 --- a/src/events/guildMemberRemove/audits.ts +++ b/src/events/guildMemberRemove/audits.ts @@ -20,21 +20,32 @@ export default { if (channel === null) return; - (channel as TextChannel).send({ - embeds: [ - new MessageEmbed() - .setColor(errorColor) - .setAuthor({ - name: "Member Left", - iconURL: member.user.displayAvatarURL(), - }) - .setDescription(`${member.user} ${member.user.tag}`) - .setTimestamp() - .setFooter({ - text: footerText, - iconURL: footerIcon, - }), - ], - }); + (channel as TextChannel) + .send({ + embeds: [ + new MessageEmbed() + .setColor(errorColor) + .setAuthor({ + name: "Member Left", + iconURL: member.user.displayAvatarURL(), + }) + .setDescription(`${member.user} ${member.user.tag}`) + .setTimestamp() + .setFooter({ + text: footerText, + iconURL: footerIcon, + }), + ], + }) + .then(async () => { + logger.info( + `Audit log sent for event guildMemberRemove in guild ${member.guild.name} (${member.guild.id})` + ); + }) + .catch(async () => { + logger.error( + `Audit log failed to send for event guildMemberRemove in guild ${member.guild.name} (${member.guild.id})` + ); + }); }, }; diff --git a/src/events/interactionCreate/audits.ts b/src/events/interactionCreate/audits.ts index 5fe29e6..d91348e 100644 --- a/src/events/interactionCreate/audits.ts +++ b/src/events/interactionCreate/audits.ts @@ -26,23 +26,34 @@ export default { if (channel === null) return; - (channel as TextChannel).send({ - embeds: [ - new MessageEmbed() - .setColor(successColor) - .setDescription( - ` + (channel as TextChannel) + .send({ + embeds: [ + new MessageEmbed() + .setColor(successColor) + .setDescription( + ` **Interaction created by** ${interaction.user.username} **in** ${interaction.channel} ` - ) - .setThumbnail(interaction.user.displayAvatarURL()) - .addFields([{ name: "Event", value: "interactionCreate" }]) - .setTimestamp() - .setFooter({ - text: footerText, - iconURL: footerIcon, - }), - ], - }); + ) + .setThumbnail(interaction.user.displayAvatarURL()) + .addFields([{ name: "Event", value: "interactionCreate" }]) + .setTimestamp() + .setFooter({ + text: footerText, + iconURL: footerIcon, + }), + ], + }) + .then(async () => { + logger.info( + `Audit log sent for event interactionCreate in guild ${interaction?.guild?.name} (${interaction?.guild?.id})` + ); + }) + .catch(async () => { + logger.error( + `Audit log failed to send for event interactionCreate in guild ${interaction?.guild?.name} (${interaction?.guild?.id})` + ); + }); }, }; diff --git a/src/events/messageDelete/audits.ts b/src/events/messageDelete/audits.ts index f7f0ed1..d35cf37 100644 --- a/src/events/messageDelete/audits.ts +++ b/src/events/messageDelete/audits.ts @@ -26,26 +26,37 @@ export default { if (channel === null) return; - (channel as TextChannel).send({ - embeds: [ - new MessageEmbed() - .setColor(successColor) - .setAuthor({ - name: message.author.username, - iconURL: message.author.displayAvatarURL(), - }) - .setDescription( - ` + (channel as TextChannel) + .send({ + embeds: [ + new MessageEmbed() + .setColor(successColor) + .setAuthor({ + name: message.author.username, + iconURL: message.author.displayAvatarURL(), + }) + .setDescription( + ` **Message sent by** ${message.author} **deleted in** ${message.channel} ${message.content} ` - ) - .setTimestamp() - .setFooter({ - text: footerText, - iconURL: footerIcon, - }), - ], - }); + ) + .setTimestamp() + .setFooter({ + text: footerText, + iconURL: footerIcon, + }), + ], + }) + .then(async () => { + logger.info( + `Audit log sent for event messageDelete in guild ${message?.guild?.name} (${message?.guild?.id})` + ); + }) + .catch(async () => { + logger.error( + `Audit log failed to send for event messageDelete in guild ${message?.guild?.name} (${message?.guild?.id})` + ); + }); }, }; diff --git a/src/events/messageUpdate/audits.ts b/src/events/messageUpdate/audits.ts index 50c76b5..b7f2726 100644 --- a/src/events/messageUpdate/audits.ts +++ b/src/events/messageUpdate/audits.ts @@ -29,25 +29,36 @@ export default { if (channel === null) return; - (channel as TextChannel).send({ - embeds: [ - new MessageEmbed() - .setColor(successColor) - .setAuthor({ - name: newMessage.author.username, - iconURL: newMessage.author.displayAvatarURL(), - }) - .setDescription( - ` + (channel as TextChannel) + .send({ + embeds: [ + new MessageEmbed() + .setColor(successColor) + .setAuthor({ + name: newMessage.author.username, + iconURL: newMessage.author.displayAvatarURL(), + }) + .setDescription( + ` **Message edited in** ${newMessage.channel} [jump to message](https://discord.com/channels/${newMessage.guild.id}/${newMessage.channel.id}/${newMessage.id}) ` - ) - .setTimestamp() - .setFooter({ - text: footerText, - iconURL: footerIcon, - }), - ], - }); + ) + .setTimestamp() + .setFooter({ + text: footerText, + iconURL: footerIcon, + }), + ], + }) + .then(async () => { + logger.info( + `Audit log sent for event messageUpdate in guild ${newMessage?.guild?.name} (${newMessage?.guild?.id})` + ); + }) + .catch(async () => { + logger.error( + `Audit log failed to send for event messageUpdate in guild ${newMessage?.guild?.name} (${newMessage?.guild?.id})` + ); + }); }, }; diff --git a/src/plugins/settings/guild/modules/shop.ts b/src/plugins/settings/guild/modules/shop.ts index 5c633a0..2b20d87 100644 --- a/src/plugins/settings/guild/modules/shop.ts +++ b/src/plugins/settings/guild/modules/shop.ts @@ -10,7 +10,6 @@ import logger from "@logger"; // Models import guildSchema from "@schemas/guild"; import { SlashCommandSubcommandBuilder } from "@discordjs/builders"; -import { ChannelType } from "discord-api-types/v10"; // Function export default { diff --git a/src/schedules/jobs/shopRoles.ts b/src/schedules/jobs/shopRoles.ts index fae3889..be1767b 100644 --- a/src/schedules/jobs/shopRoles.ts +++ b/src/schedules/jobs/shopRoles.ts @@ -55,29 +55,7 @@ export default async (client: Client) => { const rRole = rMember.roles.cache.get(roleId); - if (!rRole) { - logger.error(`Role ${roleId} not found for shop role ${roleId}.`); - await shopRoleSchema - .deleteOne({ - userId, - roleId, - guildId, - }) - .then(async () => { - logger.verbose( - `Shop role document ${roleId} has been deleted from user ${userId}.` - ); - }) - .catch(async (error) => { - logger.error( - `Error deleting shop role document ${roleId} from user ${userId}.`, - error - ); - }); - return; - } - - if (!rMember) { + if (!rMember || !rRole) { logger.error(`Member ${userId} not found for shop role ${roleId}.`); await shopRoleSchema .deleteOne({