From 0b7bcec83666b82bd11c762f0ca654d8dd0ee52a Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Thu, 17 Aug 2017 02:36:09 +0000
Subject: [PATCH] Better Emojify

---
 assets/json/emojify.json      | 58 +++++++++++++++++------------------
 commands/text-edit/emojify.js |  4 +--
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/assets/json/emojify.json b/assets/json/emojify.json
index 029a2a46..2b55e389 100644
--- a/assets/json/emojify.json
+++ b/assets/json/emojify.json
@@ -1,30 +1,30 @@
 {
-	"a": ":regional_indicator_a:",
-	"b": ":regional_indicator_b:",
-	"c": ":regional_indicator_c:",
-	"d": ":regional_indicator_d:",
-	"e": ":regional_indicator_e:",
-	"f": ":regional_indicator_f:",
-	"g": ":regional_indicator_g:",
-	"h": ":regional_indicator_h:",
-	"i": ":regional_indicator_i:",
-	"j": ":regional_indicator_j:",
-	"k": ":regional_indicator_k:",
-	"l": ":regional_indicator_l:",
-	"m": ":regional_indicator_m:",
-	"n": ":regional_indicator_n:",
-	"o": ":regional_indicator_o:",
-	"p": ":regional_indicator_p:",
-	"q": ":regional_indicator_q:",
-	"r": ":regional_indicator_r:",
-	"s": ":regional_indicator_s:",
-	"t": ":regional_indicator_t:",
-	"u": ":regional_indicator_u:",
-	"v": ":regional_indicator_v:",
-	"w": ":regional_indicator_w:",
-	"x": ":regional_indicator_x:",
-	"y": ":regional_indicator_y:",
-	"z": ":regional_indicator_z:",
+	"a": "🇦",
+	"b": "🇧",
+	"c": "🇨",
+	"d": "🇩",
+	"e": "🇪",
+	"f": "🇫",
+	"g": "🇬",
+	"h": "🇭",
+	"i": "🇮",
+	"j": "🇯",
+	"k": "🇰",
+	"l": "🇱",
+	"m": "🇲",
+	"n": "🇳",
+	"o": "🇴",
+	"p": "🇵",
+	"q": "🇶",
+	"r": "🇷",
+	"s": "🇸",
+	"t": "🇹",
+	"u": "🇺",
+	"v": "🇻",
+	"w": "🇼",
+	"x": "🇽",
+	"y": "🇾",
+	"z": "🇿",
 	"0": ":zero:",
 	"1": ":one:",
 	"2": ":two:",
@@ -35,7 +35,7 @@
 	"7": ":seven:",
 	"8": ":eight:",
 	"9": ":nine:",
-	"?": ":question:",
-	"!": ":exclamation:",
-	"#": ":hash:"
+	"?": "❓",
+	"!": "❗",
+	"#": "#⃣"
 }
diff --git a/commands/text-edit/emojify.js b/commands/text-edit/emojify.js
index dcedb82b..1fd13a24 100644
--- a/commands/text-edit/emojify.js
+++ b/commands/text-edit/emojify.js
@@ -16,7 +16,7 @@ module.exports = class EmojifyCommand extends Command {
 					prompt: 'What text would you like to convert to emoji?',
 					type: 'string',
 					validate: text => {
-						if (letterTrans(text.toLowerCase(), dictionary).length < 2000) return true;
+						if (letterTrans(text.toLowerCase(), dictionary, ' ').length < 2000) return true;
 						return 'Your text is too long.';
 					},
 					parse: text => text.toLowerCase()
@@ -27,6 +27,6 @@ module.exports = class EmojifyCommand extends Command {
 
 	run(msg, args) {
 		const { text } = args;
-		return msg.say(letterTrans(text, dictionary));
+		return msg.say(letterTrans(text, dictionary, ' '));
 	}
 };