4.0.1-ex

Release 4.0.1
GAwesomeBot · Jun 2, 2017 · 30a3ea1 · 30a3ea1
2 parents 0c369c8 + 9fce421
commit 30a3ea1
Show file tree

Hide file tree

Showing 168 changed files with 5,705 additions and 1,880 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+Configuration/config.json
+Configuration/auth.json
+Extensions/
diff --git a/Commands/PM/afk.js b/Commands/PM/afk.js
@@ -2,10 +2,30 @@ module.exports = (bot, db, config, winston, userDocument, msg, suffix, commandDa
 	if(suffix) {
 		if(suffix==".") {
 			userDocument.afk_message = null;
-			msg.channel.createMessage("Welcome back! 🎊 I removed your AFK message");
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					color: 0x9ECDF2,
+					description: "Welcome back! 🎊\nI removed your AFK message"
+				}
+			});
 		} else {
 			userDocument.afk_message = suffix;
-			msg.channel.createMessage(`Alright, I'll show that when someone mentions you on a server. 👌 Use \`${commandData.name} .\` to remove it`);
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					color: 0x9ECDF2,
+					description: `Alright, I'll show that when someone mentions you on a server. 👌\nUse \`${commandData.name} .\` to remove it`
+				}
+			});
 		}
 		userDocument.save(err => {
 			if(err) {
@@ -14,9 +34,29 @@ module.exports = (bot, db, config, winston, userDocument, msg, suffix, commandDa
 		});
 	} else {
 		if(userDocument.afk_message) {
-			msg.channel.createMessage(`You have the AFK message \`${userDocument.afk_message}\` set right now 💭`);
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					color: 0x9ECDF2,
+					description: `You have the AFK message \`${userDocument.afk_message}\` set right now 💭`
+				}
+			});
 		} else {
-			msg.channel.createMessage("You don't have an AFK message set right now ⌨️");
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					color: 0x00FF00,
+					description: "You don't have an AFK message set right now ⌨️"
+				}
+			});
 		}
 	}
 };
diff --git a/Commands/PM/config.js b/Commands/PM/config.js
@@ -3,9 +3,31 @@ module.exports = (bot, db, config, winston, userDocument, msg, suffix) => {
 	// Maintainer console for overall bot things
 	if(config.maintainers.indexOf(msg.author.id)>-1 && !suffix) {
 		if(config.hosting_url) {
-			msg.channel.createMessage(`🌎 ${config.hosting_url}dashboard/overview?svrid=maintainer`);
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					title: "Here's the link for the Maintainer Console:",
+					description: `${config.hosting_url}dashboard/overview?svrid=maintainer`,
+					color: 0x9ECDF2
+				}
+			});
 		} else {
-			msg.channel.createMessage("**Limited mode:** You have not provided a hosting URL in the bot config, so the maintainer console is not available.");
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					title: "Warning! Bot is running in __Limited Mode__",
+					description: "You have not provided a hosting URL in the bot config, so the maintainer console is not available.",
+					color: 0xFF0000
+				}
+			});
 		}
 	}
 
@@ -14,20 +36,64 @@ module.exports = (bot, db, config, winston, userDocument, msg, suffix) => {
 		const svr = bot.serverSearch(suffix, msg.author, userDocument);
 		// Check if specified server exists
 		if(!svr) {
-			msg.channel.createMessage("Sorry, invalid server. 🙁 Try again?");
+			msg.channel.createMessage({
+				embed: {
+					author: {
+						name: bot.user.username,
+						icon_url: bot.user.avatarURL,
+						url: "https://github.com/GilbertGobbels/GAwesomeBot"
+					},
+					color: 0xFF0000,
+					title: "Error",
+					description: "Sorry, but the server name you entered is invalid. 🙁 Try again?"
+				}
+			});
 		// Check if sender is an admin of the specified server
 		} else {
 			const member = svr.members.get(msg.author.id);
 			// Get server data
 			db.servers.findOne({_id: svr.id}, (err, serverDocument) => {
 				if(!err && member && serverDocument && serverDocument.config.blocked.indexOf(msg.author.id)==-1) {
 					if(bot.getUserBotAdmin(svr, serverDocument, member)>=3) {
-						msg.channel.createMessage(`🌎 ${config.hosting_url}dashboard/overview?svrid=${svr.id}`);
+						msg.channel.createMessage({
+							embed: {
+								author: {
+									name: bot.user.username,
+									icon_url: bot.user.avatarURL,
+									url: "https://github.com/GilbertGobbels/GAwesomeBot"
+								},
+								color: 0x00FF00,
+								title: "Here's the link to the requested Admin Panel",
+								description: `${config.hosting_url}dashboard/overview?svrid=${svr.id}`
+							}
+						});
 					} else {
-						msg.channel.createMessage("You are not an admin for that server.");
+						msg.channel.createMessage({
+							embed: {
+								author: {
+									name: bot.user.username,
+									icon_url: bot.user.avatarURL,
+									url: "https://github.com/GilbertGobbels/GAwesomeBot"
+								},
+								color: 0xFF0000,
+								title: "Error",
+								description: "You are not an admin for that server\nIf you think this was a mistake, please contact the server owner!"
+							}
+						});
 					}
 				} else {
-					msg.channel.createMessage("Sorry, invalid server. 🙁 Try again?");
+					msg.channel.createMessage({
+						embed: {
+							author: {
+									name: bot.user.username,
+									icon_url: bot.user.avatarURL,
+									url: "https://github.com/GilbertGobbels/GAwesomeBot"
+							},
+							color: 0x9ECDF2,
+							title: "Error",
+							description: "Sorry, but the server name you entered is invalid. 🙁 Try again?"
+						}
+					});
 				}
 			});
 		}