Added try/catch function for logging

10 files changed, 255 insertions, 213 deletions

diff --git a/bot/src/events/GuildBanAdd.js b/bot/src/events/GuildBanAdd.js
index 54afc12..85f365e 100644
--- a/bot/src/events/GuildBanAdd.js
+++ b/bot/src/events/GuildBanAdd.js
@@ -4,30 +4,35 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildBanAdd,
     async execute(ban) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: ban.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: ban.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
 
-        const banLog = await ban.guild.fetchAuditLogs({
-            type: AuditLogEvent.MemberBanAdd,
-            limit: 1,
-        });
+            const banLog = await ban.guild.fetchAuditLogs({
+                type: AuditLogEvent.MemberBanAdd,
+                limit: 1,
+            });
 
-        const banEntry = banLog.entries.first();
+            const banEntry = banLog.entries.first();
 
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: ban.guild.client.user.avatarURL() })
-            .setDescription('This user got banned from this server.')
-            .addFields(
-                { name: 'User:', value: `${ban.user.username}` },
-                { name: 'User ID:', value: `${ban.user.id}`},
-                { name: 'Reason:', value: `${banEntry.reason || 'No reason provided'}` }
-            )
-            .setColor('#ff021b')
-            .setTimestamp();
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: ban.guild.client.user.avatarURL() })
+                .setDescription('This user got banned from this server.')
+                .addFields(
+                    { name: 'User:', value: `${ban.user.username}` },
+                    { name: 'User ID:', value: `${ban.user.id}`},
+                    { name: 'Reason:', value: `${banEntry.reason || 'No reason provided'}` }
+                )
+                .setColor('#ff021b')
+                .setTimestamp();
 
-        let banMessage = ban.guild.client.channels.cache.get(guildSetting.logChannelID);
-        if (!banMessage) return;
+            let banMessage = ban.guild.client.channels.cache.get(guildSetting.logChannelID);
+            if (!banMessage) return;
+
+            await banMessage.send({ embeds: [logEmbed] });
+        } catch (e) {
+            console.error(e);
+        }
 
-        await banMessage.send({ embeds: [logEmbed] });
     }
 };
diff --git a/bot/src/events/GuildBanRemove.js b/bot/src/events/GuildBanRemove.js
index 1d6ac2a..8873054 100644
--- a/bot/src/events/GuildBanRemove.js
+++ b/bot/src/events/GuildBanRemove.js
@@ -4,22 +4,26 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildBanRemove,
     async execute(ban) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: ban.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: ban.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
 
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: ban.guild.client.user.avatarURL() })
-            .setDescription('This user got unbanned from this server.')
-            .addFields(
-                { name: 'User:', value: `${ban.user.username}` },
-                { name: 'User ID:', value: `${ban.user.id}`}
-            )
-            .setColor('#ff021b')
-            .setTimestamp();
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: ban.guild.client.user.avatarURL() })
+                .setDescription('This user got unbanned from this server.')
+                .addFields(
+                    { name: 'User:', value: `${ban.user.username}` },
+                    { name: 'User ID:', value: `${ban.user.id}`}
+                )
+                .setColor('#ff021b')
+                .setTimestamp();
 
-        let banMessage = ban.guild.client.channels.cache.get(guildSetting.logChannelID);
-        if (!banMessage) return;
+            let banMessage = ban.guild.client.channels.cache.get(guildSetting.logChannelID);
+            if (!banMessage) return;
 
-        await banMessage.send({ embeds: [logEmbed] });
+            await banMessage.send({ embeds: [logEmbed] });
+        } catch (e) {
+            console.error(e);
+        }
     }
 };
