refactor(*): Move command functions into commands.js

Why on earth does Discord even allow people to have spaces in their usernames?

README.md

@@ -12,6 +12,7 @@ Commands:
 * q pokemon ign   - Join the queue (first player can set the pokemon and their in-game name)
 * lq  - Leave the queue
 * sq  - Show the queue
+* start - Vote to start the adventure early, without the full number of players (all players in the queue must use this to start early)
 * cq  - Clear the queue (admin-only, not to be shared with normal users)
 * ru  - Remove a tagged user from the queue (admin-only, not to be shared with normal users)
 * dc  - Delete an adventure channel (only the captain can use this)
@@ -34,12 +35,24 @@ For a sanity check, you can run `docker images` and it should be displayed in th
 
 ## Running the Docker container
 
-Running the bot with -d runs the container in detatched mode (as in it runs in the background). If you want to see what is happening, remove that option.
+Running the bot with --detach runs the container in detatched mode (as in it runs in the background). If you want to see what is happening, remove that option.
 
-`docker run -d denbot`
+`docker run --detach --name denbot denbot`
 
 You can use CTRL+C to exit out of this command window. If you're using Windows, Docker Desktop will now show your bot under 'Containers/Apps', from where you can easily stop and start it using the GUI.
 
+## Updating
+
+If doing it manually, in the folder with all the files run:
+
+```
+docker stop denbot
+docker rm denbot
+docker image rm denbot
+docker build -t denbot .
+docker run --detach --name denbot denbot
+```
+
 ### More information
 
 If you want more of a sanity check here are some following commands you can run the following commands:
@@ -51,6 +64,6 @@ To access the command line inside the docker container you can run:
 
 `docker exec -it <container id> /bin/bash`
 
-## Version 2.0 potential features
+## Future feature suggestions
 
-* Let three people agree to start early using a voting command, so they don't have to wait for a fourth person (all three must vote to start)
+* If the party want to continue with the same people and the same link code they can do !again (only in the private chat) to run again and get the party for 30 more mins (denBot would also post the link code again so people can see it without scrolling) - using something like https://stackoverflow.com/questions/36563749/how-i-extend-settimeout-on-nodejs and an array of all the queues, removing those and their deletion functions each time an adventure channel is deleted

commands.js

