From d69dcf2d209bbf700bb1f0440ab40a678ee99fdd Mon Sep 17 00:00:00 2001
From: Alee14 <Alee14498@gmail.com>
Date: Fri, 4 May 2018 20:41:20 -0400
Subject: Update package.json

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 3fdf463..cbaa0a9 100644
--- a/package.json
+++ b/package.json
@@ -10,11 +10,11 @@
   "author": "Alee, Justin, and Trey",
   "license": "GPL-3.0",
   "dependencies": {
-    "canvas": "^2.0.0-alpha.11",
+    "canvas": "^1.6.10",
     "dblapi.js": "^1.2.0",
     "discord.js": "^11.3.0",
-    "discord.js-lavalink": "github:mrjacz/discord.js-lavalink",
     "quick.db": "^5.3.8",
+    "raven": "^2.6.0",
     "request-promise": "^4.2.2",
     "snekfetch": "^4.0.0-rc.0"
   }
-- 
cgit v1.2.3


From 3c376e5eeaad0edc2dafa2cc5209780b50d17243 Mon Sep 17 00:00:00 2001
From: Unknown <jtsshieh@outlook.com>
Date: Fri, 4 May 2018 20:44:44 -0400
Subject: fixes

---
 events/guildMemberAdd.js    | 5 ++++-
 events/guildMemberRemove.js | 5 ++++-
 events/messageDelete.js     | 5 ++++-
 events/messageDeleteBulk.js | 5 ++++-
 events/messageUpdate.js     | 5 ++++-
 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);
-- 
cgit v1.2.3