Added Auto-Role/Guild Member Fetch/Log File Init

.gitignore

@@ -1,6 +1,3 @@
-# ignore config
-config.js
-
 # ignore bot auth link
 link.txt
 

Procfile

@@ -0,0 +1,2 @@
+service: node main.js
+web: echo "Web Dyno Unnecessary"

config.js

@@ -0,0 +1,53 @@
+const config = {
+    // Bot Owner, level 10 by default. A User ID. Should never be anything else than the bot owner's ID.
+    //"ownerID": "NNNNNNNNNNNNNNNNNN",
+
+    // Bot Token
+    //"token": "YOUR TOKEN HERE",
+    // Prefix for bot commands
+    "prefix": "&",
+
+    // Application Channel Settings
+    //"listener": "NNNNNNNNNNNNNNNNNN",
+    //"webhook_id": "NNNNNNNNNNNNNNNNNN",
+
+    // Google Form Settings
+    "discord_tag": "Discord Username",
+    "character_server_name": "Character & Realm Name",
+    "battle_tag": "Battle Tag",
+
+    // Internal Category/Channel Settings
+    "internal" : {
+        //"category": "NNNNNNNNNNNNNNNNNN",
+        "channel_prefix": "Internal-",
+        // base ranks to give internal persmissions to
+        "ranks": ["Discord Admin", "Officer", "Gilthridge"],
+        // gives bots higher permissions than the above
+        "bots": ["BOTS"]
+    },
+
+    // Open/Applicant Category/Channel Settings
+    "open" : {
+        "channel": "TRUE",
+        //"category": "NNNNNNNNNNNNNNNNNN",
+        "channel_prefix": "Open-",
+        // base ranks to give internal persmissions to
+        "ranks": ["Discord Admin", "Officer", "Gilthridge"],
+        // gives bots higher permissions than the above
+        "bots": ["BOTS"]
+    },
+
+	"auto_role" : {
+		"enabled": "TRUE",
+		"role": "Applicant"
+	},
+
+    "language": {
+        "create_channel": {
+            "reason": "New Application",
+            "topic": "New Application by %user%"
+        }
+    }
+  };
+
+  module.exports = config;

events/process-app.js

@@ -2,95 +2,106 @@ const Discord = require('discord.js')
 const fs = require('fs')
 const config = require('@root/config.js')
 