@@ -0,0 +1,362 @@
+const {
+  checkQueue,
+  deleteChannel,
+  getChannelName,
+  getUserFromMention,
+  sendEmbedMessage,
+} = require('./helpers.js');
+
+let playerQueue = [];
+let playerVotes = [];
+let pokemonName = '';
+let captainInGameName = '';
+
+module.exports = {
+  matchCommand: function (Discord, config, logger, message, command, args) {
+    switch (command) {
+      case 'help':
+        commandHelp(Discord, config, logger, message, command, args);
+        break;
+      case 'adminhelp':
+        commandHelp(Discord, config, logger, message, command, args);
+        break;
+      case 'q':
+        commandJoinQueue(Discord, config, logger, message, command, args);
+        break;
+      case 'lq':
+        commandLeaveQueue(Discord, config, logger, message, command, args);
+        break;
+      case 'start':
+        commandStartEarly(Discord, config, logger, message, command, args);
+        break;
+      case 'sq':
+        commandShowQueue(Discord, config, logger, message, command, args);
+        break;
+      case 'cq':
+        commandClearQueue(Discord, config, logger, message, command, args);
+        break;
+      case 'ru':
+        commandRemoveUserFromQueue(Discord, config, logger, message, command, args);
+        break;
+      case 'dc':
+        commandDeleteChannel(Discord, config, logger, message, command, args);
+        break;
+      default:
+        message.channel.send('That command is not one I know yet!');
+    }
+  },
+};
+
+function commandHelp(Discord, config, logger, message, command, args) {
+  const helpMessage = `
+The commands available to you are:
+\`${config.prefix}q\` - Join the queue
+\`${config.prefix}q <pokemon> <ign>\` - Join the queue (first player can set the pokemon and their in-game name)
+\`${config.prefix}lq\` - Leave the queue
+\`${config.prefix}sq\` - Show the queue
+\`${config.prefix}start\` - Vote to start the adventure early, without the full number of players (all players in the queue must use this to start early)
+\`${config.prefix}dc\` - Delete an adventure channel (only the captain can use this)
+  `;
+
+  message.channel.send(helpMessage);
+}
+
+function commandAdminHelp(Discord, config, logger, message, command, args) {
+  const helpMessage = `
+The commands available to you are:
+\`${config.prefix}q\` - Join the queue
+\`${config.prefix}q <pokemon> <ign>\` - Join the queue (first player can set the pokemon and their in-game name)
+\`${config.prefix}lq\` - Leave the queue
+\`${config.prefix}sq\` - Show the queue
+\`${config.prefix}start\` - Vote to start the adventure early, without the full number of players (all players in the queue must use this to start early)
+\`${config.prefix}cq\` - Clear the queue (admin-only, not to be shared with normal users)
+\`${config.prefix}ru\` - Remove a tagged user from the queue (admin-only, not to be shared with normal users)
+\`${config.prefix}dc\` - Delete an adventure channel (only the captain can use this)
+  `;
+
+  message.channel.send(helpMessage);
+}
+
+function commandJoinQueue(Discord, config, logger, message, command, args) {
+  if (!playerQueue.includes(message.author)) {
+    // Delete the message with the bot command
+    if (config.deletecommandstoggle) {
+      message.delete();
+    }
+
+    logger.info(`${message.author.username} used command q in ${message.channel.name}`);
+
+    logger.info(`${message.author.username} joined the queue.`);
+    sendEmbedMessage(
+      logger,
+      message,
+      Discord,
+      'Queue in progress',
+      `${message.author.username} joined the queue.`
+    );
+
+    playerQueue.push(message.author);
+
+    if (playerQueue.length === 1 && args[0] && args[1]) {
+      // First player can submit pokemon and in-game name
+      pokemonName = args[0];
+      captainInGameName = args[1];
+    }
+
+    checkQueue(
+      message,
+      playerQueue,
+      playerVotes,
+      logger,
+      Discord,
+      pokemonName,
+      captainInGameName,
+      config
+    );
+  } else if (playerQueue.includes(message.author)) {
+    // Delete the message with the bot command
+    if (config.deletecommandstoggle) {
+      message.delete();
+    }
+
+    logger.info(`${message.author.username} used command q in ${message.channel.name}`);
+
+    message.channel.send(
+      `${message.author.username} is too keen, you're already in the queue mate!`
+    );
+  }
+}
+
+function commandLeaveQueue(Discord, config, logger, message, command, args) {
+  if (playerQueue.includes(message.author)) {
+    // Delete the message with the bot command
+    if (config.deletecommandstoggle) {
+      message.delete();
+    }
+
+    logger.info(`${message.author.username} used command lq in ${message.channel.name}`);
+
+    for (var i = 0; i < playerQueue.length; i++) {
+      if (playerQueue[i] === message.author) {
+        playerQueue.splice(i, 1);
+        i--;
+      }
+    }
+
+    for (var i = 0; i < playerVotes.length; i++) {
+      if (playerVotes[i] === message.author) {
+        playerVotes.splice(i, 1);
+        i--;
+      }
+    }
+
+    logger.info(`${message.author.username} left the queue.`);
+    sendEmbedMessage(
+      logger,
+      message,
+      Discord,
+      'Queue in progress',
+      `${message.author.username} left the queue.`
+    );
+
+    checkQueue(
+      message,
+      playerQueue,
+      playerVotes,
+      logger,
+      Discord,
+      pokemonName,
+      captainInGameName,
+      config
+    );
+  } else if (!playerQueue.includes(message.author)) {
+    // Delete the message with the bot command
+    if (config.deletecommandstoggle) {
+      message.delete();
+    }
+
+    logger.info(`${message.author.username} used command lq in ${message.channel.name}`);
+
+    message.channel.send(
+      `${message.author.username} you can't leave the queue before you've joined it!`
+    );
+  }
+}
+
+function commandStartEarly(Discord, config, logger, message, command, args) {
+  // Vote to start early with only the users currently in the queue
+  // Delete the message with the bot command
+  if (config.deletecommandstoggle) {
+    message.delete();
+  }
+
+  logger.info(`${message.author.username} used command ${command} in ${message.channel.name}`);
+
+  if (playerQueue.length == 0) {
+    message.channel.send(
+      `You can only vote to start an adventure early if there is a queue. You can start a queue by using the command ${config.prefix}help`
+    );
+  } else if (!playerQueue.includes(message.author)) {
+    message.channel.send(
+      `You can only vote to start an adventure early if you are in the queue. You can join the queue by using the command ${config.prefix}q`
+    );
+  } else if (playerVotes.length == 0) {
+    // First player to vote
+    playerVotes.push(message.author);
+
+    sendEmbedMessage(
+      logger,
+      message,
+      Discord,
+      'Voting to start early',
+      `${message.author.username} voted to start the adventure.\nAll other players in the queue must also vote to start the adventure for it to begin without ${config.maxqueuesize} players.`
+    );
+  } else if (playerVotes.includes(message.author.username)) {
+    sendEmbedMessage(
+      logger,
+      message,
+      Discord,
+      'Voting to start early',
+      `${message.author.username} has already voted to start the adventure.\nAll other players in the queue must also vote to start the adventure for it to begin without ${config.maxqueuesize} players.`
+    );
+  } else if (playerVotes.length < config.maxqueuesize) {
+    // Not the first player to vote
+    playerVotes.push(message.author);
+
+    if (playerVotes.length < playerQueue.length) {
+      // Still not all players voted
+      sendEmbedMessage(
+        logger,
+        message,
+        Discord,
+        'Voting to start early',
+        `${message.author.username} voted to start the adventure.\nAll other players in the queue must also vote to start the adventure for it to begin without ${config.maxqueuesize} players.`
+      );
+    } else {
+      // All players have voted, we can start the adventure early
+      checkQueue(
+        message,
+        playerQueue,
+        playerVotes,
+        logger,
+        Discord,
+        pokemonName,
+        captainInGameName,
+        config
+      );
+    }
+  }
+}
+
+function commandShowQueue(Discord, config, logger, message, command, args) {
+  // Delete the message with the bot command
+  if (config.deletecommandstoggle) {
+    message.delete();
+  }
+
+  logger.info(`${message.author.username} used command sq in ${message.channel.name}`);
+
+  checkQueue(
+    message,
+    playerQueue,
+    playerVotes,
+    logger,
+    Discord,
+    pokemonName,
+    captainInGameName,
+    config
+  );
+}
+
+function commandClearQueue(Discord, config, logger, message, command, args) {
+  // Delete the message with the bot command
+  if (config.deletecommandstoggle) {
+    message.delete();
+  }
+
+  logger.info(`${message.author.username} used command cq in ${message.channel.name}`);
+
+  if (playerQueue.length === 0) {
+    message.channel.send(`The queue is already empty...`);
+    logger.info(
+      `${message.author.username} attempted to clear the queue but it was already empty.`
+    );
+  } else {
+    playerQueue = [];
+    playerVotes = [];
+    message.channel.send(`The queue has been cleared!`);
+    logger.info(`${message.author.username} cleared the queue and the votes.`);
+    pokemonName = '';
+    captainInGameName = '';
+    logger.info('Emptied pokemon name and captain name');
+  }
+}
+
+function commandRemoveUserFromQueue(Discord, config, logger, message, command, args) {
+  // Remove a tagged user from the queue
+  if (args[0]) {
+    // Delete the message with the bot command
+    if (config.deletecommandstoggle) {
+      message.delete();
+    }
+
+    try {
+      const user = getUserFromMention(args[0], logger, message);
+      logger.info(`${message.author.username} used command ru ${user} in ${message.channel.name}`);
+
+      if (playerQueue.includes(user)) {
+        // Search for the user
+        for (var i = 0; i < playerQueue.length; i++) {
+          if (playerQueue[i].username === user.username) {
+            playerQueue.splice(i, 1);
+            i--;
+          }
+        }
+
+        for (var i = 0; i < playerVotes.length; i++) {
+          if (playerVotes[i].username === user.username) {
+            playerVotes.splice(i, 1);
+            i--;
+          }
+        }
+
+        message.channel.send(`${user.username} removed from queue.`);
+        logger.info(`${message.author.username} removed ${user.username} from queue.`);
+
+        checkQueue(
+          message,
+          playerQueue,
+          playerVotes,
+          logger,
+          Discord,
+          pokemonName,
+          captainInGameName,
+          config
+        );
+      } else if (!playerQueue.includes(user)) {
+        message.channel.send(`${user.username} is not in the queue.`);
+        logger.info(
+          `${message.author.username} attempted to remove ${user.username} from queue but they weren't in it.`
+        );
+      }
+    } catch (error) {
+      logger.error(`Tried to remove user ${args[0]} from queue but got an error: ${error}`);
+      message.channel.send(`Failed to remove ${args[0]} from the queue.`);
+    }
+  }
+}
+
+function commandDeleteChannel(Discord, config, logger, message, command, args) {
+  logger.info(`${message.author.username} used command dc in ${message.channel.name}`);
+
+  // Determine if they can delete the channel (i.e. it's their temporary one) - compare the name
+  if (message.channel.name === getChannelName(message.author.username)) {
+    deleteChannel(message, message.channel.name, logger);
+    logger.info(`${message.author.username} deleted their adventure channel.`);
+  } else {
+    message.channel.send(`${message.author.username} is not allowed to delete this channel.`);
+    logger.info(
+      `${message.author.username} attempted to delete channel ${message.channel.name} but it's not their adventure channel.`
+    );
+  }
+}

