From 032d1bb092f89194f239db712be5b9dd48e34ab7 Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Thu, 4 Oct 2018 15:15:12 +0000 Subject: [PATCH] Use custom emoji in spoopy-link --- .env.example | 1 + commands/analyze/spoopy-link.js | 13 ++++++++++++- commands/events/neko-atsume-password.js | 6 +++--- package.json | 2 +- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/.env.example b/.env.example index 07f46874..25adbc8c 100644 --- a/.env.example +++ b/.env.example @@ -8,6 +8,7 @@ XIAO_WEBHOOK_ID= XIAO_WEBHOOK_TOKEN= # Emoji IDs +FAILURE_EMOJI_ID= GOLD_FISH_EMOJI_ID= MOCKING_EMOJI_ID= SILVER_FISH_EMOJI_ID= diff --git a/commands/analyze/spoopy-link.js b/commands/analyze/spoopy-link.js index cef0f579..5d3482f3 100644 --- a/commands/analyze/spoopy-link.js +++ b/commands/analyze/spoopy-link.js @@ -1,6 +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; module.exports = class SpoopyLinkCommand extends Command { constructor(client) { @@ -25,10 +26,20 @@ module.exports = class SpoopyLinkCommand extends Command { const { body } = await request.get(`https://spoopy.link/api/${site}`); return msg.say(stripIndents` ${body.safe ? 'Safe!' : 'Not safe...'} - ${body.chain.map(url => `<${url.url}> ${url.safe ? '✅' : `❌ (${url.reasons.join(', ')})`}`).join('\n')} + ${body.chain.map( + url => `<${url.url}> ${url.safe ? this.successEmoji : `${this.failureEmoji} (${url.reasons.join(', ')})`}` + ).join('\n')} `); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); } } + + get successEmoji() { + return SUCCESS_EMOJI_ID ? `<:success:${SUCCESS_EMOJI_ID}>` : '✅'; + } + + get failureEmoji() { + return FAILURE_EMOJI_ID ? `<:failure:${FAILURE_EMOJI_ID}>` : '❌'; + } }; diff --git a/commands/events/neko-atsume-password.js b/commands/events/neko-atsume-password.js index 18ec20cc..cb27586e 100644 --- a/commands/events/neko-atsume-password.js +++ b/commands/events/neko-atsume-password.js @@ -35,7 +35,7 @@ module.exports = class NekoAtsumePasswordCommand extends Command { The current Neko Atsume password is **${data.password}**. It will expire in **${moment.duration(data.expires - data.date).format('hh:mm:ss', { trim: false })}**. - ${data.gold} ${this.goldFish} ${data.silver} ${this.silverFish} + ${data.gold} ${this.goldFishEmoji} ${data.silver} ${this.silverFishEmoji} `); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); @@ -57,11 +57,11 @@ module.exports = class NekoAtsumePasswordCommand extends Command { }; } - get goldFish() { + get goldFishEmoji() { return GOLD_FISH_EMOJI_ID ? `<:goldFish:${GOLD_FISH_EMOJI_ID}>` : 'Gold Fish'; } - get silverFish() { + get silverFishEmoji() { return SILVER_FISH_EMOJI_ID ? `<:silverFish:${SILVER_FISH_EMOJI_ID}>` : 'Silver Fish'; } }; diff --git a/package.json b/package.json index 7621f9f6..ccb87f29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "92.1.4", + "version": "92.1.5", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {