fix: verification system

4 files changed, 12 insertions, 6 deletions

diff --git a/server/src/Config.ts b/server/src/Config.ts
index ff9b361..81ed605 100644
--- a/server/src/Config.ts
+++ b/server/src/Config.ts
@@ -22,5 +22,5 @@ export const captchaSettings: object = {
     color: false,
     size: 6
 };
-export const verificationRole: string = "Member";
+export const verificationRole: string = "Un-verified";
 export const verificationChannel: string = "verification";
\ No newline at end of file
diff --git a/server/src/DevConfig.ts b/server/src/DevConfig.ts
index 3fa189b..cceee0f 100644
--- a/server/src/DevConfig.ts
+++ b/server/src/DevConfig.ts
@@ -22,5 +22,5 @@ export const captchaSettings: object = {
     color: false,
     size: 6
 };
-export const verificationRole: string = "Member";
+export const verificationRole: string = "Un-verified";
 export const verificationChannel: string = "verification";
\ No newline at end of file
diff --git a/server/src/commands/emma/Verify.ts b/server/src/commands/emma/Verify.ts
index b09d93d..99124ec 100644
--- a/server/src/commands/emma/Verify.ts
+++ b/server/src/commands/emma/Verify.ts
@@ -52,7 +52,7 @@ export default class VerifyEmma extends Command {
         if (response.includes(captcha.text)) {
             msg.author.send('You passed the captcha! Granting access...').then(async m => {
                 const role = await msg.guild.roles.cache.find(r => r.name.toLowerCase() === verificationRole.toLowerCase());
-                if (role) msg.member.roles.add(role.id);
+                if (role) msg.member.roles.remove(role.id);
                 m.edit(`Access granted to **${msg.guild.name}**!`);
             });
         } else {
diff --git a/server/src/listeners/client/guildMemberAdd.ts b/server/src/listeners/client/guildMemberAdd.ts
index 5b406c8..8321902 100644
--- a/server/src/listeners/client/guildMemberAdd.ts
+++ b/server/src/listeners/client/guildMemberAdd.ts
@@ -3,6 +3,7 @@ import { GuildMember } from 'discord.js';
 import wMRResponses from '../../json/guildMemberAdd.json';
 import { TextChannel } from 'discord.js';
 import { Message } from 'discord.js';
+import { emmaServer, verificationRole } from '../../Config';
 
 export default class GuildMemberAddListener extends Listener {
 	public constructor() {
@@ -13,7 +14,12 @@ export default class GuildMemberAddListener extends Listener {
 		});
 	}
 
-	public exec(member: GuildMember): Promise<Message | void> {
+	public async exec(member: GuildMember): Promise<Message | void> {
+		/* if (member.guild.id === emmaServer) {
+			const role = await member.guild.roles.cache.find(r => r.name.toLowerCase() === verificationRole.toLowerCase());
+			if (role) member.roles.add(role.id);
+		} */
+
         const existing = this.client.settings.cache.guilds.get(member.guild.id);
         let hasWelcome = true;
 		if (existing === undefined) {
@@ -25,12 +31,12 @@ export default class GuildMemberAddListener extends Listener {
 		if (hasWelcome) {
 			const secret = Math.floor(Math.random() * 1000);
 			if (secret === 420) {
-				return (member.guild.channels.cache.get(existing.welcome) as TextChannel)
+				(member.guild.channels.cache.get(existing.welcome) as TextChannel)
 					.send(`**${member.user.tag}** (<@${member.id}>) has just got the secret welcome message! They had a **1/1000** chance of getting this! ✨`)
 					.then(m => { m.react('✨') });
 			} else {
 				const leaveMessage = wMRResponses[Math.floor(Math.random() * wMRResponses.length)];
-				return (member.guild.channels.cache.get(existing.welcome) as TextChannel)
+				(member.guild.channels.cache.get(existing.welcome) as TextChannel)
 					.send(`${member.user.tag} (<@${member.id}>) ${leaveMessage}`);
 			}
 		}