diff --git a/bot/src/events/GuildCreate.js b/bot/src/events/GuildCreate.js
index c3cf034..2496867 100644
--- a/bot/src/events/GuildCreate.js
+++ b/bot/src/events/GuildCreate.js
@@ -5,22 +5,26 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildCreate,
     async execute(guild) {
-        console.log(`[i] New guild joined: ${guild.name} (${guild.id}). This guild has ${guild.memberCount} members!`);
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot', iconURL: guild.client.user.avatarURL() })
-            .setDescription('I got added to a server!')
-            .addFields(
-                { name: 'Server Name:', value: `${guild.name}`, inline: true },
-                { name: 'Server ID:', value: `${guild.id}`, inline: true },
-                { name: 'Members', value: `${guild.memberCount}`, inline: true }
-            )
-            .setColor(abEmbedColour)
-            .setFooter({ text: `We now run on ${guild.client.guilds.cache.size} guilds.` });
+        try {
+            console.log(`[i] New guild joined: ${guild.name} (${guild.id}). This guild has ${guild.memberCount} members!`);
+            await guildSettings.create({ guildID: guild.id });
 
-        await guildSettings.create({ guildID: guild.id });
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot', iconURL: guild.client.user.avatarURL() })
+                .setDescription('I got added to a server!')
+                .addFields(
+                    { name: 'Server Name:', value: `${guild.name}`, inline: true },
+                    { name: 'Server ID:', value: `${guild.id}`, inline: true },
+                    { name: 'Members', value: `${guild.memberCount}`, inline: true }
+                )
+                .setColor(abEmbedColour)
+                .setFooter({ text: `We now run on ${guild.client.guilds.cache.size} guilds.` });
 
-        let statusChannel = guild.client.channels.cache.get(process.env.STATUS_CHANNEL_ID);
-        if (!statusChannel) return;
-        await statusChannel.send({ embeds: [logEmbed] });
+            let statusChannel = guild.client.channels.cache.get(process.env.STATUS_CHANNEL_ID);
+            if (!statusChannel) return;
+            await statusChannel.send({ embeds: [logEmbed] });
+        } catch (e) {
+            console.error(e);
+        }
     }
 };
diff --git a/bot/src/events/GuildDelete.js b/bot/src/events/GuildDelete.js
index 5cdd88a..51ac448 100644
--- a/bot/src/events/GuildDelete.js
+++ b/bot/src/events/GuildDelete.js
@@ -5,25 +5,26 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildDelete,
     async execute(guild) {
-        console.log(`[i] I have been removed from: ${guild.name} (${guild.id})`);
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot', iconURL: guild.client.user.avatarURL() })
-            .setDescription('I got removed from a server...')
-            .addFields(
-                { name: 'Server Name:', value: `${guild.name}`, inline: true },
-                { name: 'Server ID:', value: `${guild.id}`, inline: true },
-            )
-            .setColor(abEmbedColour)
-            .setFooter({ text: `We now run on ${guild.client.guilds.cache.size} guilds.` });
+        try {
+            console.log(`[i] I have been removed from: ${guild.name} (${guild.id})`);
+            const guildSetting = await guildSettings.findOne({ where: { guildID: guild.id } });
+            if (guildSetting) await guildSettings.destroy({ where: { guildID: guild.id } });
 
-        const guildSetting = await guildSettings.findOne({ where: { guildID: guild.id } });
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot', iconURL: guild.client.user.avatarURL() })
+                .setDescription('I got removed from a server...')
+                .addFields(
+                    { name: 'Server Name:', value: `${guild.name}`, inline: true },
+                    { name: 'Server ID:', value: `${guild.id}`, inline: true },
+                )
+                .setColor(abEmbedColour)
+                .setFooter({ text: `We now run on ${guild.client.guilds.cache.size} guilds.` });
 
-        if (guildSetting) {
-            await guildSettings.destroy({ where: { guildID: guild.id } });
+            let statusChannel = guild.client.channels.cache.get(process.env.STATUS_CHANNEL_ID);
+            if (!statusChannel) return;
+            await statusChannel.send({ embeds: [logEmbed] });
+        } catch (e) {
+            console.error(e);
         }
-
-        let statusChannel = guild.client.channels.cache.get(process.env.STATUS_CHANNEL_ID);
-        if (!statusChannel) return;
-        await statusChannel.send({ embeds: [logEmbed] });
     }
 };