config.json

@@ -3,10 +3,10 @@
   "deletecommandstoggle": false,
   "maxqueuesize": 4,
   "elasticsearch" : {
-    "elasticsearch_address" : "http://jcreek.ddns.net:9200",
+    "elasticsearch_address" : "http://YOUR-ELASTICSEARCH-ADDRESS-GOES-HERE:9200",
     "elasticsearch_index_pattern" : "[logs-denbot-]YYYY.MM.DD"
   },
   "prefix": "!",
-  "token-dev": "Nzc4MDI2MTE1NDkwOTA2MTYz.X7L_SA.bNzC1kQUpBSwEsjp_cDGwR62Soo",
-	"token": "NzcwMDQyMDEzMjY5NDkxNzUy.X5Xzgg.kcr_51g95iUvEcYCfbQvG1Sx8ao"
+  "token-dev": "YOUR-DEV-TOKEN-GOES-HERE",
+	"token": "YOUR-TOKEN-GOES-HERE"
 }

helpers.js

@@ -0,0 +1,217 @@
+const { loggers } = require('winston');
+
+module.exports = {
+  checkQueue: function (
+    message,
+    playerQueue,
+    playerVotes,
+    logger,
+    Discord,
+    pokemonName,
+    captainInGameName,
+    config
+  ) {
+    if (
+      playerQueue.length === config.maxqueuesize ||
+      (playerQueue.length > 0 && playerQueue.length == playerVotes.length)
+    ) {
+      // Queue is full
+      logger.info('Queue is full');
+
+      // Post a message to say the queue is complete
+      module.exports.sendEmbedMessage(
+        logger,
+        message,
+        Discord,
+        'Queue full',
+        `The adventure is beginning - players should check their DMs\n${playerQueue
+          .map((player, index) => `${index + 1} - ${player.username}`)
+          .join('\n')}`
+      );
+
+      const randomCode = generateRandomCode();
+      const baseMessage = `@${playerQueue[0].username} is making the lobby. Here is your link code ${randomCode}`;
+      const adventureMessage =
+        pokemonName === '' && captainInGameName === ''
+          ? `${generateQueueTitle(playerQueue, config)}\n${baseMessage}`
+          : `${generateQueueTitle(
+              playerQueue,
+              config
+            )}\nPokemon: ${pokemonName}\nCaptain's IGN: ${captainInGameName}\n${baseMessage}`;
+
+      try {
+        // DM users
+        playerQueue.forEach((player) => {
+          message.client.users.cache.get(player.id).send(adventureMessage);
+        });
+      } catch (error) {
+        logger.error('Tried to DM users: ', error);
+        module.exports.sendEmbedMessage(
+          logger,
+          message,
+          Discord,
+          'An error occurred',
+          `There was an error, please let an admin know!\n${error}`,
+          '#DB4437'
+        );
+      }
+
+      makeTempChannel(message, adventureMessage, playerQueue, logger);
+
+      // Clear the queue and votes
+      playerQueue = [];
+      logger.info('Emptied queue');
+      playerVotes = [];
+      logger.info('Emptied votes');
+      pokemonName = '';
+      captainInGameName = '';
+      logger.info('Emptied pokemon name and captain name');
+    } else if (playerQueue.length === 0) {
+      module.exports.sendEmbedMessage(
+        logger,
+        message,
+        Discord,
+        'Queue empty',
+        'The queue is empty :('
+      );
+      pokemonName = '';
+      captainInGameName = '';
+    } else {
+      // Show queue after adding
+      let queueTitle = generateQueueTitle(playerQueue, config);
+      if (pokemonName === '' && captainInGameName === '') {
+        module.exports.sendEmbedMessage(
+          logger,
+          message,
+          Discord,
+          queueTitle,
+          `${playerQueue.map((player, index) => `${index + 1} - ${player.username}`).join('\n')}`
+        );
+      } else {
+        module.exports.sendEmbedMessage(
+          logger,
+          message,
+          Discord,
+          queueTitle,
+          `**Pokemon**: ${pokemonName}\n**Captain's IGN**: ${captainInGameName}\n${playerQueue
+            .map((player, index) => `${index + 1} - ${player.username}`)
+            .join('\n')}`
+        );
+      }
+    }
+  },
+  deleteChannel: function (message, channelName, logger) {
+    try {
+      // Get a Channel by Name
+      const fetchedChannel = message.guild.channels.cache.find(
+        (channel) => channel.name.toLowerCase() == channelName.toLowerCase()
+      );
+
+      logger.info(`Deleting temp channel ${channelName}`);
+      fetchedChannel.delete();
+    } catch (error) {
+      logger.error(`Tried to delete channel ${channelName}: `, error);
+
+      let names = [];
+      message.guild.channels.cache.forEach((channel) => {
+        names.push(channel.name);
+      });
+      logger.info(`Channel names in cache: ${names}`);
+    }
+  },
+  getChannelName: function (username) {
+    return `${username.toLowerCase().replace(' ', '-')}s-adventurers`;
+  },
+  getUserFromMention: function (mention, logger, message) {
+    try {
+      if (!mention) return;
+
+      if (mention.startsWith('<@') && mention.endsWith('>')) {
+        mention = mention.slice(2, -1);
+
+        if (mention.startsWith('!')) {
+          mention = mention.slice(1);
+        }
+
+        return message.client.users.cache.get(mention);
+      }
+    } catch (error) {
+      logger.error('Tried to get users from mention: ', error);
+    }
+  },
+  sendEmbedMessage: function (logger, message, Discord, title, description, colour = '#F4B400') {
+    // For documentation see https://github.com/AnIdiotsGuide/discordjs-bot-guide/blob/master/first-bot/using-embeds-in-messages.md
+    try {
+      const embed = new Discord.MessageEmbed()
+        .setTitle(title)
+        .setColor(colour)
+        .setDescription(description)
+        .setFooter('This is a custom bot - if it goes down, tag Scruffy')
+        .setThumbnail(
+          'https://cdn.discordapp.com/icons/770039159506337802/a_510706276ebcf77e568900fa708e6c63.png?size=128'
+        )
+        .setTimestamp();
+
+      message.channel.send(embed);
+    } catch (error) {
+      logger.error('Failed to send embed message', error);
+      message.channel.send('There was a problem, sorry!');
+    }
+  },
+};
+
+function generateQueueTitle(playerQueue, config) {
+  return `\n===== ADVENTURE QUEUE (${playerQueue.length}/${config.maxqueuesize}) =====`;
+}
+
+function generateRandomCode() {
+  const num1 = Math.floor(Math.random() * 9999 + 1);
+  const num2 = Math.floor(Math.random() * 9999 + 1);
+
+  // Pad the start of the numbers so there's always four digits, including leading zeros
+  return `${num1.toString().padStart(4, '0')}-${num2.toString().padStart(4, '0')}`;
+}
+
+function makeTempChannel(message, adventureMessage, playerQueue, logger) {
+  const channelName = module.exports.getChannelName(playerQueue[0].username);
+  let createdChannelId = '';
+  let everyoneRole = message.guild.roles.cache.find((r) => r.name === '@everyone');
+
+  let permissionOverwrites = [
+    {
+      id: everyoneRole.id,
+      deny: ['VIEW_CHANNEL'],
+    },
+  ];
+
+  playerQueue.forEach((player) => {
+    permissionOverwrites.push({
+      id: player.id,
+      allow: ['VIEW_CHANNEL'],
+    });
+  });
+
+  logger.info(`Making temp channel ${channelName}`);
+  message.guild.channels
+    .create(channelName, {
+      type: 'text',
+      permissionOverwrites: permissionOverwrites,
+    })
+    .then((createdChannel) => {
+      createdChannelId = createdChannel.id;
+
+      // Post in the channel
+      createdChannel.send(adventureMessage);
+      createdChannel.send(
+        `Please delete this channel when you're finished with it using the ${config.prefix}dc command`
+      );
+    })
+    .catch(logger.error);
+
+  // try {
+  //   // Delete the channel after the configured amount of minutes
+  //   setTimeout(function(){ deleteChannel(message, channelName); }, (config.channeldeletetimeinminutes * 1000 * 60) );
+  // } catch (error) {
+  //   logger.error(`Tried to delete channel ${channelName} after timeout: `, error);
+  // }
+}

