diff --git a/commands/edit-image/dexter.js b/commands/edit-image/dexter.js index 8da1ca05..90d8e991 100644 --- a/commands/edit-image/dexter.js +++ b/commands/edit-image/dexter.js @@ -38,13 +38,13 @@ module.exports = class DexterCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'dexter.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); ctx.rotate(-11 * (Math.PI / 180)); - const { x, y, width, height } = centerImagePart(avatar, 225, 225, 234, 274); - ctx.drawImage(avatar, x, y, width, height); + const { x, y, width, height } = centerImagePart(data, 225, 225, 234, 274); + ctx.drawImage(data, x, y, width, height); ctx.rotate(11 * (Math.PI / 180)); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'dexter.png' }] }); } catch (err) { diff --git a/commands/edit-meme/challenger.js b/commands/edit-meme/challenger.js index 29fc8691..329aadd8 100644 --- a/commands/edit-meme/challenger.js +++ b/commands/edit-meme/challenger.js @@ -52,12 +52,12 @@ module.exports = class ChallengerCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'challenger.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); - const { x, y, width, height } = centerImagePart(avatar, 256, 256, 484, 98); - ctx.drawImage(silhouetted ? this.silhouetteImage(avatar) : avatar, x, y, width, height); + const { x, y, width, height } = centerImagePart(data, 256, 256, 484, 98); + ctx.drawImage(silhouetted ? this.silhouetteImage(data) : data, x, y, width, height); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'challenger.png' }] }); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); diff --git a/commands/edit-meme/girl-worth-fighting-for.js b/commands/edit-meme/girl-worth-fighting-for.js index 0b46a517..a57a82da 100644 --- a/commands/edit-meme/girl-worth-fighting-for.js +++ b/commands/edit-meme/girl-worth-fighting-for.js @@ -46,12 +46,12 @@ module.exports = class GirlWorthFightingForCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'girl-worth-fighting-for.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); - const { x, y, width, height } = centerImagePart(avatar, 150, 150, 380, 511); - ctx.drawImage(avatar, x, y, width, height); + const { x, y, width, height } = centerImagePart(data, 150, 150, 380, 511); + ctx.drawImage(data, x, y, width, height); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'girl-worth-fighting-for.png' }] }); } catch (err) { return msg.reply(`Oh no, an error occurred: \`${err.message}\`. Try again later!`); diff --git a/commands/edit-meme/look-at-this-photograph.js b/commands/edit-meme/look-at-this-photograph.js index 99c4eb13..6a511da4 100644 --- a/commands/edit-meme/look-at-this-photograph.js +++ b/commands/edit-meme/look-at-this-photograph.js @@ -39,12 +39,12 @@ module.exports = class LookAtThisPhotographCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'look-at-this-photograph.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); ctx.rotate(-13.5 * (Math.PI / 180)); - ctx.drawImage(avatar, 280, 218, 175, 125); + ctx.drawImage(data, 280, 218, 175, 125); ctx.rotate(13.5 * (Math.PI / 180)); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'look-at-this-photograph.png' }] }); } catch (err) { diff --git a/commands/edit-meme/my-collection-grows.js b/commands/edit-meme/my-collection-grows.js index 606d0438..8d67894e 100644 --- a/commands/edit-meme/my-collection-grows.js +++ b/commands/edit-meme/my-collection-grows.js @@ -40,14 +40,14 @@ module.exports = class MyCollectionGrowsCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'my-collection-grows.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.fillStyle = 'white'; ctx.fillRect(0, 0, base.width, base.height); ctx.rotate(-14 * (Math.PI / 180)); - const { x, y, width, height } = centerImagePart(avatar, 425, 425, 145, 179); - ctx.drawImage(avatar, x, y, width, height); + const { x, y, width, height } = centerImagePart(data, 425, 425, 145, 179); + ctx.drawImage(data, x, y, width, height); ctx.rotate(14 * (Math.PI / 180)); ctx.drawImage(base, 0, 0); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'my-collection-grows.png' }] }); diff --git a/commands/edit-meme/ultimate-tattoo.js b/commands/edit-meme/ultimate-tattoo.js index e47314bb..4325e233 100644 --- a/commands/edit-meme/ultimate-tattoo.js +++ b/commands/edit-meme/ultimate-tattoo.js @@ -45,13 +45,13 @@ module.exports = class UltimateTattooCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'ultimate-tattoo.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); ctx.rotate(-10 * (Math.PI / 180)); - const { x, y, width, height } = centerImagePart(avatar, 300, 300, 84, 690); - ctx.drawImage(avatar, x, y, width, height); + const { x, y, width, height } = centerImagePart(data, 300, 300, 84, 690); + ctx.drawImage(data, x, y, width, height); ctx.rotate(10 * (Math.PI / 180)); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'ultimate-tattoo.png' }] }); } catch (err) { diff --git a/commands/edit-meme/worthless.js b/commands/edit-meme/worthless.js index 8ca2b9c8..23bf2cc0 100644 --- a/commands/edit-meme/worthless.js +++ b/commands/edit-meme/worthless.js @@ -40,19 +40,19 @@ module.exports = class WorthlessCommand extends Command { try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'worthless.png')); const { body } = await request.get(image); - const avatar = await loadImage(body); + const data = await loadImage(body); const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); ctx.rotate(6 * (Math.PI / 180)); - const center1 = centerImagePart(avatar, 400, 400, 496, 183); - ctx.drawImage(avatar, center1.x, center1.y, center1.width, center1.height); + const center1 = centerImagePart(data, 400, 400, 496, 183); + ctx.drawImage(data, center1.x, center1.y, center1.width, center1.height); ctx.rotate(-6 * (Math.PI / 180)); ctx.translate(canvas.width / 2, canvas.height / 2); ctx.rotate(160 * (Math.PI / 180)); ctx.translate(-(canvas.width / 2), -(canvas.height / 2)); - const center2 = centerImagePart(avatar, 75, 75, 625, 55); - ctx.drawImage(avatar, center2.x, center2.y, center2.width, center2.height); + const center2 = centerImagePart(data, 75, 75, 625, 55); + ctx.drawImage(data, center2.x, center2.y, center2.width, center2.height); ctx.rotate(-160 * (Math.PI / 180)); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'worthless.png' }] }); } catch (err) {