diff --git a/bot/src/events/GuildMemberAdd.js b/bot/src/events/GuildMemberAdd.js
index 08121ad..902f3ab 100644
--- a/bot/src/events/GuildMemberAdd.js
+++ b/bot/src/events/GuildMemberAdd.js
@@ -5,32 +5,39 @@ import { autoRole, serverWhitelist, roleWhitelist } from '../storage/consts.js';
 export default {
     name: Events.GuildMemberAdd,
     async execute(member) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
-
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() })
-            .setDescription('A user has joined this server.')
-            .addFields(
-                { name: 'Username: ', value: `${member.user}`, inline: true },
-                { name: 'User ID: ', value: `${member.id}`, inline: true },
-                { name: 'Created At: ', value: `${member.user.createdAt.toUTCString()}`}
-            )
-            .setColor('#4bff31')
-            .setTimestamp();
-
-        let guildMember = member.client.channels.cache.get(guildSetting.logChannelID);
-        if (!guildMember) return;
-
-        await guildMember.send({ embeds: [logEmbed] });
-
-        // autoban system?
-
-        if (autoRole) {
-            if (member.guild.id !== serverWhitelist) return;
-            const role = member.guild.roles.cache.get(roleWhitelist);
-            member.roles.add(role);
-            console.log(`[i] ${member.user.username} joined Andrew Lee Projects, automatically giving them role.`.green);
+        if (member.id === member.client.user.id) return;
+
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
+
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() })
+                .setDescription('A user has joined this server.')
+                .addFields(
+                    { name: 'Username: ', value: `${member.user}`, inline: true },
+                    { name: 'User ID: ', value: `${member.id}`, inline: true },
+                    { name: 'Created At: ', value: `${member.user.createdAt.toUTCString()}`}
+                )
+                .setColor('#4bff31')
+                .setTimestamp();
+
+            let guildMember = member.client.channels.cache.get(guildSetting.logChannelID);
+            if (!guildMember) return;
+
+            await guildMember.send({ embeds: [logEmbed] });
+
+            // autoban system?
+
+            if (autoRole) {
+                if (member.guild.id !== serverWhitelist) return;
+                const role = member.guild.roles.cache.get(roleWhitelist);
+                member.roles.add(role);
+                console.log(`[i] ${member.user.username} joined Andrew Lee Projects, automatically giving them role.`.green);
+            }
+        } catch (e) {
+            console.error(e);
         }
+
     }
 };
diff --git a/bot/src/events/GuildMemberRemove.js b/bot/src/events/GuildMemberRemove.js
index aa44366..2456455 100644
--- a/bot/src/events/GuildMemberRemove.js
+++ b/bot/src/events/GuildMemberRemove.js
@@ -4,22 +4,28 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildMemberRemove,
     async execute(member) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
+        if (member.id === member.client.user.id) return;
 
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() })
-            .setDescription('A user has left this server.')
-            .addFields(
-                { name: 'Username: ', value: `${member.user.username}`, inline: true },
-                { name: 'User ID: ', value: `${member.id}`, inline: true },
-            )
-            .setColor('#ec2727')
-            .setTimestamp();
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
 
-        let guildMember = member.client.channels.cache.get(guildSetting.logChannelID);
-        if (!guildMember) return;
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() })
+                .setDescription('A user has left this server.')
+                .addFields(
+                    { name: 'Username: ', value: `${member.user.username}`, inline: true },
+                    { name: 'User ID: ', value: `${member.id}`, inline: true },
+                )
+                .setColor('#ec2727')
+                .setTimestamp();
 
-        await guildMember.send({ embeds: [logEmbed] });
+            let guildMember = member.client.channels.cache.get(guildSetting.logChannelID);
+            if (!guildMember) return;
+
+            await guildMember.send({ embeds: [logEmbed] });
+        } catch (e) {
+            console.error(e);
+        }
     }
 };
diff --git a/bot/src/events/GuildMemberUpdate.js b/bot/src/events/GuildMemberUpdate.js
index 77906c7..3c90268 100644
--- a/bot/src/events/GuildMemberUpdate.js
+++ b/bot/src/events/GuildMemberUpdate.js
@@ -4,23 +4,27 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildMemberUpdate,
     async execute(member, newMember) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
-        if (!member.nickname || member.nickname === newMember.nickname) return;
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
+            if (!member.nickname || member.nickname === newMember.nickname) return;
 
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() })
-            .setDescription(`${member.user} has changed their nickname.`)
-            .addFields(
-                { name: 'Old Nickname: ', value: `${member.nickname}`, inline: true },
-                { name: 'New Nickname: ', value: `${newMember.nickname}`, inline: true },
-            )
-            .setColor('#ffff1a')
-            .setTimestamp();
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: member.client.user.avatarURL() })
+                .setDescription(`${member.user} has changed their nickname.`)
+                .addFields(
+                    { name: 'Old Nickname: ', value: `${member.nickname}`, inline: true },
+                    { name: 'New Nickname: ', value: `${newMember.nickname}`, inline: true },
+                )
+                .setColor('#ffff1a')
+                .setTimestamp();
 
-        let guildMember = member.client.channels.cache.get(guildSetting.logChannelID);
-        if (!guildMember) return;
+            let guildMember = member.client.channels.cache.get(guildSetting.logChannelID);
+            if (!guildMember) return;
 
-        await guildMember.send({ embeds: [logEmbed] });
+            await guildMember.send({ embeds: [logEmbed] });
+        } catch (e) {
+          console.error(e);
+        }
     }
 };
