diff --git a/README.md b/README.md index 8395489f..39b41fc2 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Xiao is a Discord bot coded in JavaScript with The bot is no longer available for invite. You can self-host the bot, or use her on the [home server](https://discord.gg/sbMe32W). -## Commands (322) +## Commands (321) ### Utility: * **eval:** Executes JavaScript code. @@ -308,7 +308,6 @@ on the [home server](https://discord.gg/sbMe32W). * **brony-speak:** Converts text to brony speak. * **clap:** Sends 👏 text 👏 like 👏 this. * **cow-say:** Makes a cow say your text. -* **cow-think:** Makes a cow think your text. * **cursive:** Converts text to cursive. * **dvorak:** Converts text to Dvorak encoding. * **embed:** Sends text in an embed. diff --git a/commands/text-edit/cow-say.js b/commands/text-edit/cow-say.js index bbc9688e..0ab3da6b 100644 --- a/commands/text-edit/cow-say.js +++ b/commands/text-edit/cow-say.js @@ -1,9 +1,5 @@ const Command = require('../../structures/Command'); -const cowsay = require('cowsay'); -const cowList = require('cowsay/lib/cows'); -const { list } = require('../../util/Util'); -const cows = cowList.listSync(); -cows.push('random'); +const request = require('node-superfetch'); module.exports = class CowSayCommand extends Command { constructor(client) { @@ -12,37 +8,28 @@ module.exports = class CowSayCommand extends Command { group: 'text-edit', memberName: 'cow-say', description: 'Makes a cow say your text.', - details: `**Types:** ${cows.join(', ')}`, args: [ { key: 'text', prompt: 'What text would you like the cow to say?', type: 'string', - max: 500 - }, - { - key: 'type', - prompt: `What type of cow would you like to use? Either ${list(cows, 'or')}.`, - type: 'string', - default: 'default', - validate: type => { - if (cows.includes(type.toLowerCase()) || type.toLowerCase() === 'cow') return true; - return `Invalid type, please enter either ${list(cows, 'or')}.`; - }, - parse: type => { - if (type.toLowerCase() === 'cow') return 'default'; - return type.toLowerCase(); - } + max: 1000 } ] }); } - run(msg, { text, type }) { - return msg.code(null, cowsay.say({ - text, - f: type, - r: type === 'random' - })); + async run(msg, { text }) { + try { + const { body } = request + .get('http://cowsay.morecode.org/say') + .query({ + message: text, + format: 'json' + }); + return msg.code(null, body.cow); + } catch (err) { + return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); + } } }; diff --git a/commands/text-edit/cow-think.js b/commands/text-edit/cow-think.js deleted file mode 100644 index 8516868e..00000000 --- a/commands/text-edit/cow-think.js +++ /dev/null @@ -1,48 +0,0 @@ -const Command = require('../../structures/Command'); -const cowsay = require('cowsay'); -const cowList = require('cowsay/lib/cows'); -const { list } = require('../../util/Util'); -const cows = cowList.listSync(); -cows.push('random'); - -module.exports = class CowThinkCommand extends Command { - constructor(client) { - super(client, { - name: 'cow-think', - group: 'text-edit', - memberName: 'cow-think', - description: 'Makes a cow think your text.', - details: `**Types:** ${cows.join(', ')}`, - args: [ - { - key: 'text', - prompt: 'What text would you like the cow to think?', - type: 'string', - max: 500 - }, - { - key: 'type', - prompt: `What type of cow would you like to use? Either ${list(cows, 'or')}.`, - type: 'string', - default: 'default', - validate: type => { - if (cows.includes(type.toLowerCase()) || type.toLowerCase() === 'cow') return true; - return `Invalid type, please enter either ${list(cows, 'or')}.`; - }, - parse: type => { - if (type.toLowerCase() === 'cow') return 'default'; - return type.toLowerCase(); - } - } - ] - }); - } - - run(msg, { text, type }) { - return msg.code(null, cowsay.think({ - text, - f: type, - r: type === 'random' - })); - } -}; diff --git a/package.json b/package.json index 46e0cb44..08d5b39e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "91.15.0", + "version": "92.0.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { @@ -35,7 +35,6 @@ "canvas": "^2.0.0-alpha.17", "cheerio": "^1.0.0-rc.2", "common-tags": "^1.8.0", - "cowsay": "^1.3.1", "custom-translate": "^2.2.7", "discord.js": "github:discordjs/discord.js", "discord.js-commando": "github:discordjs/Commando",