Fixed tests,

prepped for restoring JS to be default over TS

.gitignore

@@ -7,7 +7,8 @@ node_modules/
 
 # Useless files
 .DS_Store
-*.lock
 
 # Private Configuration files
-config.json
+config.json
+
+dist/

commands/announce.js

@@ -1,4 +1,6 @@
-exports.run = (client, message, args) => {
+const Auth = require('../utils/auth')
+
+exports.run = (message, args) => {
 
    if (Auth.isAdmin(message.member)) {
       if(!args || args.length < 1) return message.reply("Must provide the text for the announcement after the command.");

commands/define.js

@@ -235,7 +235,7 @@ GUIDE
 };
 
 // run function for !define command:
-exports.run = (client, message, args) => {
+exports.run = (message, args) => {
   if (args.length === 0)
     return sendMessage(message, 'Use `!define --help` to get command guide.');
   runUserCommand(message, args, args[0]);

commands/helpme.js

@@ -1,6 +1,7 @@
 const Discord = require("discord.js");
+const Config = require('../utils/config');
 
-exports.run = (client, message, args) => {
+exports.run = (message, args) => {
 
    if(!args || args.length < 1) return message.reply(`, you must type your question after the command. You may also use "!helpme PRIVATE" if you would like your question to remain confidential.`);
 

commands/poll.js

@@ -1,4 +1,6 @@
-exports.run = (client, message, args) => {
+const Auth = require('../utils/auth');
+
+exports.run = (message, args) => {
 
    if (Auth.isAdmin(message.member)) {
       if(!args || args.length < 1) return message.reply("Must provide the text of the poll question after the command.");

commands/reload.js

@@ -1,6 +1,6 @@
-exports.run = (client, message, args) => {
-   if(!args || args.size < 1) return message.reply("Must provide a command name to reload.");
-   // the path is relative to the *current folder*, so just ./filename.js
-   delete require.cache[require.resolve(`./${args[0]}.js`)];
-   message.reply(`The command ${args[0]} has been reloaded`);
- };
+exports.run = (message, args) => {
+  if(!args || args.size < 1) return message.reply("Must provide a command name to reload.");
+  // the path is relative to the *current folder*, so just ./filename.js
+  delete require.cache[require.resolve(`./${args[0]}.js`)];
+  message.reply(`The command ${args[0]} has been reloaded`);
+};

events/guildMemberAdd.js

@@ -1,4 +1,6 @@
-exports.run = (client, member) => {
+const Config = require('../utils/config');
+
+exports.run = (member) => {
 
    // Send the message to a designated channel on a server:
    const channel = member.guild.channels.get(Config.getChannel("joins"));

events/message.js

@@ -1,14 +1,14 @@
-exports.run = (client, msg) => {
+exports.run = (msg) => {
 
    if (msg.author.bot) return;
    if(msg.content.indexOf(Config.getCommandPrefix()) !== 0) return;
- 
+
    const args = msg.content.slice(Config.getCommandPrefix().length).trim().split(/ +/g);
    const command = args.shift().toLowerCase().replace('/', '');
 
    try {
      let commandFile = require(`../commands/${command}.js`);
-     commandFile.run(client, msg, args);
+     commandFile.run(msg, args);
    } catch (err) {
      console.error(err);
    }

index.js

@@ -1,5 +1,13 @@
+const moduleAlias = require('module-alias');
+
+moduleAlias.addAliases({
+  '@root'  : __dirname,
+  '@utils': __dirname + '/utils',
+  '@events': __dirname + '/events',
+  '@commands': __dirname + '/commands'
+});
+
 const Config = require('./utils/config');
-const Auth = require('./utils/auth');
 
 const Discord = require('discord.js');
 const client = new Discord.Client();
@@ -15,8 +23,12 @@ fs.readdir('./events/', (err, files) => {
     let eventName = file.split('.')[0];
     let eventFile = require(`./events/${file}`);
 
-    client.on(eventName, (object) => eventFile.run(client, object));
+    client.on(eventName, (object) => eventFile.run(object));
   });
 });
 
 client.login(Config.getBotToken());
+
+module.exports = {
+  client
+}

package.json

@@ -12,13 +12,11 @@
   },
   "dependencies": {
     "discord.js": "^11.4.2",
+    "module-alias": "^2.2.0",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7"
   },
   "devDependencies": {
-    "@babel/core": "^7.3.3",
-    "@babel/preset-env": "^7.3.1",
-    "babel-jest": "^24.1.0",
     "jest": "^24.1.0"
   }
 }

tests/config.test.js

@@ -1,4 +1,4 @@
-const Config = require('../utils/config').config;
+const Config = require('../utils/config');
 
 test('bot token returns string value', () => {
    expect(Config.getBotToken()).toMatch(/[\w\d.]+/)