diff --git a/bot/src/events/MessageBulkDelete.js b/bot/src/events/MessageBulkDelete.js
index 92db987..5a9445e 100644
--- a/bot/src/events/MessageBulkDelete.js
+++ b/bot/src/events/MessageBulkDelete.js
@@ -4,30 +4,34 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.MessageBulkDelete,
     async execute(msg, channel) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: channel.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: channel.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
 
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: channel.client.user.avatarURL() })
-            .setDescription(`A bulk of ${msg.size} messages were deleted in ${channel}`)
-            .setColor('#ff021b')
-            .setTimestamp();
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: channel.client.user.avatarURL() })
+                .setDescription(`A bulk of ${msg.size} messages were deleted in ${channel}`)
+                .setColor('#ff021b')
+                .setTimestamp();
 
-        let messages = [];
+            let messages = [];
 
-        msg.forEach(message => {
-            messages.push(`[${message.createdAt.toUTCString()}]`);
-            messages.push(`${message.author.username} (${message.author.id})`);
-            messages.push(`Message (${message.id}): ${message.content}`);
-            messages.push('-----------------------------------');
-        });
+            msg.forEach(message => {
+                messages.push(`[${message.createdAt.toUTCString()}]`);
+                messages.push(`${message.author.username} (${message.author.id})`);
+                messages.push(`Message (${message.id}): ${message.content}`);
+                messages.push('-----------------------------------');
+            });
 
-        const messageContent = messages.join('\n');
-        const attachment = new AttachmentBuilder(Buffer.from(messageContent, 'utf-8'), { name: 'messages.txt' });
+            const messageContent = messages.join('\n');
+            const attachment = new AttachmentBuilder(Buffer.from(messageContent, 'utf-8'), { name: 'messages.txt' });
 
-        let deleteMessage = channel.client.channels.cache.get(guildSetting.logChannelID);
-        if (!deleteMessage) return;
+            let deleteMessage = channel.client.channels.cache.get(guildSetting.logChannelID);
+            if (!deleteMessage) return;
 
-        await deleteMessage.send({ embeds: [logEmbed], files: [attachment] });
+            await deleteMessage.send({ embeds: [logEmbed], files: [attachment] });
+        } catch (e) {
+            console.error(e);
+        }
     }
 };
diff --git a/bot/src/events/MessageDelete.js b/bot/src/events/MessageDelete.js
index 86e3dd8..2f929d2 100644
--- a/bot/src/events/MessageDelete.js
+++ b/bot/src/events/MessageDelete.js
@@ -4,37 +4,41 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.MessageDelete,
     async execute(msg) {
-        if (!msg.content) return;
-
-        const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } });
-        if (!guildSetting || !guildSetting.logChannelID) return;
-
-        const useEmbedFields = msg.content.length <= 1024;
-
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: msg.client.user.avatarURL() })
-            .setDescription(`A message from ${msg.author.username} was deleted in ${msg.channel}`)
-            .setColor('#ff021b')
-            .setTimestamp()
-            .setFooter({ text: `Author ID: ${msg.author.id}\nMessage ID: ${msg.id}` });
-
-        if (useEmbedFields) {
-            logEmbed.addFields({ name: 'Deleted Message: ', value: `\`\`\`\n${msg.content}\n\`\`\`` });
-        }
-
-        let deleteMessage = msg.client.channels.cache.get(guildSetting.logChannelID);
-        if (!deleteMessage) return;
-
-        if (useEmbedFields) {
-            await deleteMessage.send({ embeds: [logEmbed] });
-        } else {
-            const attachment = new AttachmentBuilder(Buffer.from(msg.content, 'utf-8'), { name: 'message.txt' });
-
-            await deleteMessage.send({
-                embeds: [logEmbed],
-                files: [attachment],
-                content: 'Message content was too long to display in an embed.'
-            });
+        try {
+            if (!msg.content) return;
+
+            const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } });
+            if (!guildSetting || !guildSetting.logChannelID) return;
+
+            const useEmbedFields = msg.content.length <= 1024;
+
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: msg.client.user.avatarURL() })
+                .setDescription(`A message from ${msg.author.username} was deleted in ${msg.channel}`)
+                .setColor('#ff021b')
+                .setTimestamp()
+                .setFooter({ text: `Author ID: ${msg.author.id}\nMessage ID: ${msg.id}` });
+
+            if (useEmbedFields) {
+                logEmbed.addFields({ name: 'Deleted Message: ', value: `\`\`\`\n${msg.content}\n\`\`\`` });
+            }
+
+            let deleteMessage = msg.client.channels.cache.get(guildSetting.logChannelID);
+            if (!deleteMessage) return;
+
+            if (useEmbedFields) {
+                await deleteMessage.send({ embeds: [logEmbed] });
+            } else {
+                const attachment = new AttachmentBuilder(Buffer.from(msg.content, 'utf-8'), { name: 'message.txt' });
+
+                await deleteMessage.send({
+                    embeds: [logEmbed],
+                    files: [attachment],
+                    content: 'Message content was too long to display in an embed.'
+                });
+            }
+        } catch (e) {
+            console.error(e);
         }
     }
 };
