From e303338a5eb5ebae851337c6bfcf2864baac0c2c Mon Sep 17 00:00:00 2001
From: Rave <asgarber@live.com>
Date: Mon, 4 Feb 2019 16:43:49 -0500
Subject: [PATCH] adds nonembeded welcome

---
 functions/modtogfunctions.js   | 10 ++++++++++
 modules/general/modcommands.js | 12 +++++++++---
 modules/modding/welcome.js     | 24 ++++++++++++++----------
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/functions/modtogfunctions.js b/functions/modtogfunctions.js
index 46dd01d..ab5aa0d 100644
--- a/functions/modtogfunctions.js
+++ b/functions/modtogfunctions.js
@@ -88,4 +88,14 @@ module.exports = (bot = Discord.Client) => {
 		message.channel.send(`**Starboard status:** ${emote}`);
 	};
 
+	greeterEmbed = function greeterEmbed(message, serverSettings){
+		serverSettings.welcomeEmbed = !serverSettings.welcomeEmbed;
+		bot.setServerSettings(message.guild.id, serverSettings);
+		if (serverSettings.welcomeEmbed === true) {
+			emote = ":white_check_mark: **Enabled**";
+		} else {
+			emote = ":x: **Disabled**";
+		}
+		message.channel.send(`**Welcome Embed:** ${emote}`);
+	};
 };
\ No newline at end of file
diff --git a/modules/general/modcommands.js b/modules/general/modcommands.js
index bdb4910..0445517 100644
--- a/modules/general/modcommands.js
+++ b/modules/general/modcommands.js
@@ -22,7 +22,7 @@ module.exports = (bot = Discord.Client) => {
 	//Admin and Mod Settings
 
 	modCmds = async function modCmds(message) {
-		
+
 		if (message.system) return;
 		if (message.author.bot) return;
 		if (message.channel.type === "dm") return;
@@ -122,6 +122,12 @@ module.exports = (bot = Discord.Client) => {
 					starboardTog(message, serverSettings);
 					return;
 
+				case "welembed":
+				case "greeterembed":
+				case "joinembed":
+					greeterEmbed(message, serverSettings);
+					return;
+
 				default:
 					embed = new Discord.RichEmbed();
 					toggleHelp(prefix, embed);
@@ -221,7 +227,7 @@ module.exports = (bot = Discord.Client) => {
 	};
 
 	bkpCmd = async function bkpCmd(message) {
-		
+
 		if (message.system) return;
 		if (message.author.bot) return;
 		if (message.channel.type === "dm") return;
@@ -265,7 +271,7 @@ module.exports = (bot = Discord.Client) => {
 	//Intial Settings (Owner Only)
 
 	owner = async function owner(message) {
-		
+
 		if (message.system) return;
 		if (message.author.bot) return;
 		if (message.channel.type === "dm") return;
diff --git a/modules/modding/welcome.js b/modules/modding/welcome.js
index 3784cb6..589bf81 100644
--- a/modules/modding/welcome.js
+++ b/modules/modding/welcome.js
@@ -43,15 +43,19 @@ module.exports = (bot = Discord.Client) => {
 
 		msg = msg.replace("{mention}", mention).replace("{server}", serverName).replace("{user}", user);
 
-		let embed = new Discord.RichEmbed()
-			.setColor("RANDOM")
-			.setThumbnail(member.user.displayAvatarURL)
-			.setURL(member.user.displayAvatarURL)
-			.setTitle("Member Join!")
-			.setDescription(msg)
-			.setTimestamp(member.joinedAt)
-			.setFooter(`Member #${pos + 1} 🎉`);
-		chan.send(embed).catch(console.error);
+		if (serverSettings.welcomeEmbed === true) {
+			let embed = new Discord.RichEmbed()
+				.setColor("RANDOM")
+				.setThumbnail(member.user.displayAvatarURL)
+				.setURL(member.user.displayAvatarURL)
+				.setTitle("Member Join!")
+				.setDescription(msg)
+				.setTimestamp(member.joinedAt)
+				.setFooter(`Member #${pos + 1} 🎉`);
+			chan.send(embed).catch(console.error);
+		} else{
+			chan.send(msg).catch(console.error);
+		}
 	};
 
 	//Join
@@ -105,7 +109,7 @@ module.exports = (bot = Discord.Client) => {
 			if (!guild.me.hasPermission("MANAGE_GUILD")) {
 				embed.addField("Invites", ":warning: Please enable `MANAGE_SERVER` to be able to see what invite was used.");
 			}
-		} catch(error){
+		} catch (error) {
 			bot.log(error);
 		}
 		bot.invCache.usedInvite(guild).then(invite => {