From 2d108cc78a9b30f139e1d6024654fae0c2706dec Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Sat, 22 Apr 2017 14:40:49 +0000 Subject: [PATCH] No Need for Blank Images with this --- commands/avataredit/bobross.js | 10 +++++----- commands/avataredit/steamcard.js | 12 ++++++------ images/BlankWhite.png | Bin 3014 -> 0 bytes images/SteamCardBlank.png | Bin 1655 -> 0 bytes package.json | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 images/BlankWhite.png delete mode 100644 images/SteamCardBlank.png 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 406390a86c1b038421aa77f1bd22927e9e8cecb8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3014 zcmeAS@N?(olHy`uVBq!ia0y~yV2WU1U}ooF1ByI7sp$oz*pj^6T^Rm@;DWu&Cj&(| z3p^r=85p>QL70(Y)*K0-AbW|YuPggQCQ(*B<;4j)|ABJBo-U3d6}R4AGh}37;5ck> zVE^;PrhXTv^<|Sp7#Pysm>3wESs4;GFfj0l0qx;tIFP`|AfW^1HXLMPFaWv*#3e-$ zNDo1ikQ6~}$6_6JMKC8q-9#NlFx#OHM{*OAbx4YkLIfmAP!V#703D9qB$5>YBaN_0 zNQ!73mAF$5_E-XmBDo2>BBZbdMGHYiNFf5!N-!#kQbhCkMv5h18bq=VIZ+@h@*d5* z(4<3Zgd+tmNGnqMLNWs=fbAyHK- qQHqc%!qIvcUg{&2W<=%P_qxX{xwwk58~*}Z+zg(selF{r5}E+TtO}6; diff --git a/images/SteamCardBlank.png b/images/SteamCardBlank.png deleted file mode 100644 index f916e29c2d9ee6d9afc318282962f39c5fa876ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1655 zcmeAS@N?(olHy`uVBq!ia0y~yV0_2Gz+}O}1Qb#JHFq75;w|}wbMj9ADn$|~i oJqmqo>VdON3^&+w&GPG?0V@p#Pgg&ebxsLQ0G62fP5=M^ 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": {