From b500b89f8349ce6cef5c273aa0bece30595ce190 Mon Sep 17 00:00:00 2001 From: Dragon Fire Date: Sun, 28 Mar 2021 16:24:47 -0400 Subject: [PATCH] Fix meme gen names --- .../edit-avatar/steam-now-playing-classic.js | 70 ------------------- .../{meme-gen-classic.js => meme-gen.js} | 17 +---- .../{meme-gen-modern.js => reaction-meme.js} | 24 ++----- 3 files changed, 7 insertions(+), 104 deletions(-) delete mode 100644 commands/edit-avatar/steam-now-playing-classic.js rename commands/edit-meme/{meme-gen-classic.js => meme-gen.js} (90%) rename commands/edit-meme/{meme-gen-modern.js => reaction-meme.js} (82%) diff --git a/commands/edit-avatar/steam-now-playing-classic.js b/commands/edit-avatar/steam-now-playing-classic.js deleted file mode 100644 index c140ba71..00000000 --- a/commands/edit-avatar/steam-now-playing-classic.js +++ /dev/null @@ -1,70 +0,0 @@ -const Command = require('../../structures/Command'); -const { createCanvas, loadImage } = require('canvas'); -const request = require('node-superfetch'); -const path = require('path'); -const { shortenText } = require('../../util/Canvas'); - -module.exports = class SteamNowPlayingClassicCommand extends Command { - constructor(client) { - super(client, { - name: 'steam-now-playing-classic', - aliases: ['now-playing-classic', 'steam-now-playing-c', 'now-playing-c'], - group: 'edit-avatar', - memberName: 'steam-now-playing-classic', - description: 'Draws a user\'s avatar over a Steam "now playing" notification (old skin).', - throttling: { - usages: 2, - duration: 10 - }, - clientPermissions: ['ATTACH_FILES'], - credit: [ - { - name: 'Steam', - url: 'https://store.steampowered.com/', - reason: 'Original Design' - }, - { - name: 'Google', - url: 'https://www.google.com/', - reason: 'Noto Font', - reasonURL: 'https://www.google.com/get/noto/' - } - ], - args: [ - { - key: 'game', - prompt: 'Which game would you like the user to be playing?', - type: 'string' - }, - { - key: 'user', - prompt: 'Which user would you like to be playing the game?', - type: 'user', - default: msg => msg.author - } - ] - }); - } - - async run(msg, { game, user }) { - const avatarURL = user.displayAvatarURL({ format: 'png', size: 64 }); - try { - const base = await loadImage( - path.join(__dirname, '..', '..', 'assets', 'images', 'steam-now-playing-classic.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, 21, 21, 32, 32); - ctx.fillStyle = '#90ba3c'; - ctx.font = this.client.fonts.get('Noto-Regular.ttf').toCanvasString(10); - ctx.fillText(user.username, 63, 26); - ctx.fillText(shortenText(ctx, game, 160), 63, 54); - return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'steam-now-playing-classic.png' }] }); - } catch (err) { - return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); - } - } -}; diff --git a/commands/edit-meme/meme-gen-classic.js b/commands/edit-meme/meme-gen.js similarity index 90% rename from commands/edit-meme/meme-gen-classic.js rename to commands/edit-meme/meme-gen.js index d113c19e..7bd7e969 100644 --- a/commands/edit-meme/meme-gen-classic.js +++ b/commands/edit-meme/meme-gen.js @@ -3,22 +3,11 @@ const { createCanvas, loadImage } = require('canvas'); const request = require('node-superfetch'); const { wrapText } = require('../../util/Canvas'); -module.exports = class MemeGenClassicCommand extends Command { +module.exports = class MemeGenCommand extends Command { constructor(client) { super(client, { - name: 'meme-gen-classic', - aliases: [ - 'meme-generator-classic', - 'create-meme-classic', - 'meme-gen-c', - 'classic-meme-gen', - 'classic-meme-generator', - 'create-classic-meme', - 'c-meme-gen', - 'c-meme-generator', - 'create-c-meme', - 'mgc' - ], + name: 'meme-gen', + aliases: ['meme-generator', 'gen-meme', 'mg', 'mgc'], group: 'edit-meme', memberName: 'meme-gen-classic', description: 'Sends a meme with the text and background of your choice.', diff --git a/commands/edit-meme/meme-gen-modern.js b/commands/edit-meme/reaction-meme.js similarity index 82% rename from commands/edit-meme/meme-gen-modern.js rename to commands/edit-meme/reaction-meme.js index 58c7ed61..d8ee7500 100644 --- a/commands/edit-meme/meme-gen-modern.js +++ b/commands/edit-meme/reaction-meme.js @@ -3,29 +3,13 @@ const { createCanvas, loadImage } = require('canvas'); const request = require('node-superfetch'); const { wrapText } = require('../../util/Canvas'); -module.exports = class MemeGenModernCommand extends Command { +module.exports = class ReactionMemeCommand extends Command { constructor(client) { super(client, { - name: 'meme-gen-modern', - aliases: [ - 'meme-gen', - 'meme-generator', - 'create-meme', - 'meme-generator-modern', - 'create-meme-modern', - 'meme-gen-m', - 'modern-meme-gen', - 'modern-meme-generator', - 'create-modern-meme', - 'm-meme-gen', - 'm-meme-generator', - 'create-m-meme', - 'mgm', - 'mg', - 'reaction-meme' - ], + name: 'reaction-meme', + aliases: ['meme-gen-modern', 'mgm'], group: 'edit-meme', - memberName: 'meme-gen-modern', + memberName: 'reaction-meme', description: 'Sends a meme with the text and image of your choice.', throttling: { usages: 2,