Merge pull request #2 from esfox/master

Hello. I think I wanna help refactor. :)

Author: matsyui

commands/emmessage.js

@@ -1,66 +1,52 @@
 require ('dotenv').config()
 const Discord = require('discord.js');
 const usedCommand = new Set();
-const config = process.env;
+const { prefix, ownerID } = process.env;
 
-module.exports.run = async (bot, message, args) => {
-    if(usedCommand.has(message.author.id)){
-        message.reply("You cannot use " + config.prefix + "emmessage command beacuse of the cooldown.")
-    } else {
-        if (message.content.toLowerCase().startsWith(config.prefix + "emmessage")) {
+exports.run = (bot, message) => {
 
-            if(message.author.id !== config.ownerid){
-            return message.reply("You're not my developer to do that!");
-            }      
+    const { content, attachments } = message;
 
-            const contentmsga = message.content.substr(config.prefix.length);
-            const contentmsg = contentmsga.substr(9);
-            var Attachment = (message.attachments);
+    if(usedCommand.has(message.author.id)) {
+        return message.reply(`You cannot use ${prefix}emmessage command beacuse of the cooldown.`)
+    }
+
+    if(message.author.id !== ownerID) {
+        return message.reply("You're not my developer to do that!");
+    }
 
-            if(message.attachments.size > 0){
-                const MEAEmbed = new Discord.MessageEmbed() 
-                .setColor('#b491c8')
-                .setTitle('Prune Bot | Announcement')
-                .setAuthor('Join our Discord Server', 'https://i.imgur.com/hKeHeEy.gif', 'https://discord.io/LIMYAW')
-                .setDescription(contentmsg)
-                .setThumbnail('https://i.imgur.com/ypxq7B9.png')
-                .addFields(
-                    { name: 'Github (Source Code)', value: 'https://github.com/mashwishi/PruneBot' },
-                    { name: 'Support the Developer:', value: 'https://ko-fi.com/mashwishi' }   
-                  )       
-                .setImage(Attachment.array()[0].url)     
-                .setTimestamp()
-                .setFooter('PruneBot is created by Mashwishi', 'https://i.imgur.com/DxWDaGv.png');
-                            
-                return bot.guilds.cache.array().forEach(guild => guild.owner.send(MEAEmbed));
-            }  
-       
-            const MEEmbed = new Discord.MessageEmbed() 
-            .setColor('#b491c8')
-            .setTitle('Prune Bot | Announcement')
-            .setAuthor('Join our Discord Server', 'https://i.imgur.com/hKeHeEy.gif', 'https://discord.io/LIMYAW')
-            .setDescription(contentmsg)
-            .setThumbnail('https://i.imgur.com/ypxq7B9.png')
-            .addFields(
-                { name: 'Github (Source Code)', value: 'https://github.com/mashwishi/PruneBot' },
-                { name: 'Support the Developer:', value: 'https://ko-fi.com/mashwishi' }   
-              )          
-            .setTimestamp()
-            .setFooter('PruneBot is created by Mashwishi', 'https://i.imgur.com/DxWDaGv.png');
-            bot.guilds.cache.array().forEach(guild => guild.owner.send(MEEmbed));
+    const description = content.substr(prefix.length).substr(9);
+    const embed = new Discord.MessageEmbed()
+        .setColor('#b491c8')
+        .setTitle('Prune Bot | Announcement')
+        .setAuthor(
+            'Join our Discord Server',
+            'https://i.imgur.com/hKeHeEy.gif',
+            'https://discord.io/LIMYAW',
+        )
+        .setDescription(description)
+        .setThumbnail('https://i.imgur.com/ypxq7B9.png')
+        .addFields([
+            { name: 'Github (Source Code)', value: 'https://github.com/mashwishi/PruneBot' },
+            { name: 'Support the Developer:', value: 'https://ko-fi.com/mashwishi' }
+        ])
+        .setFooter('PruneBot is created by Mashwishi', 'https://i.imgur.com/DxWDaGv.png')
+        .setTimestamp();
 
-          }
-        usedCommand.add(message.author.id);
-        setTimeout(() => {
-            usedCommand.delete(message.author.id);
-        }, 5000); 
+    if(attachments.size > 0) {
+        embed.setImage(attachments.first().url)
     }
+
+    bot.guilds.cache.array().forEach(guild => guild.owner.send(embed));
+
+    usedCommand.add(message.author.id);
+    setTimeout(() => usedCommand.delete(message.author.id), 5000);
 }
 
-module.exports.config = {
+exports.config = {
     name: "emmessage",
     description: "",
     usage: "?emmessage",
     accessableby: "Admins",
     aliases: []
-}
+}

events/guildMemberAdd.js

@@ -0,0 +1,4 @@
+module.exports = member => {
+    //const welcomeChannel = member.guild.channels.cache.find(channel => channel.name === 'welcome')
+    //welcomeChannel.send (`Welcome! ${member}`)
+}

events/index.js

@@ -0,0 +1,7 @@
+const ready = require("./ready");
+const guildMemberAdd = require("./guildMemberAdd");
+
+module.exports = bot => {
+    bot.on("ready", () => ready(bot));
+    bot.on("guildMemberAdd", guildMemberAdd);
+}

events/ready.js

@@ -1,6 +1,6 @@
 const Discord = require("discord.js")
 
-module.exports = bot => { 
+module.exports = bot => {
     console.log(`${bot.user.username} is online`)
     bot.user.setActivity('this server.', { type: 'WATCHING' });
 }

index.js

@@ -1,50 +1,50 @@
 require ('dotenv').config()
 const Discord = require('discord.js');
-const config = process.env;
+const { readdirSync } = require("fs");
+const handleEvents = require("./events");
 
+const config = process.env;
 const bot = new Discord.Client({disableEveryone: true});
 
-bot.on("guildMemberAdd", member => {
-    //const welcomeChannel = member.guild.channels.cache.find(channel => channel.name === 'welcome')
-    //welcomeChannel.send (`Welcome! ${member}`)
-})
-
-require("./util/eventHandler")(bot)
+handleEvents(bot);
 
-const fs = require("fs");
 bot.commands = new Discord.Collection();
 bot.aliases = new Discord.Collection();
 
-fs.readdir("./commands/", (err, files) => {
-
-    if(err) console.log(err)
-
-    let jsfile = files.filter(f => f.split(".").pop() === "js") 
-    if(jsfile.length <= 0) {
-         return console.log("[LOGS] Couldn't Find Commands!");
+try
+{
+    let files = readdirSync("./commands/");
+    let jsfiles = files.filter(f => f.split(".").pop() === "js")
+    if(jsfiles.length <= 0) {
+        return console.log("[LOGS] Couldn't Find Commands!");
     }
 
-    jsfile.forEach((f, i) => {
+    jsfiles.forEach(f => {
         let pull = require(`./commands/${f}`);
-        bot.commands.set(pull.config.name, pull);  
+        bot.commands.set(pull.config.name, pull);
         pull.config.aliases.forEach(alias => {
             bot.aliases.set(alias, pull.config.name)
         });
     });
-});
 
-bot.on("message", async message => {
-    if(message.author.bot || message.channel.type === "dm") return;
+    bot.on("message", message => {
+        if(message.author.bot || message.channel.type === "dm") return;
 
-    let prefix = config.prefix;
-    let messageArray = message.content.split(" ");
-    let cmd = messageArray[0];
-    let args = message.content.substring(message.content.indexOf(' ')+1);
+        let { content } = message;
+        let { prefix } = config;
+        if(!content.startsWith(prefix)) return;
 
-    if(!message.content.startsWith(prefix)) return;
-    let commandfile = bot.commands.get(cmd.slice(prefix.length)) || bot.commands.get(bot.aliases.get(cmd.slice(prefix.length)))
-    if(commandfile) commandfile.run(bot,message,args)
+        let [ cmd, args ] = content.split(/\s(.+)/);
+        cmd = cmd.slice(prefix.length);
 
-})
+        let commandfile = bot.commands.get(cmd) || bot.commands.get(bot.aliases.get(cmd))
+        if(commandfile) commandfile.run(bot, message, args)
+    })
 
-bot.login(process.env.token);
+    bot.login(process.env.TOKEN);
+}
+catch(error)
+{
+    console.log("Cannot load command files");
+    console.log(error);
+}

package.json

@@ -2,7 +2,7 @@
   "name": "PruneBot",
   "version": "1.0.0",
   "description": "A Discord Moderation Bot",
-  "main": "mybot.js",
+  "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
   },