index.js

@@ -2,236 +2,15 @@ const Discord = require('discord.js');
 const winston = require('winston');
 const Elasticsearch = require('winston-elasticsearch');
 const config = require('./config.json');
+const { initialiseLogger } = require('./logger.js');
+const { matchCommand } = require('./commands.js');
 const client = new Discord.Client();
-
-const { format } = winston;
-const { combine, timestamp } = format;
-
-let env = 'dev';
-if (process.env.NODE_ENV === 'production') {
-  env = 'prod';
-}
-
-// Custom format function that will look for an error object and log out the stack and if
-// its not production, the error itself
-const myFormat = format.printf((info) => {
-  const { timestamp: tmsmp, level, message, error, ...rest } = info;
-  let log = `${tmsmp} - ${level}:\t${message}`;
-  // Only if there is an error
-  if ( error ) {
-    if ( error.stack) log = `${log}\n${error.stack}`;
-    if (process.env.NODE_ENV !== 'production') log = `${log}\n${JSON.stringify(error, null, 2)}`;
-  }
-  // Check if rest is object
-  if ( !( Object.keys(rest).length === 0 && rest.constructor === Object ) ) {
-    log = `${log}\n${JSON.stringify(rest, null, 2)}`;
-  }
-  return log;
-});
-
-const esTransportOpts = {
-  level: 'info',
-  indexPrefix: 'logs_denbot',
-  clientOpts: {
-      host: config.elasticsearch.elasticsearch_address,
-      log: 'info'
-  },
-  transformer: logData => {
-      return {
-        timestamp: new Date().toISOString(),
-        severity: logData.level,
-        message: logData.message,
-        meta: {
-          app: 'denBot',
-          env: env,
-          stack: logData.meta.stack
-        }
-      }
-  }
-};
-
-const logger = winston.createLogger({
-  level: 'info',
-  format: combine(
-    winston.format.errors({ stack: true }), // <-- use errors format
-    winston.format.timestamp(),
-    winston.format.prettyPrint(),
-    myFormat,
-    winston.format.json()
-  ),
-  defaultMeta: { service: 'user-service' },
-  transports: [
-    new winston.transports.File({ filename: 'error.log', level: 'error' }),
-    new winston.transports.File({ filename: 'combined.log' }),
-    new Elasticsearch(esTransportOpts)
-  ],
-});
-
-//
-// If we're not in production then log to the `console` with the format:
-// `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
-//
-//if (process.env.NODE_ENV !== 'production') {
-  logger.add(new winston.transports.Console({
-    format: winston.format.simple(),
-  }));
-//}
-
-let playerQueue = [];
-let pokemonName = '';
-let captainInGameName = '';
+const logger = initialiseLogger(config, winston, Elasticsearch);
 
 client.login(config.token);
