testing my luck

5 files changed, 20 insertions, 21 deletions

diff --git a/events/guildMemberAdd.js b/events/guildMemberAdd.js
index f324e73..20b61b6 100644
--- a/events/guildMemberAdd.js
+++ b/events/guildMemberAdd.js
@@ -18,10 +18,10 @@
  *
  * *************************************/
 
-module.exports = (bot, member) => {
+module.exports = async (bot, member) => {
   const { RichEmbed } = require('discord.js');
-  bot.channels.find('name', 'welcome').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`);
-  bot.channels.find('name', 'logs').send(
+  const logChannel = await bot.plugins.settings.getStr('logs', member.guild.id);
+  bot.channels.find('id', logChannel).send(
     new RichEmbed()
       .setColor(0x00ae86)
       .setTitle(`:arrow_right: ${member.user.tag}`)
@@ -31,14 +31,8 @@ module.exports = (bot, member) => {
       .setTimestamp()
       .setFooter(member.user.tag, member.user.avatarURL)
   );
+  if (member.guild.id != '417088992329334792') return;
+  bot.channels.find('name', 'welcome').send(`Welcome to the server **${member.user.tag}**! Make sure to read the rules! We now have ${member.guild.memberCount} members.`);
   const role = member.guild.roles.find('name', 'Trainers');
   member.addRole(role);
-
-  const DMMember = 'Hello, Alee is still working on this feature...';
-  member.user.send(
-    new RichEmbed()
-      .setColor(0x00ae86)
-      .setTitle('Pokebot')
-      .setDescription(DMMember)
-  );
 };
diff --git a/events/guildMemberRemove.js b/events/guildMemberRemove.js
index 2fc1760..7693372 100644
--- a/events/guildMemberRemove.js
+++ b/events/guildMemberRemove.js
@@ -18,10 +18,10 @@
  *
  * *************************************/
 
-module.exports = (bot, member) => {
+module.exports = async (bot, member) => {
   const { RichEmbed } = require('discord.js');
-  bot.channels.find('name', 'welcome').send(`**${member.user.tag}** just left. We now have ${member.guild.memberCount} members left. Aww man...`);
-  bot.channels.find('name', 'logs').send(
+  const logChannel = await bot.plugins.settings.getStr('logs', member.guild.id);
+  bot.channels.find('id', logChannel).send(
     new RichEmbed()
       .setColor(0x00ae86)
       .setTitle(`:arrow_left: ${member.user.tag}`)
@@ -32,4 +32,6 @@ module.exports = (bot, member) => {
       .setTimestamp()
       .setFooter(member.user.tag, member.user.avatarURL)
   );
+  if (member.guild.id != '417088992329334792') return;
+  bot.channels.find('name', 'welcome').send(`**${member.user.tag}** just left. We now have ${member.guild.memberCount} members left. Aww man...`);
 };
diff --git a/events/messageDelete.js b/events/messageDelete.js
index 627b2e0..2823e7f 100644
--- a/events/messageDelete.js
+++ b/events/messageDelete.js
@@ -18,9 +18,9 @@
  *
  * *************************************/
 
-module.exports = (bot, msg) => {
+module.exports = async (bot, msg) => {
   const { RichEmbed } = require('discord.js');
-  if(!msg.content) return;
+  if (!msg.content) return;
   try {
     const embed = new RichEmbed()
       .setColor(0x00ae86)
@@ -29,7 +29,8 @@ module.exports = (bot, msg) => {
       .addField('Deleted Message', msg.content)
       .setTimestamp()
       .setFooter(`Deleted message orginally created by: ${msg.author.tag}`, msg.author.avatarURL);
-    msg.guild.channels.find('name', 'logs').send({ embed });
+    const logChannel = await bot.plugins.settings.getStr('logs', msg.guild.id);
+    msg.guild.channels.find('id', logChannel).send({ embed });
   }
   catch (err) {
     console.error(err.stack);
diff --git a/events/messageDeleteBulk.js b/events/messageDeleteBulk.js
index 1a5d1d1..0d0c345 100644
--- a/events/messageDeleteBulk.js
+++ b/events/messageDeleteBulk.js
@@ -18,7 +18,7 @@
  *
  * *************************************/
 
-module.exports = (bot, msgs) => {
+module.exports = async (bot, msgs) => {
   const { RichEmbed } = require('discord.js');
   try {
     const embed = new RichEmbed()
@@ -27,7 +27,8 @@ module.exports = (bot, msgs) => {
       .setDescription(`${msgs.size} messages in *${msgs.first().channel}* were bulk deleted.`)
       .setTimestamp()
       .setFooter('Messages purged');
-    msgs.first().guild.channels.find('name', 'logs').send({ embed });
+    const logChannel = await bot.plugins.settings.getStr('logs', msgs.first().guild.id);
+    msgs.first().guild.channels.find('id', logChannel).send({ embed });
   }
   catch (err) {
     console.error(err.stack);
diff --git a/events/messageUpdate.js b/events/messageUpdate.js
index 59133cb..ed0565b 100644
--- a/events/messageUpdate.js
+++ b/events/messageUpdate.js
@@ -18,7 +18,7 @@
  *
  * *************************************/
 
-module.exports = (bot, oldMsg, newMsg) => {
+module.exports = async (bot, oldMsg, newMsg) => {
   const { RichEmbed } = require('discord.js');
   if (oldMsg.content == newMsg.content) return;
   try {
@@ -30,7 +30,8 @@ module.exports = (bot, oldMsg, newMsg) => {
       .addField('New Message', newMsg.content)
       .setTimestamp()
       .setFooter(`Edited message originally created by: ${oldMsg.author.tag}`, oldMsg.author.avatarURL);
-    newMsg.guild.channels.find('name', 'logs').send({ embed });
+    const logChannel = await bot.plugins.settings.getStr('logs', oldMsg.guild.id);
+    newMsg.guild.channels.find('id', logChannel).send({ embed });
   }
   catch (err) {
     console.error(err.stack);