diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js index 71307cfe..0205f6d9 100644 --- a/commands/avataredit/bobross.js +++ b/commands/avataredit/bobross.js @@ -28,16 +28,16 @@ module.exports = class BobRossCommand extends Command { } const { user } = args; const userAvatar = user.displayAvatarURL.replace('.jpg', '.png').replace('.gif', '.png'); + const blank = new Jimp(600, 775, 0xFFFFFF); let images = []; images.push(Jimp.read(userAvatar)); images.push(Jimp.read('./images/BobRoss.png')); - images.push(Jimp.read('./images/BlankWhite.png')); - const [avatar, bob, nothing] = await Promise.all(images); + const [avatar, bob] = await Promise.all(images); avatar.rotate(2); avatar.resize(300, 300); - nothing.composite(avatar, 44, 85); - nothing.composite(bob, 0, 0); - nothing.getBuffer(Jimp.MIME_PNG, (err, buff) => { + blank.composite(avatar, 44, 85); + blank.composite(bob, 0, 0); + blank.getBuffer(Jimp.MIME_PNG, (err, buff) => { if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.send({files: [{attachment: buff}]}); }); diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js index 3cffb864..c04d61ce 100644 --- a/commands/avataredit/steamcard.js +++ b/commands/avataredit/steamcard.js @@ -27,17 +27,17 @@ module.exports = class SteamCardCommand extends Command { } const { user } = args; const userAvatar = user.displayAvatarURL.replace('.jpg', '.png').replace('.gif', '.png'); + const blank = new Jimp(494, 568, 0xFFFFFF); let images = []; images.push(Jimp.read(userAvatar)); images.push(Jimp.read('./images/SteamCard.png')); - images.push(Jimp.read('./images/SteamCardBlank.png')); - const [avatar, steamcard, nothing] = await Promise.all(images); + const [avatar, steamcard] = await Promise.all(images); const font = await Jimp.loadFont(Jimp.FONT_SANS_32_WHITE); avatar.resize(450, 450); - nothing.composite(avatar, 25, 25); - nothing.composite(steamcard, 0, 0); - nothing.print(font, 38, 20, user.username); - nothing.getBuffer(Jimp.MIME_PNG, (err, buff) => { + blank.composite(avatar, 25, 25); + blank.composite(steamcard, 0, 0); + blank.print(font, 38, 20, user.username); + blank.getBuffer(Jimp.MIME_PNG, (err, buff) => { if (err) return message.say(':x: Error! Something went wrong!'); return message.channel.send({files: [{attachment: buff}]}); }); diff --git a/images/BlankWhite.png b/images/BlankWhite.png deleted file mode 100644 index 406390a8..00000000 Binary files a/images/BlankWhite.png and /dev/null differ diff --git a/images/SteamCardBlank.png b/images/SteamCardBlank.png deleted file mode 100644 index f916e29c..00000000 Binary files a/images/SteamCardBlank.png and /dev/null differ diff --git a/package.json b/package.json index 8c0a148a..d1475e02 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "31.3.1", + "version": "31.4.0", "description": "A Discord Bot", "main": "shardingmanager.js", "scripts": {