diff --git a/assets/fonts/OpenSans.ttf b/assets/fonts/OpenSans.ttf new file mode 100644 index 00000000..db433349 Binary files /dev/null and b/assets/fonts/OpenSans.ttf differ diff --git a/commands/avataredit/3000years.js b/commands/avataredit/3000years.js index 3e646b3c..25a2fbd0 100644 --- a/commands/avataredit/3000years.js +++ b/commands/avataredit/3000years.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class YearsCommand extends Command { constructor(client) { @@ -26,16 +27,27 @@ module.exports = class YearsCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/eScwGFS.png')); - const [avatar, az] = await Promise.all(images); - avatar.resize(200, 200); - az.composite(avatar, 461, 127); - az.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'az.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(856, 569); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.drawImage(base, 0, 0); + ctx.drawImage(avatar, 461, 127, 200, 200); + }; + const azImg = await request + .get('https://i.imgur.com/eScwGFS.png'); + const avatarImg = await request + .get(avatarURL); + base.src = azImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'az.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/beautiful.js b/commands/avataredit/beautiful.js index 1a4f6f7f..99da1ae6 100644 --- a/commands/avataredit/beautiful.js +++ b/commands/avataredit/beautiful.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class BeautifulCommand extends Command { constructor(client) { @@ -26,17 +27,28 @@ module.exports = class BeautifulCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/71qLwPf.png')); - const [avatar, grunkle] = await Promise.all(images); - avatar.resize(117, 135); - grunkle.composite(avatar, 341, 35); - grunkle.composite(avatar, 342, 301); - grunkle.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'beautiful.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(500, 532); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.drawImage(base, 0, 0); + ctx.drawImage(avatar, 341, 35, 117, 135); + ctx.drawImage(avatar, 342, 301, 117, 135); + }; + const grunkleImg = await request + .get('https://i.imgur.com/71qLwPf.png'); + const avatarImg = await request + .get(avatarURL); + base.src = grunkleImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'grunkle.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/bobross.js b/commands/avataredit/bobross.js index bca0d021..ac3c097a 100644 --- a/commands/avataredit/bobross.js +++ b/commands/avataredit/bobross.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class BobRossCommand extends Command { constructor(client) { @@ -26,19 +27,31 @@ module.exports = class BobRossCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const blank = new Jimp(600, 775, 0xFFFFFFFF); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/7NSiFLd.png')); - const [avatar, bob] = await Promise.all(images); - avatar.rotate(2); - avatar.resize(300, 300); - blank.composite(avatar, 44, 85); - blank.composite(bob, 0, 0); - blank.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'bobross.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(600, 775); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.fillStyle = 'white'; + ctx.fillRect(0, 0, 507, 338); + ctx.rotate(2 * Math.PI / 180); + ctx.drawImage(avatar, 44, 85, 300, 300); + ctx.rotate(-2 * Math.PI / 180); + ctx.drawImage(base, 0, 0); + }; + const rossImg = await request + .get('https://i.imgur.com/7NSiFLd.png'); + const avatarImg = await request + .get(avatarURL); + base.src = rossImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'ross.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/canvas.js b/commands/avataredit/canvas.js deleted file mode 100644 index 5846aefd..00000000 --- a/commands/avataredit/canvas.js +++ /dev/null @@ -1,61 +0,0 @@ -const { Command } = require('discord.js-commando'); -const Canvas = require('canvas'); -const request = require('superagent'); - -module.exports = class CanvasCommand extends Command { - constructor(client) { - super(client, { - name: 'canvas', - group: 'avataredit', - memberName: 'canvas', - description: 'Test for node-canvas', - args: [ - { - key: 'user', - prompt: 'Which user would you like to edit the avatar of?', - type: 'user' - } - ] - }); - } - - hasPermission(msg) { - return this.client.isOwner(msg.author); - } - - async run(msg, args) { - if (msg.channel.type !== 'dm') - if (!msg.channel.permissionsFor(this.client.user).has('ATTACH_FILES')) - return msg.say('This Command requires the `Attach Files` Permission.'); - const { user } = args; - const avatarURL = user.avatarURL('png', 2048); - if (!avatarURL) return msg.say('This user has no avatar.'); - const Image = Canvas.Image; - const canvas = new Canvas(507, 338); - const ctx = canvas.getContext('2d'); - const base = new Image(); - const avatar = new Image(); - const generate = () => { - ctx.drawImage(base, 0, 0); - ctx.drawImage(avatar, 158, 51, 200, 200); - const imgData = ctx.getImageData(158, 51, 200, 200); - const data = imgData.data; - for(let i = 0; i < data.length; i += 4) { - const brightness = 0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2]; - data[i] = brightness; - data[i + 1] = brightness; - data[i + 2] = brightness; - } - ctx.putImageData(imgData, 158, 51); - }; - const ripImg = await request - .get('https://i.imgur.com/Gbu1B2m.png'); - const avatarImg = await request - .get(avatarURL); - base.src = ripImg.body; - avatar.src = avatarImg.body; - generate(); - return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'rip.png' }] }) - .catch(err => msg.say(err)); - } -}; diff --git a/commands/avataredit/greyscale.js b/commands/avataredit/greyscale.js index 354744e7..56a581dc 100644 --- a/commands/avataredit/greyscale.js +++ b/commands/avataredit/greyscale.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class GreyscaleCommand extends Command { constructor(client) { @@ -26,12 +27,31 @@ module.exports = class GreyscaleCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const avatar = await Jimp.read(avatarURL); - avatar.greyscale(); - avatar.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'greyscale.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(500, 500); + const ctx = canvas.getContext('2d'); + const avatar = new Image(); + const generate = () => { + ctx.drawImage(avatar, 0, 0, 500, 500); + const imgData = ctx.getImageData(0, 0, 500, 500); + const data = imgData.data; + for (let i = 0; i < data.length; i += 4) { + const brightness = 0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2]; + data[i] = brightness; + data[i + 1] = brightness; + data[i + 2] = brightness; + } + ctx.putImageData(imgData, 0, 0); + }; + const avatarImg = await request + .get(avatarURL); + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'greyscale.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/invert.js b/commands/avataredit/invert.js index ce2c3a78..ed9bdbaf 100644 --- a/commands/avataredit/invert.js +++ b/commands/avataredit/invert.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class InvertCommand extends Command { constructor(client) { @@ -25,12 +26,30 @@ module.exports = class InvertCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const avatar = await Jimp.read(avatarURL); - avatar.invert(); - avatar.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'invert.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(500, 500); + const ctx = canvas.getContext('2d'); + const avatar = new Image(); + const generate = () => { + ctx.drawImage(avatar, 0, 0, 500, 500); + const imgData = ctx.getImageData(0, 0, 500, 500); + const data = imgData.data; + for (let i = 0; i < data.length; i += 4) { + data[i] = 255 - data[i]; + data[i + 1] = 255 - data[i + 1]; + data[i + 2] = 255 - data[i + 2]; + } + ctx.putImageData(imgData, 0, 0); + }; + const avatarImg = await request + .get(avatarURL); + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'invert.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/rip.js b/commands/avataredit/rip.js index fbf54fb4..e79fb1b8 100644 --- a/commands/avataredit/rip.js +++ b/commands/avataredit/rip.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class RIPCommand extends Command { constructor(client) { @@ -25,18 +26,37 @@ module.exports = class RIPCommand extends Command { return msg.say('This Command requires the `Attach Files` Permission.'); const { user } = args; const avatarURL = user.avatarURL('png', 2048); - if (!avatarURL) return msg.say('This user has no avatar.'); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/KriteWm.jpg')); - const [avatar, grave] = await Promise.all(images); - avatar.greyscale(); - avatar.resize(200, 200); - grave.composite(avatar, 158, 51); - grave.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'rip.png' }] }) + if (!avatarURL) return msg.say('This User has no Avatar.'); + try { + const Image = Canvas.Image; + const canvas = new Canvas(507, 338); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.drawImage(base, 0, 0); + ctx.drawImage(avatar, 158, 51, 200, 200); + const imgData = ctx.getImageData(158, 51, 200, 200); + const data = imgData.data; + for (let i = 0; i < data.length; i += 4) { + const brightness = 0.34 * data[i] + 0.5 * data[i + 1] + 0.16 * data[i + 2]; + data[i] = brightness; + data[i + 1] = brightness; + data[i + 2] = brightness; + } + ctx.putImageData(imgData, 158, 51); + }; + const ripImg = await request + .get('https://i.imgur.com/Gbu1B2m.png'); + const avatarImg = await request + .get(avatarURL); + base.src = ripImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'rip.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/steamcard.js b/commands/avataredit/steamcard.js index 9a3d2c85..c919b344 100644 --- a/commands/avataredit/steamcard.js +++ b/commands/avataredit/steamcard.js @@ -1,5 +1,7 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); +const path = require('path'); module.exports = class SteamCardCommand extends Command { constructor(client) { @@ -27,20 +29,33 @@ module.exports = class SteamCardCommand extends Command { const username = msg.guild ? msg.guild.member(user).displayName : user.username; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const blank = new Jimp(494, 568, 0xFFFFFFFF); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/JF0WwQX.png')); - const [avatar, card] = await Promise.all(images); - const font = await Jimp.loadFont(Jimp.FONT_SANS_32_WHITE); - avatar.resize(450, 450); - blank.composite(avatar, 25, 25); - blank.composite(card, 0, 0); - blank.print(font, 38, 20, username); - blank.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'steamcard.png' }] }) + try { + const Image = Canvas.Image; + Canvas.registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'OpenSans.ttf'), { family: 'Open Sans' }); + const canvas = new Canvas(494, 568); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.font = '32px Open Sans'; + ctx.fillStyle = 'white'; + ctx.fillText(username, 38, 20); + ctx.fillStyle = 'white'; + ctx.fillRect(0, 0, 494, 568); + ctx.drawImage(avatar, 25, 25, 450, 450); + ctx.drawImage(base, 0, 0); + }; + const cardImg = await request + .get('https://i.imgur.com/JF0WwQX.png'); + const avatarImg = await request + .get(avatarURL); + base.src = cardImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'card.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/triggered.js b/commands/avataredit/triggered.js index de493608..077df1ee 100644 --- a/commands/avataredit/triggered.js +++ b/commands/avataredit/triggered.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class TriggeredCommand extends Command { constructor(client) { @@ -25,18 +26,29 @@ module.exports = class TriggeredCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const blank = new Jimp(320, 371, 0xFFFFFFFF); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/tF9yF62.png')); - const [avatar, triggered] = await Promise.all(images); - avatar.resize(320, 320); - blank.composite(avatar, 0, 0); - blank.composite(triggered, 0, 0); - blank.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'triggered.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(320, 371); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.fillStyle = 'white'; + ctx.fillRect(0, 0, 320, 371); + ctx.drawImage(base, 0, 0); + ctx.drawImage(avatar, 0, 0, 320, 320); + }; + const triggeredImg = await request + .get('https://i.imgur.com/tF9yF62.png'); + const avatarImg = await request + .get(avatarURL); + base.src = triggeredImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'triggered.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } }; diff --git a/commands/avataredit/wanted.js b/commands/avataredit/wanted.js index 0fcadf0a..6ef7990e 100644 --- a/commands/avataredit/wanted.js +++ b/commands/avataredit/wanted.js @@ -1,5 +1,6 @@ const { Command } = require('discord.js-commando'); -const Jimp = require('jimp'); +const Canvas = require('canvas'); +const request = require('superagent'); module.exports = class WantedCommand extends Command { constructor(client) { @@ -25,16 +26,27 @@ module.exports = class WantedCommand extends Command { const { user } = args; const avatarURL = user.avatarURL('png', 2048); if (!avatarURL) return msg.say('This user has no avatar.'); - const images = []; - images.push(Jimp.read(avatarURL)); - images.push(Jimp.read('https://i.imgur.com/ca09TG5.jpg')); - const [avatar, wanted] = await Promise.all(images); - avatar.resize(500, 500); - wanted.composite(avatar, 189, 438); - wanted.getBuffer(Jimp.MIME_PNG, (err, buff) => { - if (err) return msg.say(err); - return msg.channel.send({ files: [{ attachment: buff, name: 'wanted.png' }] }) + try { + const Image = Canvas.Image; + const canvas = new Canvas(741, 1000); + const ctx = canvas.getContext('2d'); + const base = new Image(); + const avatar = new Image(); + const generate = () => { + ctx.drawImage(base, 0, 0); + ctx.drawImage(avatar, 149, 360, 430, 430); + }; + const wantedImg = await request + .get('https://i.imgur.com/6bBDfsO.png'); + const avatarImg = await request + .get(avatarURL); + base.src = wantedImg.body; + avatar.src = avatarImg.body; + generate(); + return msg.channel.send({ files: [{ attachment: canvas.toBuffer(), name: 'wanted.png' }] }) .catch(err => msg.say(err)); - }); + } catch (err) { + return msg.say('An Error Occurred while creating the image.'); + } } };