diff --git a/README.md b/README.md index cb253623..730935ac 100644 --- a/README.md +++ b/README.md @@ -227,7 +227,7 @@ in the appropriate channel's topic to use it. ## Commands -Total: 474 +Total: 475 ### Utility: @@ -660,6 +660,7 @@ Total: 474 * **two-buttons:** Sends a "Two Buttons" meme with the buttons of your choice. * **ultimate-tattoo:** Draws an image or a user's avatar as "The Ultimate Tattoo". * **vietnam-flashbacks:** Edits Vietnam flashbacks behind an image or a user's avatar. +* **worse-than-hitler:** Draws a user's avatar over Family Guy's "Worse Than Hitler" meme. * **worthless:** Draws an image or a user's avatar over Gravity Falls' "This is worthless." meme. ### Text Manipulation: @@ -806,6 +807,7 @@ here. * bart-chalkboard ([Image, Original "The Simpsons" Show](http://www.simpsonsworld.com/)) * eat-pant ([Original "The Simpsons" Show](http://www.simpsonsworld.com/)) * lisa-presentation ([Image, Original "The Simpsons" Show](http://www.simpsonsworld.com/)) + * worse-than-hitler ([Image, Original "Family Guy" Show](https://www.fox.com/family-guy/)) - [@Candasaurus](https://twitter.com/Candasaurus) * sora-selfie ([Image](https://twitter.com/Candasaurus/status/1041946636656599045)) - [@liltusk](https://twitter.com/liltusk) @@ -1257,6 +1259,7 @@ here. * like (Concept) * porn (Original Subreddit List) * simp (Concept) + * worse-than-hitler (Concept) - [PAC-MAN Party](http://pacman.com/en/pac-man-games/pac-man-party) * balloon-pop (Concept) - [PaladinsGuru](https://paladins.guru/) diff --git a/assets/images/worse-than-hitler.png b/assets/images/worse-than-hitler.png new file mode 100644 index 00000000..786a9d44 Binary files /dev/null and b/assets/images/worse-than-hitler.png differ diff --git a/commands/edit-meme/worse-than-hitler.js b/commands/edit-meme/worse-than-hitler.js new file mode 100644 index 00000000..163bdfe7 --- /dev/null +++ b/commands/edit-meme/worse-than-hitler.js @@ -0,0 +1,58 @@ +const Command = require('../../structures/Command'); +const { createCanvas, loadImage } = require('canvas'); +const request = require('node-superfetch'); +const path = require('path'); + +module.exports = class WorseThanHitlerCommand extends Command { + constructor(client) { + super(client, { + name: 'worse-than-hitler', + aliases: ['hitler'], + group: 'edit-meme', + memberName: 'worse-than-hitler', + description: 'Draws a user\'s avatar over Family Guy\'s "Worse Than Hitler" meme.', + throttling: { + usages: 1, + duration: 10 + }, + clientPermissions: ['ATTACH_FILES'], + credit: [ + { + name: '20th Century Fox', + url: 'https://www.foxmovies.com/', + reason: 'Image, Original "Family Guy" Show', + reasonURL: 'https://www.fox.com/family-guy/' + }, + { + name: 'Overtime2005', + url: 'https://github.com/Overtime2005', + reason: 'Concept' + } + ], + args: [ + { + key: 'user', + prompt: 'Which user would you like to edit the avatar of?', + type: 'user', + default: msg => msg.author + } + ] + }); + } + + async run(msg, { user }) { + const avatarURL = user.displayAvatarURL({ format: 'png', size: 256 }); + try { + const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'worse-than-hitler.png')); + const { body } = await request.get(avatarURL); + const avatar = await loadImage(body); + const canvas = createCanvas(base.width, base.height); + const ctx = canvas.getContext('2d'); + ctx.drawImage(base, 0, 0); + ctx.drawImage(avatar, 47, 42, 140, 140); + return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'worse-than-hitler.png' }] }); + } catch (err) { + return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); + } + } +}; diff --git a/commands/random-seed/dick.js b/commands/random-seed/dick.js index 85f3bf30..1fd9ec35 100644 --- a/commands/random-seed/dick.js +++ b/commands/random-seed/dick.js @@ -5,11 +5,10 @@ module.exports = class DickCommand extends Command { constructor(client) { super(client, { name: 'dick', - aliases: ['dick-size', 'penis', 'penis-size', 'pee-pee', 'pee-pee-size', 'cock', 'cock-size'], + aliases: ['dick-size', 'penis', 'penis-size', 'pee-pee', 'pee-pee-size', 'cock', 'cock-size', 'pp'], group: 'random-seed', memberName: 'dick', description: 'Determines your dick size.', - nsfw: true, args: [ { key: 'user', diff --git a/package.json b/package.json index 9c9512a2..5dfdd046 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "116.17.2", + "version": "116.18.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {