diff --git a/commands/edit-image/pixelize.js b/commands/edit-image/pixelize.js index c705882b..342d588c 100644 --- a/commands/edit-image/pixelize.js +++ b/commands/edit-image/pixelize.js @@ -1,6 +1,7 @@ const Command = require('../../structures/Command'); const { createCanvas, loadImage } = require('canvas'); const request = require('node-superfetch'); +const { pixelize } = require('../../util/Canvas'); module.exports = class PixelizeCommand extends Command { constructor(client) { @@ -32,11 +33,7 @@ module.exports = class PixelizeCommand extends Command { const data = await loadImage(body); const canvas = createCanvas(data.width, data.height); const ctx = canvas.getContext('2d'); - ctx.imageSmoothingEnabled = false; - const width = canvas.width * 0.15; - const height = canvas.height * 0.15; - ctx.drawImage(data, 0, 0, width, height); - ctx.drawImage(canvas, 0, 0, width, height, 0, 0, canvas.width, canvas.height); + pixelize(ctx, 0.15, 0, 0, canvas.width, canvas.height); const attachment = canvas.toBuffer(); if (Buffer.byteLength(attachment) > 8e+6) return msg.reply('Resulting image was above 8 MB.'); return msg.say({ files: [{ attachment, name: 'pixelize.png' }] }); diff --git a/commands/edit-image/wild-pokemon.js b/commands/edit-image/wild-pokemon.js index 4d1a0961..6af41179 100644 --- a/commands/edit-image/wild-pokemon.js +++ b/commands/edit-image/wild-pokemon.js @@ -2,7 +2,7 @@ const Command = require('../../structures/Command'); const { createCanvas, loadImage, registerFont } = require('canvas'); const request = require('node-superfetch'); const path = require('path'); -const { centerImagePart, greyscale } = require('../../util/Canvas'); +const { centerImagePart, greyscale, pixelize } = require('../../util/Canvas'); registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'PokemonGb.ttf'), { family: 'Pokemon GB' }); module.exports = class WildPokemonCommand extends Command { @@ -61,11 +61,8 @@ module.exports = class WildPokemonCommand extends Command { const canvas = createCanvas(base.width, base.height); const ctx = canvas.getContext('2d'); ctx.drawImage(base, 0, 0); - ctx.imageSmoothingEnabled = false; const { x, y, width, height } = centerImagePart(data, 100, 100, 227, 11); - ctx.drawImage(data, x, y, width * 0.30, height * 0.30); - ctx.drawImage(canvas, x, y, width * 0.30, height * 0.30, x, y, width, height); - ctx.imageSmoothingEnabled = true; + pixelize(ctx, 0.30, x, y, width, height); greyscale(ctx, x, y, width, height); ctx.textBaseline = 'top'; ctx.font = '16px Pokemon GB'; diff --git a/package.json b/package.json index bdd696bc..5e8aa8b9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "119.0.1", + "version": "119.0.2", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": { diff --git a/util/Canvas.js b/util/Canvas.js index c574b244..4316bd44 100644 --- a/util/Canvas.js +++ b/util/Canvas.js @@ -117,6 +117,14 @@ module.exports = class CanvasUtil { return ctx; } + static pixelize(ctx, level, x, y, width, height) { + ctx.imageSmoothingEnabled = false; + ctx.drawImage(data, x, y, width * level, height * level); + ctx.drawImage(canvas, x, y, width * level, height * level, x, y, width, height); + ctx.imageSmoothingEnabled = true; + return ctx; + } + static hasAlpha(image) { const canvas = createCanvas(image.width, image.height); const ctx = canvas.getContext('2d');