-async function run (client, message) {    
+async function run (client, message) {
     const { author, guild } = message
-        
-    // EXTRACT DATA    
-    
-    // Loops through embed fields to find specified character/realm and discord labels from config file.    
+
+    // EXTRACT DATA
+
+    // Loops through embed fields to find specified character/realm and discord labels from config file.
     var fieldsLength = message.embeds[0].fields.length
 
-    for (var i = 0; i < fieldsLength; i++) {      
-      if (message.embeds[0].fields[i].name == config.character_server_name) {                
+    for (var i = 0; i < fieldsLength; i++) {
+      if (message.embeds[0].fields[i].name == config.character_server_name) {
         // Gets the character and realm from the embed message the bot sends
         characterServerName = message.embeds[0].fields[i].value
       }
-      if (message.embeds[0].fields[i].name == config.discord_tag) {        
+      if (message.embeds[0].fields[i].name == config.discord_tag) {
         // Gets the discord tag of the applicant and finds the user ID
         userTag = message.embeds[0].fields[i].value
       }
-      if (message.embeds[0].fields[i].name == config.battle_tag) {        
+      if (message.embeds[0].fields[i].name == config.battle_tag) {
         // Applicants battle tag
         battleTag = message.embeds[0].fields[i].value
-      }      
-    }                
-    
+      }
+    }
+
     // Takes userTag from application and gets the user object
+    await guild.members.fetch()
     let userObj = client.users.cache.find(user => user.tag === userTag)
 
+    console.log(userObj)
+    console.log(client.users.cache)
+
     // Sets user.id. If they gave wrong discord tag or it cannot be found, this will send the error message to the log file
-    if(userObj) {      
-      userObj = userObj.id 
-    } else {      
+    if(userObj) {
+      userObj = userObj.id
+    } else {
       // Gets current date and time
-      var date = Date()            
-      fs.appendFileSync('./logs/log.txt', 'Invalid Discord user tag, ' + userTag + ', for applicant ' + characterServerName + ' at ' + date + '\n')      
+      var date = Date()
+      fs.appendFileSync('./logs/log.txt', 'Invalid Discord user tag, ' + userTag + ', for applicant ' + characterServerName + ' at ' + date + '\n')
     }
 
+    // AUTO ROLE
+    if(config.auto_role.enabled == "TRUE") {
+      if(userObj) {
+        var role = guild.roles.cache.find(role => role.name === config.auto_role.role);
+        guild.member(userObj).roles.add(role);
+      }
+    }
 
     // CHANNEL WORK
 
     // Checks to make sure internal category is set properly
-    let internal_category = guild.channels.cache.get(config.internal.category)
+    let internal_category = guild.channels.cache.get(process.env.INTERNAL_CATEGORY_ID || config.internal.category)
     if(!internal_category || !internal_category.type === 'category') {
         fs.appendFileSync('./logs/errorlog.txt', 'Internal category is not a valid category.')
         console.error('Internal category is not a valid category.')
         return
-    }    
+    }
 
     // Checks to make sure open category is set properly
-    const open_category = guild.channels.cache.get(config.open.category)
+    const open_category = guild.channels.cache.get(process.env.OPEN_CATEGORY_ID || config.open.category)
     /*
     if(!open_category || !open_category.type === 'category') {
         fs.appendFileSync('./errorlog.txt', 'Open category is not a valid category.');
         console.error('Open category is not a valid category.');
         return;
-    } 
+    }
     */
 
     // Sets the parent category if there is one set in config
     if(!open_category || !open_category.type === 'category') {
       fs.appendFileSync('./logs/errorlog.txt', 'Open category is invalid or not set in config. Placing Open applications in base discord channel.' + '\n')
-      console.error('Open category is invalid or not set in config. Placing Open applications in base discord channel.')        
+      console.error('Open category is invalid or not set in config. Placing Open applications in base discord channel.')
     }
-      
+
     // PERMISSIONS
-    
+
     // Sets roles from config for rank setup
     // Internal ranks
     var iranks = []
-    for (var i = 0; i < config.internal.ranks.length; i++) {      
+    for (var i = 0; i < config.internal.ranks.length; i++) {
       iranks.push(message.guild.roles.cache.find(role => role.name === config.internal.ranks[i]))
     }
-    
+
     // Internal bot ranks
     var iranksbots = []
-    for (var i = 0; i < config.internal.bots.length; i++) {      
+    for (var i = 0; i < config.internal.bots.length; i++) {
       iranksbots.push(message.guild.roles.cache.find(role => role.name === config.internal.bots[i]))
     }
 
     // Open ranks
     var oranks = []
-    for (var i = 0; i < config.open.ranks.length; i++) {      
+    for (var i = 0; i < config.open.ranks.length; i++) {
       oranks.push(message.guild.roles.cache.find(role => role.name === config.open.ranks[i]))
     }
 
     // Open bot ranks
     var oranksbots = []
-    for (var i = 0; i < config.open.bots.length; i++) {      
+    for (var i = 0; i < config.open.bots.length; i++) {
       oranksbots.push(message.guild.roles.cache.find(role => role.name === config.open.bots[i]))
-    }    
-    
+    }
+
     // Creates overwrites array for open channel creation
     const open_overwrites = [{
       // everyone
@@ -115,8 +126,8 @@ async function run (client, message) {
     if (config.open.channel == "TRUE") {
       // Conditonal based on if the user inputted a proper discord ID
       if(userObj) {
-        open_overwrites.push({        
-          id: userObj,          
+        open_overwrites.push({
+          id: userObj,
           allow: ['SEND_MESSAGES','VIEW_CHANNEL']
         })
       }
@@ -135,32 +146,32 @@ async function run (client, message) {
           id : oranksbots[i],
           allow: ['SEND_MESSAGES','VIEW_CHANNEL','MANAGE_MESSAGES']
         })
-      }      
+      }
 
       // Creates the open channel
       const openAppChannel = await guild.channels.create(config.open.channel_prefix + characterServerName, {
-        type: 'text', 
+        type: 'text',
         permissionOverwrites: open_overwrites,
         parent: open_category,
         topic: config.language.create_channel.topic.replace('%user%', characterServerName)
       })
 
-      // Copies the embed and sends to open app channel 
-      let openEmbed = await openAppChannel.send(new Discord.MessageEmbed(message.embeds[0]))    
-      
+      // Copies the embed and sends to open app channel
+      let openEmbed = await openAppChannel.send(new Discord.MessageEmbed(message.embeds[0]))
+
       // Gets current date and time
       var date = Date()
 
-      fs.appendFileSync('./logs/log.txt', 'Applcation submitted for: ' + userTag + ' / ' + characterServerName + ' at ' + date + '\n', function (err) {      
+      fs.appendFileSync('./logs/log.txt', 'Applcation submitted for: ' + userTag + ' / ' + characterServerName + ' at ' + date + '\n', function (err) {
         if (err) {
           fs.appendFileSync('./logs/errorlog.txt', err + ' at ' + date + '\n')
           return console.log(err)
         }
-      })         
-      
+      })
+
       // Prints error to their specific channel if they used incorrect discord tag
-      if(!userObj) {            
-        // :x:   
+      if(!userObj) {
+        // :x:
         openEmbed.react('❌')
         openAppChannel.send('Invalid Discord user tag, ' + userTag + ', for applicant ' + characterServerName + '. This could be due to the wrong discord tag or incorrect format of discord tag. It also may be due to that user not being cached yet. In which case you need to manually add the user to the channel permissions.')
       } else {
@@ -209,19 +220,19 @@ async function run (client, message) {
 
     // INTERNAL CHANNEL
 
-    // Creates the internal channel    
+    // Creates the internal channel
     const internalAppChannel = await guild.channels.create(config.internal.channel_prefix + characterServerName, {
-      type: 'text', 
+      type: 'text',
       permissionOverwrites: internal_overwrites,
       parent: internal_category,
       topic: config.language.create_channel.topic.replace('%user%', characterServerName)
     })
 
     // MESSAGE SEND AND CLEAN UP
 
-    // Copies embed and sends to internal app channel    
-    internalAppChannel.send(new Discord.MessageEmbed(message.embeds[0]))        
-    
+    // Copies embed and sends to internal app channel
+    internalAppChannel.send(new Discord.MessageEmbed(message.embeds[0]))
+
     // Deletes message from original applications category
     // 1000 = 1 sec
     message.delete({ timeout: 1000})

features/features/app-base.js

@@ -1,16 +1,16 @@
 const config = require('@root/config.js')
 const processApp = require('@events/process-app.js')
 
-const listenerChannel = config.listener
-const webhookId = config.webhook_id
+const listenerChannel = process.env.TRIGGER_CHANNEL_ID || config.listener
+const webhookId = process.env.WEBHOOK_ID || config.webhook_id
 const webhookTestId = config.test_webhook_id
 
 module.exports = (client) => {
     client.on('message', (message) => {
-        const { channel } = message            
-        
+        const { channel } = message
+
         // if not one of our application webhooks, ignore it and exit out
-        if ((message.author.id !== webhookId) && (message.author.id !== webhookTestId)) return            
+        if ((message.author.id !== webhookId) && (message.author.id !== webhookTestId)) return
 
         // checks if webhook is not setup in config
         if (!webhookId) {
@@ -25,6 +25,6 @@ module.exports = (client) => {
         }
 
         // at this point we know its our app webhooks so call processApp
-        processApp(client, message)        
+        processApp(client, message)
     })
-}
+}