-client.once('ready', () =>{
+client.once('ready', () => {
   logger.info('denBot logged in successfully!');
-})
-
-/*
-  * Commands:
-  * q               - Join the queue
-  * q pokemon ign   - Join the queue (first player can set the pokemon and their in-game name)
-  * lq              - Leave the queue
-  * sq              - Show the queue
-  * cq              - Clear the queue
-  * ru              - Remove a tagged user from the queue
-  * dc              - Delete an adventure channel (only the captain can use this)
-*/
-
-function generateQueueTitle() {
-  return `\n===== ADVENTURE QUEUE (${playerQueue.length}/${config.maxqueuesize}) =====`;
-}
-
-function generateRandomCode() {
-  const num1 = Math.floor((Math.random() * 9999) + 1);
-  const num2 = Math.floor((Math.random() * 9999) + 1);
-
-  // Pad the start of the numbers so there's always four digits, including leading zeros
-  return `${num1.toString().padStart(4, '0')}-${num2.toString().padStart(4, '0')}`;
-}
-
-function checkQueue(message) {
-  if (playerQueue.length === config.maxqueuesize) {
-    // Queue is full
-    logger.log('info', 'Queue is full');
-
-    // Post a message to say the queue is complete
-    message.channel.send(`The adventure is beginning - players should check their DMs\n${playerQueue.map((player, index) => `${index + 1} - ${player.username}`).join('\n')}`);
-
-    const randomCode = generateRandomCode();
-    const baseMessage = `@${playerQueue[0].username} is making the lobby. Here is your link code ${randomCode}`;
-    const adventureMessage = (pokemonName === '' && captainInGameName === '')
-      ? `${generateQueueTitle()}\n${baseMessage}`
-      : `${generateQueueTitle()}\nPokemon: ${pokemonName}\nCaptain's IGN: ${captainInGameName}\n${baseMessage}`;
-
-    try {
-      // DM users
-      playerQueue.forEach(player => {
-        client.users.cache.get(player.id).send(adventureMessage);
-      });
-    } catch (error) {
-      logger.error('Tried to DM users: ', error);
-      message.channel.send(`There was an error, please let an admin know!\n${error}`);
-    }
-
-    makeTempChannel(message, adventureMessage);
-
-    // Clear the queue
-    playerQueue = [];
-    logger.log('info', 'Emptied queue');
-  }
-  else if (playerQueue.length === 0) {
-    message.channel.send('The queue is empty :(');
-    pokemonName = '';
-    captainInGameName = '';
-  }
-  else {
-    // Show queue after adding
-    if (pokemonName === '' && captainInGameName === '') {
-      message.channel.send(`${generateQueueTitle()}\n${playerQueue.map((player, index) => `${index + 1} - ${player.username}`).join('\n')}`);
-    }
-    else {
-      message.channel.send(`${generateQueueTitle()}\nPokemon: ${pokemonName}\nCaptain's IGN: ${captainInGameName}\n${playerQueue.map((player, index) => `${index + 1} - ${player.username}`).join('\n')}`);
-    }
-  }
-}
-
-function getUserFromMention(mention) {
-	try {
-    if (!mention) return;
-
-    if (mention.startsWith('<@') && mention.endsWith('>')) {
-      mention = mention.slice(2, -1);
-
-      if (mention.startsWith('!')) {
-        mention = mention.slice(1);
-      }
-
-      return client.users.cache.get(mention);
-    }
-  } catch (error) {
-    logger.error('Tried to get users from mention: ', error);
-  }
-}
-
-function getChannelName(username) {
-  return `${username}s-adventurers`;
-}
-
-function makeTempChannel(message, adventureMessage) {
-  const channelName = getChannelName(playerQueue[0].username);
-  let createdChannelId = '';
-  let everyoneRole = message.guild.roles.cache.find(r => r.name === '@everyone');
-
-  let permissionOverwrites = [{
-    id: everyoneRole.id,
-    deny: ['VIEW_CHANNEL'],
-    },
-  ];
-
-  playerQueue.forEach(player => {
-    permissionOverwrites.push({
-      id: player.id,
-      allow: ['VIEW_CHANNEL'],
-    });
-  });
-
-  logger.info(`Making temp channel ${channelName}`)
-  message.guild.channels.create(channelName, {
-    type: 'text',
-    permissionOverwrites: permissionOverwrites,
-  }).then(createdChannel => {
-    createdChannelId = createdChannel.id;
-
-    // Post in the channel
-    createdChannel.send(adventureMessage);
-  })
-    .catch(logger.error);
-
-  try {
-    // Delete the channel after the configured amount of minutes
-    setTimeout(function(){ deleteChannel(message, channelName); }, (config.channeldeletetimeinminutes * 1000 * 60) );
-  } catch (error) {
-    logger.error(`Tried to delete channel ${channelName} after timeout: `, error);
-  }
-}
-
-function deleteChannel(message, channelName) {
-  try {
-    // Get a Channel by Name
-    const fetchedChannel = message.guild.channels.cache.find(channel => channel.name.toLowerCase() == channelName.toLowerCase());
-
-    logger.info(`Deleting temp channel ${channelName}`)
-    fetchedChannel.delete();
-  } catch (error) {
-    logger.error(`Tried to delete channel ${channelName}: `, error);
-
-    let names = [];
-    message.guild.channels.cache.forEach(channel => {
-      names.push(channel.name);
-    });
-    logger.info(`Channel names in cache: ${names}`);
-  }
-}
+});
 
 client.on('message', function (message) {
   // Ignore messages from the bot and that don't begin with the prefix, and do not run in DMs to bot
@@ -239,178 +18,11 @@ client.on('message', function (message) {
   if (!message.content.startsWith(config.prefix)) return;
   if (message.channel instanceof Discord.DMChannel) return;
 
+  // Split out the fields we need from the message
   const commandBody = message.content.slice(config.prefix.length);
   const args = commandBody.split(' ');
   const command = args.shift().toLowerCase();
 
-  // Join the queue
-  if (command === 'q' && !(playerQueue.includes(message.author))) {
-    // Delete the message with the bot command
-    if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command q in ${message.channel.name}`);
-
-		logger.log('info', `${message.author.username} joined the queue.`);
-		message.channel.send(`=====\n${message.author.username} joined the queue.`);
-
-    playerQueue.push(message.author);
-
-    if (playerQueue.length === 1 && args[0] && args[1]) {
-      // First player can submit pokemon and in-game name
-      pokemonName = args[0];
-      captainInGameName = args[1];
-    }
-
-    checkQueue(message);
-	}
-	else if (command === 'q' && (playerQueue.includes(message.author))) {
-		// Delete the message with the bot command
-		if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command q in ${message.channel.name}`);
-
-		message.channel.send(`${message.author.username} is too keen, you're already in the queue mate!`);
-  }
-
-  // Leave the queue
-	if(command === 'lq' && (playerQueue.includes(message.author))){
-		// Delete the message with the bot command
-		if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command lq in ${message.channel.name}`);
-
-		logger.log('info', `${message.author.username} left the queue.`);
-		message.channel.send(`${message.author.username} left the queue.`);
-
-		for( var i = 0; i < playerQueue.length; i++){
-			if ( playerQueue[i] === message.author) {
-				playerQueue.splice(i, 1);
-				i--;
-			}
-		}
-
-		checkQueue(message);
-	}
-	else if (command === 'lq' && !(playerQueue.includes(message.author))) {
-		// Delete the message with the bot command
-		if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command lq in ${message.channel.name}`);
-
-		message.channel.send(`${message.author.username} you can't leave the queue before you've joined it!`);
-  }
-
-  // Show the queue
-	if(command === 'sq') {
-		// Delete the message with the bot command
-		if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command sq in ${message.channel.name}`);
-
-		checkQueue(message);
-	}
-
-  // Clear the queue
-	if(command === 'cq') {
-		// Delete the message with the bot command
-    if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command cq in ${message.channel.name}`);
-
-    if (playerQueue.length === 0) {
-      message.channel.send(`The queue is already empty...`);
-      logger.log('info', `${message.author.username} attempted to clear the queue but it was already empty.`);
-		}
-		else {
-			playerQueue = [];
-			message.channel.send(`The queue has been cleared!`);
-			logger.log('info', `${message.author.username} cleared the queue.`);
-		}
-	}
-
-  // Remove a tagged user from the queue
-  if (command === 'ru' && args[0]) {
-    const user = getUserFromMention(args[0]);
-
-    // Delete the message with the bot command
-    if (config.deletecommandstoggle) {
-      message.delete();
-    }
-
-    logger.info(`${message.author.username} used command ru in ${message.channel.name}`);
-
-    if ((playerQueue.includes(user))) {
-
-      // Search for the user
-      for(var i = 0; i < playerQueue.length; i++){
-        if ((playerQueue[i].username === user.username)){
-          playerQueue.splice(i, 1);
-          i--;
-        }
-      }
-
-      message.channel.send(`${user.username} removed from queue.`);
-      logger.log('info', `${message.author.username} removed ${user.username} from queue.`);
-
-      checkQueue(message);
-    }
-    else if (!(playerQueue.includes(user))) {
-      message.channel.send(`${user.username} is not in the queue.`);
-      logger.log('info', `${message.author.username} attempted to remove ${user.username} from queue but they weren't in it.`);
-    }
-  }
-
-  if (command === 'dc') {
-    logger.info(`${message.author.username} used command dc in ${message.channel.name}`);
-
-    // Determine if they can delete the channel (i.e. it's their temporary one) - compare the name
-    if (message.channel.name === getChannelName(message.author.username)) {
-      deleteChannel(message, message.channel.name)
-      logger.log('info', `${message.author.username} deleted their adventure channel.`);
-    }
-    else {
-      message.channel.send(`${message.author.username} is not allowed to delete this channel.`);
-      logger.log('info', `${message.author.username} attempted to delete channel ${message.channel.name} but it's not their adventure channel.`);
-    }
-  }
-
-  if (command === 'help') {
-    let msg = `
-The commands available to you are:
-- !q   - Join the queue
-- !q <pokemon> <ign>   - Join the queue (first player can set the pokemon and their in-game name)
-- !lq  - Leave the queue
-- !sq  - Show the queue
-- !dc  - Delete an adventure channel (only the captain can use this)
-    `;
-
-    message.channel.send(msg);
-  }
-
-  if (command === 'adminhelp') {
-    let msg = `
-The commands available to you are:
-- !q   - Join the queue
-- !q <pokemon> <ign>   - Join the queue (first player can set the pokemon and their in-game name)
-- !lq  - Leave the queue
-- !sq  - Show the queue
-- !cq  - Clear the queue (admin-only, not to be shared with normal users)
-- !ru  - Remove a tagged user from the queue (admin-only, not to be shared with normal users)
-- !dc  - Delete an adventure channel (only the captain can use this)
-    `;
-
-    message.channel.send(msg);
-  }
+  // Run the matching command
+  matchCommand(Discord, config, logger, message, command, args);
 });

