diff --git a/README.md b/README.md index cd491475..43dd2566 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ in the appropriate channel's topic to use it. ## Commands -Total: 499 +Total: 501 ### Utility: @@ -366,6 +366,7 @@ Total: 499 * **ship:** Ships two users together. * **smash-or-pass:** Determines if a user is worthy of a smash or a pass. * **thicc:** Determines how thicc you are. +* **worth:** Determines how much a user is worth. ### Single Response: @@ -578,6 +579,7 @@ Total: 499 * **glitch:** Draws an image or a user's avatar but glitched. * **greyscale:** Draws an image or a user's avatar in greyscale. * **gun:** Draws a gun over an image or a user's avatar. +* **hands:** Draws creepy hands over an image or a user's avatar. * **highway-sign:** Sends a highway sign sign with the text of your choice. * **hollywood-star:** Sends a Hollywood Walk of Fame star with the name of your choice. * **ifunny:** Draws an image with the iFunny logo. @@ -880,6 +882,7 @@ here. * lyrics (Lyrics Data) - [AzuraApple](https://github.com/AzuraApple) * screenshot (Concept) + * worth (Concept) - [Bethesda](https://bethesda.net/en/dashboard) * dislike ([Image, Original "Fallout" Game](https://fallout.bethesda.net/en/)) * like ([Image, Original "Fallout" Game](https://fallout.bethesda.net/en/)) @@ -1175,6 +1178,7 @@ here. * hat ([Witch Hat Image](https://www.kissclipart.com/halloween-witch-hat-clipart-witch-hat-clip-art-qfycyt/)) - [Know Your Meme](https://knowyourmeme.com/) * bob-ross ([Image](https://knowyourmeme.com/photos/1160348)) + * hands ([Image](https://knowyourmeme.com/photos/1583323-screen-reaching-emoji)) * hat ([Christmas Hat Image](https://knowyourmeme.com/forums/just-for-fun/topics/24821-christmas-hat-thread)) * know-your-meme (Meme Data) * kyon-gun ([Image](https://knowyourmeme.com/photos/217992-endless-eight-kyon-kun-denwa)) @@ -1312,6 +1316,7 @@ here. * alert (Concept) * dislike (Concept) * gun (Concept) + * hands (Concept) * hentai (Original Subreddit List) * like (Concept) * pills (Concept) diff --git a/assets/images/hands.png b/assets/images/hands.png new file mode 100644 index 00000000..7e1f5180 Binary files /dev/null and b/assets/images/hands.png differ diff --git a/assets/json/xiao-fact.json b/assets/json/xiao-fact.json index 3d48a108..8faa667f 100644 --- a/assets/json/xiao-fact.json +++ b/assets/json/xiao-fact.json @@ -52,6 +52,5 @@ "Xiao began development in February 2017, and was most likely active sometime in 2016 under a different name.", "The command with the most lines of code is `poker`, at 313.", "The `ship` command gives a special response if the compatability is 69.", - "The `jeopardy` command will play the Jeopardy think music if both you and the bot are in a voice channel when the command is used.", - "Dragon Fire, the developer of Xiao, is forever alone." + "The `jeopardy` command will play the Jeopardy think music if both you and the bot are in a voice channel when the command is used." ] diff --git a/commands/edit-image/hands.js b/commands/edit-image/hands.js new file mode 100644 index 00000000..234acf37 --- /dev/null +++ b/commands/edit-image/hands.js @@ -0,0 +1,61 @@ +const Command = require('../../structures/Command'); +const { createCanvas, loadImage } = require('canvas'); +const request = require('node-superfetch'); +const path = require('path'); + +module.exports = class HandsCommand extends Command { + constructor(client) { + super(client, { + name: 'hands', + aliases: ['grab', 'pedo-hands'], + group: 'edit-image', + memberName: 'hands', + description: 'Draws creepy hands over an image or a user\'s avatar.', + throttling: { + usages: 1, + duration: 10 + }, + clientPermissions: ['ATTACH_FILES'], + credit: [ + { + name: 'Overtime2005', + url: 'https://github.com/Overtime2005', + reason: 'Concept' + }, + { + name: 'Know Your Meme', + url: 'https://knowyourmeme.com/', + reason: 'Image', + reasonURL: 'https://knowyourmeme.com/photos/1583323-screen-reaching-emoji' + } + ], + args: [ + { + key: 'image', + prompt: 'What image would you like to edit?', + type: 'image', + default: msg => msg.author.displayAvatarURL({ format: 'png', size: 512 }) + } + ] + }); + } + + async run(msg, { image }) { + try { + const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'hands.png')); + const { body } = await request.get(image); + const data = await loadImage(body); + const canvas = createCanvas(data.width, data.height); + const ctx = canvas.getContext('2d'); + ctx.drawImage(data, 0, 0); + const ratio = data.width / base.width; + const height = base.height * ratio; + ctx.drawImage(base, 0, data.height - height, data.width, height); + const attachment = canvas.toBuffer(); + if (Buffer.byteLength(attachment) > 8e+6) return msg.reply('Resulting image was above 8 MB.'); + return msg.say({ files: [{ attachment, name: 'hands.png' }] }); + } catch (err) { + return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); + } + } +}; diff --git a/commands/random-seed/worth.js b/commands/random-seed/worth.js new file mode 100644 index 00000000..9d95afd3 --- /dev/null +++ b/commands/random-seed/worth.js @@ -0,0 +1,42 @@ +const Command = require('../../structures/Command'); +const { MersenneTwister19937, integer } = require('random-js'); +const { formatNumber } = require('../../util/Util'); + +module.exports = class WorthCommand extends Command { + constructor(client) { + super(client, { + name: 'worth', + aliases: ['self-worth'], + group: 'random-seed', + memberName: 'worth', + description: 'Determines how much a user is worth.', + args: [ + { + key: 'user', + prompt: 'Which user do you want me to get the worth of?', + type: 'user', + default: msg => msg.author + } + ], + credit: [ + { + name: 'AzuraApple', + url: 'https://github.com/AzuraApple', + reason: 'Concept' + } + ] + }); + } + + run(msg, { user }) { + const authorUser = user.id === msg.author.id; + if (user.id === this.client.user.id) return msg.reply('Me? I\'m worth $5/month. At least that\'s how much I cost.'); + if (this.client.isOwner(user)) { + if (authorUser) return msg.reply('Infinity, you amazing owner ❤'); + return msg.reply(`${user.username}, as in my owner? Worthless. Absolutely worthless.`); + } + const random = MersenneTwister19937.seed(user.id); + const worth = integer(0, 1000000)(random); + return msg.reply(`${authorUser ? 'You are' : `${user.username} is`} worth $${formatNumber(worth)}.`); + } +}; diff --git a/package.json b/package.json index a6fb38dc..2755f724 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "116.37.4", + "version": "116.38.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {