Added try/catch function for logging

1 files changed, 33 insertions, 26 deletions

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);
         }
+
     }
 };