Add name options to emoji

This commit is contained in:
Daniel Odendahl Jr
2018-10-04 15:23:58 +00:00
parent 032d1bb092
commit 4203dd15ec
5 changed files with 26 additions and 12 deletions
+5
View File
@@ -9,10 +9,15 @@ XIAO_WEBHOOK_TOKEN=
# Emoji IDs # Emoji IDs
FAILURE_EMOJI_ID= FAILURE_EMOJI_ID=
FAILURE_EMOJI_NAME=
GOLD_FISH_EMOJI_ID= GOLD_FISH_EMOJI_ID=
GOLD_FISH_EMOJI_NAME=
MOCKING_EMOJI_ID= MOCKING_EMOJI_ID=
MOCKING_EMOJI_NAME=
SILVER_FISH_EMOJI_ID= SILVER_FISH_EMOJI_ID=
SILVER_FISH_EMOJI_NAME=
SUCCESS_EMOJI_ID= SUCCESS_EMOJI_ID=
SUCCESS_EMOJI_NAME=
# API Keys, IDs, and Secrets # API Keys, IDs, and Secrets
ALPHA_VANTAGE_KEY= ALPHA_VANTAGE_KEY=
+7 -6
View File
@@ -1,7 +1,7 @@
const Command = require('../../structures/Command'); const Command = require('../../structures/Command');
const request = require('node-superfetch'); const request = require('node-superfetch');
const { stripIndents } = require('common-tags'); 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 { module.exports = class SpoopyLinkCommand extends Command {
constructor(client) { constructor(client) {
@@ -24,11 +24,12 @@ module.exports = class SpoopyLinkCommand extends Command {
async run(msg, { site }) { async run(msg, { site }) {
try { try {
const { body } = await request.get(`https://spoopy.link/api/${site}`); 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` return msg.say(stripIndents`
${body.safe ? 'Safe!' : 'Not safe...'} ${body.safe ? 'Safe!' : 'Not safe...'}
${body.chain.map( ${chain.join('\n')}
url => `<${url.url}> ${url.safe ? this.successEmoji : `${this.failureEmoji} (${url.reasons.join(', ')})`}`
).join('\n')}
`); `);
} catch (err) { } catch (err) {
return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); 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() { 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() { get failureEmoji() {
return FAILURE_EMOJI_ID ? `<:failure:${FAILURE_EMOJI_ID}>` : '❌'; return FAILURE_EMOJI_ID && FAILURE_EMOJI_NAME ? `<:${FAILURE_EMOJI_NAME}:${FAILURE_EMOJI_ID}>` : '❌';
} }
}; };
+7 -3
View File
@@ -4,7 +4,7 @@ const { stripIndents } = require('common-tags');
const moment = require('moment'); const moment = require('moment');
require('moment-duration-format'); require('moment-duration-format');
const { list, tomorrow } = require('../../util/Util'); 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']; const locales = ['en', 'jp'];
module.exports = class NekoAtsumePasswordCommand extends Command { module.exports = class NekoAtsumePasswordCommand extends Command {
@@ -58,10 +58,14 @@ module.exports = class NekoAtsumePasswordCommand extends Command {
} }
get goldFishEmoji() { 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() { 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';
} }
}; };
+6 -2
View File
@@ -1,5 +1,5 @@
const Command = require('../../structures/Command'); 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 { module.exports = class MockingCommand extends Command {
constructor(client) { 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)) { for (let i = 0; i < letters.length; i += Math.floor(Math.random() * 4)) {
letters[i] = letters[i].toUpperCase(); 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}>` : '';
} }
}; };
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "xiao", "name": "xiao",
"version": "92.1.5", "version": "92.1.6",
"description": "Your personal server companion.", "description": "Your personal server companion.",
"main": "Xiao.js", "main": "Xiao.js",
"scripts": { "scripts": {