Merge branch 'feature-rewardsSystem' into emailUtils

bot/botUtils.js

@@ -81,7 +81,6 @@ exports.welcomeCommand = async (member) => {
   await member.send(welcomeString);
 };
 
-
 // Nodemailer email function
 // Set up Nodemailer to send emails through gmail
 exports.sendEmail = async (message, toEmailAdd, emailSubject,
@@ -118,3 +117,4 @@ exports.sendEmail = async (message, toEmailAdd, emailSubject,
   });
   return null;
 };
+exports.validDomains = ['student.fullsail.edu', 'fullsail.edu', 'fullsail.com'];

bot/controllers/invite.js

@@ -1,8 +1,7 @@
 const BaseController = require('../baseController.js');
 const Command = require('../baseCommand.js');
 const util = require('apex-util');
-const { getUserPointsandUpdate, sendEmail } = require('../botUtils');
-
+const { getUserPointsandUpdate, sendEmail, validDomains } = require('../botUtils');
 
 class inviteController extends BaseController {
   constructor(message) {
@@ -47,15 +46,15 @@ class inviteController extends BaseController {
         const emailBodyString = `<table><tr><td><p>Please follow this link to be included in the discord <a href=${invite.url}>link</a> Thank you for your interest for wanting to be in the Discord enjoy.</p></td></tr></table>`;
         sendEmail(message, email, emailSubject, emailBodyString, emailType, (sendStatus) => {
           if (sendStatus) {
-            const numPointToAdd = 1;
-            getUserPointsandUpdate(message.author.id, numPointToAdd);
+            getUserPointsandUpdate(message.author.id, invitePointsAwarded);
+            message.author.send(`You've received ${invitePointsAwarded} point(s) for sending this invite.`);
           }
         });
       } else {
         message.author.send('Sorry the invite could not be sent please contact a admin for assistance.');
       }
     });
-    return `${message.author}, Invite Status: `;
+    return `${message.author}, invite status:`;
   }
 }
 

bot/controllers/verify.js

@@ -3,8 +3,7 @@ const Command = require('../baseCommand.js');
 const util = require('apex-util');
 const models = require('../../db/models');
 const uuidv4 = require('uuid/v4');
-const { sendEmail } = require('../botUtils');
-const { generateCode } = require('../botUtils.js');
+const { generateCode, validDomains, sendEmail } = require('../botUtils.js');
 
 class VerifyController extends BaseController {
   constructor(message) {