From f2a4e979c6f694d49f898e44137e33075986e792 Mon Sep 17 00:00:00 2001
From: Daniel Odendahl Jr <danielbodendahl@gmail.com>
Date: Sun, 9 Sep 2018 17:24:50 +0000
Subject: [PATCH] Fix yu-gi-oh

---
 commands/search/yu-gi-oh.js | 38 ++++++++++++++++---------------------
 package.json                |  2 +-
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/commands/search/yu-gi-oh.js b/commands/search/yu-gi-oh.js
index 98737962..8596025d 100644
--- a/commands/search/yu-gi-oh.js
+++ b/commands/search/yu-gi-oh.js
@@ -2,7 +2,7 @@ const Command = require('../../structures/Command');
 const { MessageEmbed } = require('discord.js');
 const request = require('node-superfetch');
 const { stripIndents } = require('common-tags');
-const { shorten } = require('../../util/Util');
+const { shorten, firstUpperCase } = require('../../util/Util');
 
 module.exports = class YuGiOhCommand extends Command {
 	constructor(client) {
@@ -17,7 +17,8 @@ module.exports = class YuGiOhCommand extends Command {
 				{
 					key: 'card',
 					prompt: 'What card would you like to get information on?',
-					type: 'string'
+					type: 'string',
+					parse: card => encodeURIComponent(card)
 				}
 			]
 		});
@@ -25,33 +26,26 @@ module.exports = class YuGiOhCommand extends Command {
 
 	async run(msg, { card }) {
 		try {
-			const { text } = await request
-				.get('https://www.ygohub.com/api/card_info')
-				.query({ name: card });
-			const body = JSON.parse(text);
-			if (body.status === 'error') return msg.say('Could not find any results.');
-			const data = body.card;
+			const { body } = await request.get(`https://yugiohprices.com/api/card_data/${card}`);
+			if (body.status === 'fail') return msg.say('Could not find any results.');
+			const image = await request.get(`https://yugiohprices.com/api/card_image/${card}`);
+			const { data } = body;
 			const embed = new MessageEmbed()
+				.attachFiles([{ attachment: image.body, name: 'thumbnail.jpg' }])
 				.setColor(0xBE5F1F)
 				.setTitle(data.name)
 				.setDescription(shorten(data.text))
 				.setAuthor('Yu-Gi-Oh!', 'https://i.imgur.com/AJNBflD.png', 'http://www.yugioh-card.com/')
-				.setURL(data.tcgplayer_link)
-				.setThumbnail(data.image_path)
-				.addField('❯ Card Type', data.type, true);
-			if (data.is_monster) {
+				.setThumbnail('attachment://thumbnail.jpg')
+				.addField('❯ Card Type', firstUpperCase(data.card_type), true);
+			if (data.card_type === 'monster') {
 				embed
-					.addField('❯ Species', data.species, true)
-					.addField('❯ Attribute', data.attribute, true)
-					.addField('❯ Level', data.stars, true)
-					.addField('❯ ATK', data.attack, true)
-					.addField('❯ DEF', data.defense, true);
+					.addField('❯ Species', data.type, true)
+					.addField('❯ Attribute', firstUpperCase(data.family), true)
+					.addField('❯ Level', data.level, true)
+					.addField('❯ ATK', data.atk, true)
+					.addField('❯ DEF', data.def, true);
 			}
-			embed.addField('❯ Legality', stripIndents`
-				TCG Advanced: ${data.legality.TCG.Advanced}
-				TCG Traditional: ${data.legality.TCG.Traditional}
-				OCG Advanced: ${data.legality.OCG.Advanced}
-			`);
 			return msg.embed(embed);
 		} catch (err) {
 			return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`);
diff --git a/package.json b/package.json
index b3cc12b7..64075bef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "91.0.0",
+	"version": "91.0.1",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {