gMerge branch 'master' of https://github.com/UniverseDevGroup/PokeBot

Nothin

5 files changed, 20 insertions, 5 deletions

diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js
index 11c0c18..c24ac57 100644
--- a/events/guildMemberAdd.js
+++ b/events/guildMemberAdd.js
@@ -10,7 +10,10 @@
 module.exports = async (bot, member) => {
   const { RichEmbed } = require('discord.js');
   const logChannel = await bot.plugins.settings.getStr('logs', member.guild.id);
-  bot.channels.find('id', logChannel).send(
+  if (!logChannel) return;
+  const channelObj = bot.channels.find('id', logChannel);
+  if (!channelObj) return;
+  channelObj.send(
     new RichEmbed()
       .setColor(0x00ae86)
       .setTitle(`:arrow_right: ${member.user.tag}`)
diff --git a/events/guildMemberRemove.js b/events/guildMemberRemove.js
index 001f2ec..f0d6334 100644
--- a/events/guildMemberRemove.js
+++ b/events/guildMemberRemove.js
@@ -10,7 +10,10 @@
 module.exports = async (bot, member) => {
   const { RichEmbed } = require('discord.js');
   const logChannel = await bot.plugins.settings.getStr('logs', member.guild.id);
-  bot.channels.find('id', logChannel).send(
+  if (!logChannel) return;
+  const channelObj = bot.channels.find('id', logChannel);
+  if (!channelObj) return;
+  channelObj.send(
     new RichEmbed()
       .setColor(0x00ae86)
       .setTitle(`:arrow_left: ${member.user.tag}`)
diff --git a/events/messageDelete.js b/events/messageDelete.js
index 95c3718..5fb2007 100644
--- a/events/messageDelete.js
+++ b/events/messageDelete.js
@@ -19,7 +19,10 @@ module.exports = async (bot, msg) => {
       .setTimestamp()
       .setFooter(`Deleted message orginally created by: ${msg.author.tag}`, msg.author.avatarURL);
     const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id);
-    msg.guild.channels.find('id', logChannel).send({ embed });
+    if (!logChannel) return;
+    const channelObj = bot.channels.find('id', logChannel);
+    if (!channelObj) return;
+    channelObj.send({ embed });
   }
   catch (err) {
     console.error(err.stack);
diff --git a/events/messageDeleteBulk.js b/events/messageDeleteBulk.js
index 3d84e4d..9640dbf 100644
--- a/events/messageDeleteBulk.js
+++ b/events/messageDeleteBulk.js
@@ -17,7 +17,10 @@ module.exports = async (bot, msgs) => {
       .setTimestamp()
       .setFooter('Messages purged');
     const logChannel = await bot.plugins.settings.getStr('logs', msgs.first().guild.id);
-    msgs.first().guild.channels.find('id', logChannel).send({ embed });
+    if (!logChannel) return;
+    const channelObj = bot.channels.find('id', logChannel);
+    if (!channelObj) return;
+    channelObj.send({ embed });
   }
   catch (err) {
     console.error(err.stack);
diff --git a/events/messageUpdate.js b/events/messageUpdate.js
index 0baa08c..43a6a67 100644
--- a/events/messageUpdate.js
+++ b/events/messageUpdate.js
@@ -20,7 +20,10 @@ module.exports = async (bot, oldMsg, newMsg) => {
       .setTimestamp()
       .setFooter(`Edited message originally created by: ${oldMsg.author.tag}`, oldMsg.author.avatarURL);
     const logChannel = await bot.plugins.settings.getStr('logs', oldMsg.guild.id);
-    newMsg.guild.channels.find('id', logChannel).send({ embed });
+    if (!logChannel) return;
+    const channelObj = bot.channels.find('id', logChannel);
+    if (!channelObj) return;
+    channelObj.send({ embed });
   }
   catch (err) {
     console.error(err.stack);