logger.js

@@ -0,0 +1,78 @@
+module.exports = {
+    initialiseLogger: function (config, winston, Elasticsearch) {
+      const { format } = winston;
+      const { combine, timestamp } = format;
+
+      let env = 'dev';
+      if (process.env.NODE_ENV === 'production') {
+        env = 'prod';
+      }
+
+      // Custom format function that will look for an error object and log out the stack and if
+      // its not production, the error itself
+      const myFormat = format.printf((info) => {
+        const { timestamp: tmsmp, level, message, error, ...rest } = info;
+        let log = `${tmsmp} - ${level}:\t${message}`;
+        // Only if there is an error
+        if ( error ) {
+          if ( error.stack) log = `${log}\n${error.stack}`;
+          if (process.env.NODE_ENV !== 'production') log = `${log}\n${JSON.stringify(error, null, 2)}`;
+        }
+        // Check if rest is object
+        if ( !( Object.keys(rest).length === 0 && rest.constructor === Object ) ) {
+          log = `${log}\n${JSON.stringify(rest, null, 2)}`;
+        }
+        return log;
+      });
+
+      const esTransportOpts = {
+        level: 'info',
+        indexPrefix: 'logs_denbot',
+        clientOpts: {
+            host: config.elasticsearch.elasticsearch_address,
+            log: 'info'
+        },
+        transformer: logData => {
+            return {
+              timestamp: new Date().toISOString(),
+              severity: logData.level,
+              message: logData.message,
+              meta: {
+                app: 'denbot',
+                env: env,
+                stack: logData.meta.stack
+              }
+            }
+        }
+      };
+
+      const logger = winston.createLogger({
+        level: 'info',
+        format: combine(
+          winston.format.errors({ stack: true }), // <-- use errors format
+          winston.format.timestamp(),
+          winston.format.prettyPrint(),
+          myFormat,
+          winston.format.json()
+        ),
+        defaultMeta: { service: 'user-service' },
+        transports: [
+          new winston.transports.File({ filename: 'error.log', level: 'error' }),
+          new winston.transports.File({ filename: 'combined.log' }),
+          new Elasticsearch(esTransportOpts)
+        ],
+      });
+
+      //
+      // If we're not in production then log to the `console` with the format:
+      // `${info.level}: ${info.message} JSON.stringify({ ...rest }) `
+      //
+      //if (process.env.NODE_ENV !== 'production') {
+        logger.add(new winston.transports.Console({
+          format: winston.format.simple(),
+        }));
+      //}
+
+      return logger;
+    },
+  };