diff --git a/README.md b/README.md index 92c4f579..fcaf7d18 100644 --- a/README.md +++ b/README.md @@ -280,8 +280,8 @@ served over 10,000 servers with a uniquely devoted fanbase. ### Text Manipulation: * **alphabet-reverse**: Reverses the alphabet of text. -* **base64**: Converts text to Base64. -* **binary**: Converts text to binary. +* **base64**: Converts text to/from Base64. +* **binary**: Converts text to/from binary. * **braille**: Converts text to braille. * **clap**: Sends 👏 text 👏 like 👏 this. * **cow-say**: Makes a cow say your text. @@ -302,7 +302,7 @@ served over 10,000 servers with a uniquely devoted fanbase. * **pirate**: Converts text to pirate. * **repeat**: Repeat text over and over and over and over (etc). * **reverse**: Reverses text. -* **say**: Make XiaoBot say what you wish. +* **say**: Make me say what you want, master. * **sha-256**: Creates a hash of text with the SHA-256 algorithm. * **ship-name**: Creates a ship name from two names. * **shorten-url**: Creates a goo.gl short URL from another URL. diff --git a/assets/json/be-like-bill.json b/assets/json/be-like-bill.json index 6d2a2398..615cbd07 100644 --- a/assets/json/be-like-bill.json +++ b/assets/json/be-like-bill.json @@ -23,7 +23,7 @@ "{{name}} likes dogs.\n{{name}} doesn't bring his dogs\nto your house uninvited.", "{{name}} likes to go bowling.\n{{name}} doesn't put up bumpers.", "{{name}} eats pant.", - "{{name}} likes to use XiaoBot.\n{{name}} doesn't complain when\nit goes closed source.", + "{{name}} likes to use Xiao.\n{{name}} doesn't complain when\nit goes closed source.", "{{name}} loves to buy shoes.\n{{name}} doesn't buy 200 pairs for no reason.", "{{name}} doesn't like dogs.\n{{name}} doesn't complain on the internet\nbecause he knows no one cares.", "{{name}}.\nEnough said.", diff --git a/commands/text-edit/base64.js b/commands/text-edit/base64.js index abdd33fb..f621d11f 100644 --- a/commands/text-edit/base64.js +++ b/commands/text-edit/base64.js @@ -9,7 +9,7 @@ module.exports = class Base64Command extends Command { aliases: ['base-64'], group: 'text-edit', memberName: 'base64', - description: 'Converts text to Base64.', + description: 'Converts text to/from Base64.', details: `**Modes**: ${modes.join(', ')}`, args: [ { diff --git a/commands/text-edit/binary.js b/commands/text-edit/binary.js index beac47e2..1cbaaed9 100644 --- a/commands/text-edit/binary.js +++ b/commands/text-edit/binary.js @@ -8,7 +8,7 @@ module.exports = class BinaryCommand extends Command { name: 'binary', group: 'text-edit', memberName: 'binary', - description: 'Converts text to binary.', + description: 'Converts text to/from binary.', details: `**Modes**: ${modes.join(', ')}`, args: [ { diff --git a/commands/text-edit/say.js b/commands/text-edit/say.js index ad7f571b..98f3b18c 100644 --- a/commands/text-edit/say.js +++ b/commands/text-edit/say.js @@ -7,18 +7,23 @@ module.exports = class SayCommand extends Command { aliases: ['copy', 'echo'], group: 'text-edit', memberName: 'say', - description: 'Make XiaoBot say what you wish.', + description: 'Make me say what you want, master.', args: [ { key: 'text', - prompt: 'What text would you like XiaoBot to say?', + prompt: 'What text would you like me to say?', type: 'string' } ] }); } - run(msg, { text }) { - return msg.say(text); + async run(msg, { text }) { + try { + if (msg.channel.type === 'text' && msg.deletable) await msg.delete(); + return msg.say(text); + } catch (err) { + return msg.say(text); + } } }; diff --git a/commands/text-edit/webhook.js b/commands/text-edit/webhook.js index d51a6631..47a2a531 100644 --- a/commands/text-edit/webhook.js +++ b/commands/text-edit/webhook.js @@ -24,9 +24,11 @@ module.exports = class WebhookCommand extends Command { } async run(msg, { content }) { - if (msg.channel.type === 'text') await msg.delete(); try { - await snekfetch.post(`https://discordapp.com/api/webhooks/${WEBHOOK_ID}/${WEBHOOK_TOKEN}`).send({ content }); + if (msg.channel.type === 'text' && msg.deletable) await msg.delete(); + await snekfetch + .post(`https://discordapp.com/api/webhooks/${WEBHOOK_ID}/${WEBHOOK_TOKEN}`) + .send({ content }); return null; } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); diff --git a/commands/util/donate.js b/commands/util/donate.js index 34dcdf63..1a594cfe 100644 --- a/commands/util/donate.js +++ b/commands/util/donate.js @@ -15,7 +15,7 @@ module.exports = class DonateCommand extends Command { run(msg) { return msg.say(stripIndents` - Contribute to XiaoBot development! + Contribute to Xiao development! `); diff --git a/package.json b/package.json index 59369612..7c540148 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "73.2.7", + "version": "73.2.8", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {