Merge pull request #187 from reactivepixel/dev

updated with new Varsity and JV role protection

Author: reactivepixel

bot/botUtils.js

@@ -23,7 +23,19 @@ exports.generateCode = (n) => {
 exports.isAdmin = (member) => {
   const adminRoles = [
     'Admin', 'Armada Officers', 'Armada Officer', 'Fleet Officer',
-    'Moderator', 'Tester',
+    'Moderator', 'Tester', 'Team Captain', 'Full Sail Staff',
+    'Team Liaison', 'Armada Athlete',
+    'Overwatch_V', 'Overwatch_JV',
+    'CS:GO_V', 'CS:GO_JV',
+    'Smite_V', 'Smite_JV',
+    'Fortnite_V', 'Fortnite_JV',
+    'Madden_V', 'Madden_JV',
+    'LoL_V', 'LoL_JV',
+    'SuperSmashBros_V', 'SuperSmashBros_JV',
+    'HerosOfTheStorm_V', 'HerosOfTheStorm_JV',
+    'RocketLeague_V', 'RocketLeague_JV',
+    'DragonBall_V', 'DragonBall_JV',
+    'Hearthstone_V', 'Hearthstone_JV',
   ];
   if (adminRoles.some(role => member.roles.find('name', role))) {
     return true;

bot/controllers/verify.js

@@ -49,12 +49,12 @@ class VerifyController extends BaseController {
         { time: timeoutInMiliseconds });
       collector.on('collect', (m) => {
         const verifyUser = 'Welcome aboard, Crewmate!';
-        const userAlredyOnSystem = 'This email has already been verified to a discord user.';
+        const userAlreadyOnSystem = 'This email has already been verified to a discord user.';
         models.Member.findOne({ where: { email } }).then((matchedUserData) => {
           if (matchedUserData === null) {
             // no existing record found
             models.Member.create({
-              discorduser: m.author.id,
+              discorduser: m.author.username,
               email,
               uuid: uuidv4(),
               verified: 1,
@@ -65,7 +65,7 @@ class VerifyController extends BaseController {
             message.reply(verifyUser);
           } else {
             // existing record found
-            message.reply(userAlredyOnSystem);
+            message.reply(userAlreadyOnSystem);
           }
         });
         util.log('Collected', m.content, 3);