diff --git a/commands/avatar-edit/triggered.js b/commands/avatar-edit/triggered.js index 8e08f20d..5d578bf6 100644 --- a/commands/avatar-edit/triggered.js +++ b/commands/avatar-edit/triggered.js @@ -2,6 +2,7 @@ const { Command } = require('discord.js-commando'); const { createCanvas, loadImage } = require('canvas'); const snekfetch = require('snekfetch'); const path = require('path'); +const { drawImageWithTint } = require('../../util/Util'); module.exports = class TriggeredCommand extends Command { constructor(client) { @@ -40,10 +41,7 @@ module.exports = class TriggeredCommand extends Command { const ctx = canvas.getContext('2d'); ctx.fillStyle = 'white'; ctx.fillRect(0, 0, base.width, base.height); - ctx.drawImage(avatar, 0, 0, 320, 320); - const data = ctx.getImageData(0, 0, 320, 320); - for (let i = 0; i < data.data.length; i += 4) data.data[i] = Math.max(255, data.data[i]); - ctx.putImageData(data, 0, 0); + drawImageWithTint(ctx, avatar, 'red', 0, 0, 320, 320); ctx.drawImage(base, 0, 0); return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'triggered.png' }] }); } catch (err) { diff --git a/package.json b/package.json index ed08132a..fa2ba873 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "51.2.1", + "version": "51.2.2", "description": "Your personal server companion.", "main": "XiaoBot.js", "scripts": { diff --git a/util/Util.js b/util/Util.js index e0dfece4..f5963252 100644 --- a/util/Util.js +++ b/util/Util.js @@ -138,6 +138,15 @@ class Util { return ctx; } + static drawImageWithTint(ctx, image, color, x, y, width, height) { + ctx.globalAlpha = 0.5; + ctx.fillStyle = color; + ctx.fillRect(x, y, width, height); + ctx.drawImage(image, x, y, width, height); + ctx.globalAlpha = 1; + ctx.fillStyle = '#000000'; + } + static async verify(channel, user, time = 30000) { const filter = res => { const value = res.content.toLowerCase();