diff --git a/bot/src/events/MessageUpdate.js b/bot/src/events/MessageUpdate.js
index 4f4a593..fa20b63 100644
--- a/bot/src/events/MessageUpdate.js
+++ b/bot/src/events/MessageUpdate.js
@@ -4,48 +4,51 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.MessageUpdate,
     async execute(msg, newmsg) {
-        const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } });
-        if (!msg.guild || !guildSetting || !guildSetting.logChannelID) return;
-        if (msg.content === newmsg.content) return;
-
-        const useEmbedFields = msg.content.length <= 1024 &&
-            newmsg.content.length <= 1024;
-
-        const logEmbed = new EmbedBuilder()
-            .setAuthor({ name: 'AleeBot Logging', iconURL: msg.client.user.avatarURL() })
-            .setDescription(`A message from ${msg.author.username} was edited in ${msg.channel}`)
-            .setColor('#ffff1a')
-            .setTimestamp()
-            .setFooter({ text: `Author ID: ${msg.author.id}\nMessage ID: ${msg.id}` });
-
-        if (useEmbedFields) {
-            logEmbed.addFields(
-                { name: 'Before: ', value: `\`\`\`\n${msg.content}\n\`\`\`` },
-                { name: 'After: ', value: `\`\`\`\n${newmsg.content}\n\`\`\`` }
-            );
+        try {
+            const guildSetting = await guildSettings.findOne({ where: { guildID: msg.guild.id } });
+            if (!msg.guild || !guildSetting || !guildSetting.logChannelID) return;
+            if (msg.content === newmsg.content) return;
+
+            const useEmbedFields = msg.content.length <= 1024 &&
+                newmsg.content.length <= 1024;
+
+            const logEmbed = new EmbedBuilder()
+                .setAuthor({ name: 'AleeBot Logging', iconURL: msg.client.user.avatarURL() })
+                .setDescription(`A message from ${msg.author.username} was edited in ${msg.channel}`)
+                .setColor('#ffff1a')
+                .setTimestamp()
+                .setFooter({ text: `Author ID: ${msg.author.id}\nMessage ID: ${msg.id}` });
+
+            if (useEmbedFields) {
+                logEmbed.addFields(
+                    { name: 'Before: ', value: `\`\`\`\n${msg.content}\n\`\`\`` },
+                    { name: 'After: ', value: `\`\`\`\n${newmsg.content}\n\`\`\`` }
+                );
+            }
+
+            let editMessage = msg.client.channels.cache.get(guildSetting.logChannelID);
+            if (!editMessage) return;
+
+            if (useEmbedFields) {
+                await editMessage.send({ embeds: [logEmbed] });
+            } else {
+                let messageContent = [];
+                messageContent.push(`Before:\n${msg.content}`);
+                messageContent.push('-----------------------------------');
+                messageContent.push(`After:\n${newmsg.content}`);
+
+                messageContent = messageContent.join('\n');
+
+                const attachment = new AttachmentBuilder(Buffer.from(messageContent, 'utf-8'), { name: 'message.txt' });
+
+                await editMessage.send({
+                    embeds: [logEmbed],
+                    files: [attachment],
+                    content: 'Message content was too long to display in an embed.'
+                });
+            }
+        } catch (e) {
+            console.error(e);
         }
-
-        let editMessage = msg.client.channels.cache.get(guildSetting.logChannelID);
-        if (!editMessage) return;
-
-        if (useEmbedFields) {
-            await editMessage.send({ embeds: [logEmbed] });
-        } else {
-            let messageContent = [];
-            messageContent.push(`Before:\n${msg.content}`);
-            messageContent.push('-----------------------------------');
-            messageContent.push(`After:\n${newmsg.content}`);
-
-            messageContent = messageContent.join('\n');
-
-            const attachment = new AttachmentBuilder(Buffer.from(messageContent, 'utf-8'), { name: 'message.txt' });
-
-            await editMessage.send({
-                embeds: [logEmbed],
-                files: [attachment],
-                content: 'Message content was too long to display in an embed.'
-            });
-        }
-
     }
 };