From 5aaf17c26c6c8c9ac4968a9337124e5bccf5fa82 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Thu, 3 Aug 2017 22:47:18 +0000
Subject: [PATCH] Lots of Updates

---
 assets/json/server-info.json       | 14 ++++++++++++++
 commands/avatar-edit/card.js       |  2 +-
 commands/guild-info/server-info.js |  6 +++---
 commands/user-info/user-info.js    | 10 +++++-----
 commands/util/setting-help.js      |  9 ++++-----
 5 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 assets/json/server-info.json

diff --git a/assets/json/server-info.json b/assets/json/server-info.json
new file mode 100644
index 00000000..090126fe
--- /dev/null
+++ b/assets/json/server-info.json
@@ -0,0 +1,14 @@
+{
+	"filterLevels": [
+		"Off",
+		"No Role",
+		"Everyone"
+	],
+	"verificationLevels": [
+		"None",
+		"Low",
+		"Medium",
+		"(╯°□°）╯︵ ┻━┻",
+		"┻━┻ ﾐヽ(ಠ益ಠ)ノ彡┻━┻"
+	]
+}
diff --git a/commands/avatar-edit/card.js b/commands/avatar-edit/card.js
index 424f3c82..8c6b23c6 100644
--- a/commands/avatar-edit/card.js
+++ b/commands/avatar-edit/card.js
@@ -58,7 +58,7 @@ module.exports = class CardCommand extends Command {
 			ctx.fillText('Discord Join Date:', 148, 400);
 			ctx.fillText(moment(member.user.createdTimestamp).format('MMMM Do YYYY'), 148, 420);
 			ctx.fillText('Role:', 148, 457);
-			ctx.fillText(member.highestRole.name, 148, 477);
+			ctx.fillText(member.highestRole.name !== '@everyone' ? member.highestRole.name : 'None', 148, 477);
 			ctx.fillText(rarity, 73, 411);
 			ctx.fillText(cardID, 60, 457);
 			ctx.fillText(version.split('.')[0], 68, 502);
diff --git a/commands/guild-info/server-info.js b/commands/guild-info/server-info.js
index b2d29ce4..fe0e1d02 100644
--- a/commands/guild-info/server-info.js
+++ b/commands/guild-info/server-info.js
@@ -1,7 +1,7 @@
 const Command = require('../../structures/Command');
 const { MessageEmbed } = require('discord.js');
 const moment = require('moment');
-const filterLevels = ['Off', 'No Role', 'Everyone'];
+const { filterLevels, verificationLevels } = require('../../assets/json/server-info');
 
 module.exports = class GuildInfoCommand extends Command {
 	constructor(client) {
@@ -26,12 +26,12 @@ module.exports = class GuildInfoCommand extends Command {
 				msg.guild.id, true)
 			.addField('❯ Creation Date',
 				moment(msg.guild.createdAt).format('MMMM Do YYYY'), true)
-			.addField('❯ Default Channel',
-				msg.guild.defaultChannel, true)
 			.addField('❯ Region',
 				msg.guild.region, true)
 			.addField('❯ Explicit Filter',
 				filterLevels[msg.guild.explicitContentFilter], true)
+			.addField('❯ Verification Level',
+				verificationLevels[msg.guild.verificationLevel], true)
 			.addField('❯ Owner',
 				msg.guild.owner ? msg.guild.owner.user.username : 'None', true)
 			.addField('❯ Members',
diff --git a/commands/user-info/user-info.js b/commands/user-info/user-info.js
index 2f382af8..ee9eaa62 100644
--- a/commands/user-info/user-info.js
+++ b/commands/user-info/user-info.js
@@ -35,17 +35,17 @@ module.exports = class UserInfoCommand extends Command {
 			.addField('❯ ID',
 				member.id, true)
 			.addField('❯ Discord Join Date',
-				moment(member.user.createdAt).format('MMMM Do YYYY h:mm:ss A'))
+				moment(member.user.createdAt).format('MMMM Do YYYY'), true)
 			.addField('❯ Server Join Date',
-				moment(member.joinedTimestamp).format('MMMM Do YYYY h:mm:ss A'))
+				moment(member.joinedTimestamp).format('MMMM Do YYYY'), true)
 			.addField('❯ Status',
 				statuses[status], true)
 			.addField('❯ Playing',
-				member.user.presence.game ? member.user.presence.game.name : 'None', true)
+				member.user.presence.game ? member.user.presence.game.name : 'N/A', true)
 			.addField('❯ Highest Role',
-				member.highestRole.name, true)
+				member.highestRole.name !== '@everyone' ? member.highestRole.name : 'None', true)
 			.addField('❯ Hoist Role',
-				member.hoistRole ? member.hoistRole.name : 'Not Hoisted', true);
+				member.hoistRole ? member.hoistRole.name : 'None', true);
 		return msg.embed(embed);
 	}
 };
diff --git a/commands/util/setting-help.js b/commands/util/setting-help.js
index c9485809..9c1a9c72 100644
--- a/commands/util/setting-help.js
+++ b/commands/util/setting-help.js
@@ -8,7 +8,6 @@ module.exports = class SettingHelpCommand extends Command {
 			group: 'util',
 			memberName: 'setting-help',
 			description: 'View help on how to set up settings.',
-			guildOnly: true,
 			guarded: true
 		});
 	}
@@ -16,13 +15,13 @@ module.exports = class SettingHelpCommand extends Command {
 	run(msg) {
 		return msg.say(stripIndents`
 			__**Settings**__
-			**Invite Guard:** Place \`<inviteguard>\` in your default channel's topic. (${msg.guild.defaultChannel})
+			**Invite Guard:** Place \`<inviteguard>\` in a channel's topic.
 			**Mod Log Channel:** Place \`<modlog>\` in a channel's topic.
 			**Portal Channel:** Place \`<portal>\` in a channel's topic.
 			**Member Log Channel:** Place \`<memberlog>\` in a channel's topic.
-			**Custom Join Message:** Place \`<joinmessage>message</joinmessage>\` in the Member Log's Channel.
-			**Custom Leave Message:** Place \`<leavemessage>message</leavemessage>\` in the Member Log's Channel.
-			**Custom Mod DM:** Place \`<modmessage>message</modmessage>\` in the Mod Log's Channel.
+			**Custom Join Message:** Place \`<joinmessage>message</joinmessage>\` in the Member Log's topic.
+			**Custom Leave Message:** Place \`<leavemessage>message</leavemessage>\` in the Member Log's topic.
+			**Custom Mod DM:** Place \`<modmessage>message</modmessage>\` in the Mod Log's topic.
 
 			__**Placeholders**__
 			**Join/Leave Message:** \`{{member}}\`, \`{{server}}\`, \`{{mention}}\`