From 4203dd15ece61a924ac85daaf580bcdd9fb630e5 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Thu, 4 Oct 2018 15:23:58 +0000
Subject: [PATCH] Add name options to emoji

---
 .env.example                            |  5 +++++
 commands/analyze/spoopy-link.js         | 13 +++++++------
 commands/events/neko-atsume-password.js | 10 +++++++---
 commands/text-edit/mocking.js           |  8 ++++++--
 package.json                            |  2 +-
 5 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.env.example b/.env.example
index 25adbc8c..240e6cf0 100644
--- a/.env.example
+++ b/.env.example
@@ -9,10 +9,15 @@ XIAO_WEBHOOK_TOKEN=
 
 # Emoji IDs
 FAILURE_EMOJI_ID=
+FAILURE_EMOJI_NAME=
 GOLD_FISH_EMOJI_ID=
+GOLD_FISH_EMOJI_NAME=
 MOCKING_EMOJI_ID=
+MOCKING_EMOJI_NAME=
 SILVER_FISH_EMOJI_ID=
+SILVER_FISH_EMOJI_NAME=
 SUCCESS_EMOJI_ID=
+SUCCESS_EMOJI_NAME=
 
 # API Keys, IDs, and Secrets
 ALPHA_VANTAGE_KEY=
diff --git a/commands/analyze/spoopy-link.js b/commands/analyze/spoopy-link.js
index 5d3482f3..871ea04f 100644
--- a/commands/analyze/spoopy-link.js
+++ b/commands/analyze/spoopy-link.js
@@ -1,7 +1,7 @@
 const Command = require('../../structures/Command');
 const request = require('node-superfetch');
 const { stripIndents } = require('common-tags');
-const { FAILURE_EMOJI_ID, SUCCESS_EMOJI_ID } = process.env;
+const { FAILURE_EMOJI_ID, FAILURE_EMOJI_NAME, SUCCESS_EMOJI_ID, SUCCESS_EMOJI_NAME } = process.env;
 
 module.exports = class SpoopyLinkCommand extends Command {
 	constructor(client) {
@@ -24,11 +24,12 @@ module.exports = class SpoopyLinkCommand extends Command {
 	async run(msg, { site }) {
 		try {
 			const { body } = await request.get(`https://spoopy.link/api/${site}`);
+			const chain = body.chain.map(
+				url => `<${url.url}> ${url.safe ? this.successEmoji : `${this.failureEmoji} (${url.reasons.join(', ')})`}`
+			);
 			return msg.say(stripIndents`
 				${body.safe ? 'Safe!' : 'Not safe...'}
-				${body.chain.map(
-					url => `<${url.url}> ${url.safe ? this.successEmoji : `${this.failureEmoji} (${url.reasons.join(', ')})`}`
-				).join('\n')}
+				${chain.join('\n')}
 			`);
 		} catch (err) {
 			return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);
@@ -36,10 +37,10 @@ module.exports = class SpoopyLinkCommand extends Command {
 	}
 
 	get successEmoji() {
-		return SUCCESS_EMOJI_ID ? `<:success:${SUCCESS_EMOJI_ID}>` : '✅';
+		return SUCCESS_EMOJI_ID && SUCCESS_EMOJI_NAME ? `<:${SUCCESS_EMOJI_NAME}:${SUCCESS_EMOJI_ID}>` : '✅';
 	}
 
 	get failureEmoji() {
-		return FAILURE_EMOJI_ID ? `<:failure:${FAILURE_EMOJI_ID}>` : '❌';
+		return FAILURE_EMOJI_ID && FAILURE_EMOJI_NAME ? `<:${FAILURE_EMOJI_NAME}:${FAILURE_EMOJI_ID}>` : '❌';
 	}
 };
diff --git a/commands/events/neko-atsume-password.js b/commands/events/neko-atsume-password.js
index cb27586e..89d72302 100644
--- a/commands/events/neko-atsume-password.js
+++ b/commands/events/neko-atsume-password.js
@@ -4,7 +4,7 @@ const { stripIndents } = require('common-tags');
 const moment = require('moment');
 require('moment-duration-format');
 const { list, tomorrow } = require('../../util/Util');
-const { GOLD_FISH_EMOJI_ID, SILVER_FISH_EMOJI_ID } = process.env;
+const { GOLD_FISH_EMOJI_ID, GOLD_FISH_EMOJI_NAME, SILVER_FISH_EMOJI_ID, SILVER_FISH_EMOJI_NAME } = process.env;
 const locales = ['en', 'jp'];
 
 module.exports = class NekoAtsumePasswordCommand extends Command {
@@ -58,10 +58,14 @@ module.exports = class NekoAtsumePasswordCommand extends Command {
 	}
 
 	get goldFishEmoji() {
-		return GOLD_FISH_EMOJI_ID ? `<:goldFish:${GOLD_FISH_EMOJI_ID}>` : 'Gold Fish';
+		return GOLD_FISH_EMOJI_ID && GOLD_FISH_EMOJI_NAME
+			? `<:${GOLD_FISH_EMOJI_NAME}:${GOLD_FISH_EMOJI_ID}>`
+			: 'Gold Fish';
 	}
 
 	get silverFishEmoji() {
-		return SILVER_FISH_EMOJI_ID ? `<:silverFish:${SILVER_FISH_EMOJI_ID}>` : 'Silver Fish';
+		return SILVER_FISH_EMOJI_ID && SILVER_FISH_EMOJI_ID
+			? `<:${SILVER_FISH_EMOJI_NAME}:${SILVER_FISH_EMOJI_ID}>`
+			: 'Silver Fish';
 	}
 };
diff --git a/commands/text-edit/mocking.js b/commands/text-edit/mocking.js
index 66c2d0e7..8d4b6694 100644
--- a/commands/text-edit/mocking.js
+++ b/commands/text-edit/mocking.js
@@ -1,5 +1,5 @@
 const Command = require('../../structures/Command');
-const { MOCKING_EMOJI_ID } = process.env;
+const { MOCKING_EMOJI_ID, MOCKING_EMOJI_NAME } = process.env;
 
 module.exports = class MockingCommand extends Command {
 	constructor(client) {
@@ -27,7 +27,11 @@ module.exports = class MockingCommand extends Command {
 		for (let i = 0; i < letters.length; i += Math.floor(Math.random() * 4)) {
 			letters[i] = letters[i].toUpperCase();
 		}
-		return msg.say(`${letters.join('')}${MOCKING_EMOJI_ID ? ` <:mocking:${MOCKING_EMOJI_ID}>` : ''}`);
+		return msg.say(`${letters.join('')}${this.mockingEmoji}`);
+	}
+
+	get mockingEmoji() {
+		return MOCKING_EMOJI_ID && MOCKING_EMOJI_NAME ? ` <:${MOCKING_EMOJI_NAME}:${MOCKING_EMOJI_ID}>` : '';
 	}
 };
 
diff --git a/package.json b/package.json
index ccb87f29..5189acfd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "92.1.5",
+	"version": "92.1.6",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {