Check if guild setting exists when bot joins server; Remove check for bot id

3 files changed, 2 insertions, 5 deletions

diff --git a/bot/src/events/GuildCreate.js b/bot/src/events/GuildCreate.js
index 2496867..b5c64a5 100644
--- a/bot/src/events/GuildCreate.js
+++ b/bot/src/events/GuildCreate.js
@@ -7,7 +7,8 @@ export default {
     async execute(guild) {
         try {
             console.log(`[i] New guild joined: ${guild.name} (${guild.id}). This guild has ${guild.memberCount} members!`);
-            await guildSettings.create({ guildID: guild.id });
+            const guildSetting = await guildSettings.findOne({ where: { guildID: guild.id } });
+            if (!guildSetting) await guildSettings.create({ guildID: guild.id });
 
             const logEmbed = new EmbedBuilder()
                 .setAuthor({ name: 'AleeBot', iconURL: guild.client.user.avatarURL() })
diff --git a/bot/src/events/GuildMemberAdd.js b/bot/src/events/GuildMemberAdd.js
index 902f3ab..d346473 100644
--- a/bot/src/events/GuildMemberAdd.js
+++ b/bot/src/events/GuildMemberAdd.js
@@ -5,8 +5,6 @@ import { autoRole, serverWhitelist, roleWhitelist } from '../storage/consts.js';
 export default {
     name: Events.GuildMemberAdd,
     async execute(member) {
-        if (member.id === member.client.user.id) return;
-
         try {
             const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
             if (!guildSetting || !guildSetting.logChannelID) return;
diff --git a/bot/src/events/GuildMemberRemove.js b/bot/src/events/GuildMemberRemove.js
index 2456455..0ae96db 100644
--- a/bot/src/events/GuildMemberRemove.js
+++ b/bot/src/events/GuildMemberRemove.js
@@ -4,8 +4,6 @@ import { guildSettings } from '../models/guild-settings.js';
 export default {
     name: Events.GuildMemberRemove,
     async execute(member) {
-        if (member.id === member.client.user.id) return;
-
         try {
             const guildSetting = await guildSettings.findOne({ where: { guildID: member.guild.id } });
             if (!guildSetting || !guildSetting.logChannelID) return;