Transfer to @napi-rs/canvas again (this time w/ line breaks)

README.md

@@ -93,21 +93,20 @@ things, I'm not taking any chances.
 5. Create a file named `.env` and fill it out as shown in above and in `.env.example`.
 6. Run `apt update` and `apt upgrade` to install the latest dependencies of your distro.
 7. Run `apt install ffmpeg` to install ffmpeg.
-8. [Follow these instructions to install the dependencies for `node-canvas`](https://github.com/Automattic/node-canvas/wiki/Installation%3A-Ubuntu-and-other-Debian-based-systems).
+8. Run `apt install liblqr-1-0-dev liblqr-1-0` to install liblqr (needed for ImageMagick).
-9. Run `apt install liblqr-1-0-dev liblqr-1-0` to install liblqr (needed for ImageMagick).
+9. [Follow these instructions to install ImageMagick](https://www.tecmint.com/install-imagemagick-on-debian-ubuntu/).
-10. [Follow these instructions to install ImageMagick](https://www.tecmint.com/install-imagemagick-on-debian-ubuntu/).
+10. [Follow these instructions to set up Redis](https://www.digitalocean.com/community/tutorials/how-to-install-and-secure-redis-on-ubuntu-18-04). Remember to set up a password!
-11. [Follow these instructions to set up Redis](https://www.digitalocean.com/community/tutorials/how-to-install-and-secure-redis-on-ubuntu-18-04). Remember to set up a password!
+11. Run `apt install libtool` so sodium can compile if necessary. **(Optional)**
-12. Run `apt install libtool` so sodium can compile if necessary. **(Optional)**
+12. Download [the NSFW model](https://github.com/gantman/nsfw_model) and extract the contents to `<xiao folder>/tf_models/nsfw`.
-13. Download [the NSFW model](https://github.com/gantman/nsfw_model) and extract the contents to `<xiao folder>/tf_models/nsfw`.
+13. Download DECTalk and extract `dectalk.dll`, `dtalk_us.dic`, `MSVCRTd.DLL`, and `say.exe` to `dectalk/`. I cannot help you find this.
-14. Download DECTalk and extract `dectalk.dll`, `dtalk_us.dic`, `MSVCRTd.DLL`, and `say.exe` to `dectalk/`. I cannot help you find this.
+14. Run `apt install wine` to install wine.
-15. Run `apt install wine` to install wine.
+15. Run `dpkg --add-architecture i386` to allow installation of wine32.
-16. Run `dpkg --add-architecture i386` to allow installation of wine32.
+16. Run `apt update` again.
-17. Run `apt update` again.
+17. Run `apt install wine32` to install wine32.
-18. Run `apt install wine32` to install wine32.
+18. Run `apt install xvfb` to install xvfb.
-19. Run `apt install xvfb` to install xvfb.
+19. Run `yarn install --production` in the folder you cloned the bot.
-20. Run `yarn install --production` in the folder you cloned the bot.
+20. Run `npx parse-domain-update` to update the domain list for `parse-domain`.
-21. Run `npx parse-domain-update` to update the domain list for `parse-domain`.
+21. Start Xiao up!
-22. Start Xiao up!
 
 ## Commands
 Total: 510
@@ -684,12 +683,12 @@ Total: 510
 * [@discordjs/opus](https://www.npmjs.com/package/@discordjs/opus)
 * [@discordjs/voice](https://www.npmjs.com/package/@discordjs/voice)
 * [@mediapipe/face_detection](https://www.npmjs.com/package/@mediapipe/face_detection)
+* [@napi-rs/canvas](https://www.npmjs.com/package/@napi-rs/canvas)
 * [@tensorflow-models/face-detection](https://www.npmjs.com/package/@tensorflow-models/face-detection)
 * [@tensorflow/tfjs-node](https://www.npmjs.com/package/@tensorflow/tfjs-node)
 * [@twemoji/parser](https://www.npmjs.com/package/@twemoji/parser)
 * [bombsweeper.js](https://www.npmjs.com/package/bombsweeper.js)
 * [bufferutil](https://www.npmjs.com/package/bufferutil)
-* [canvas](https://www.npmjs.com/package/canvas)
 * [cheerio](https://www.npmjs.com/package/cheerio)
 * [city-timezones](https://www.npmjs.com/package/city-timezones)
 * [cloc](https://www.npmjs.com/package/cloc)

commands/analyze/aspect-ratio.js

@@ -1,5 +1,5 @@
 const Command = require('../../framework/Command');
-const { loadImage } = require('canvas');
+const { loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { gcd } = require('../../util/Util');
 

commands/analyze/dominant-color.js

@@ -1,5 +1,5 @@
 const Command = require('../../framework/Command');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const ntc = require('ntcjs');
 const { rgbToHex } = require('../../util/Util');

commands/analyze/faces.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const request = require('node-superfetch');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 
 module.exports = class FacesCommand extends Command {
 	constructor(client) {

commands/analyze/image-size.js

@@ -1,5 +1,5 @@
 const Command = require('../../framework/Command');
-const { loadImage } = require('canvas');
+const { loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class ImageSizeCommand extends Command {

commands/edit-avatar/avatar-fusion.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class AvatarFusionCommand extends Command {

commands/edit-avatar/eject.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const GIFEncoder = require('gifencoder');
 const { MersenneTwister19937, bool } = require('random-js');
 const request = require('node-superfetch');

commands/edit-avatar/hat.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const hats = require('../../assets/json/hat');

commands/edit-avatar/he-lives-in-you.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { drawImageWithTint } = require('../../util/Canvas');

commands/edit-avatar/hearts.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { drawImageWithTint } = require('../../util/Canvas');

commands/edit-avatar/i-have-the-power.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-avatar/rip.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { greyscale } = require('../../util/Canvas');

commands/edit-avatar/steam-now-playing.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { shortenText } = require('../../util/Canvas');

commands/edit-avatar/triggered.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const GIFEncoder = require('gifencoder');
 const request = require('node-superfetch');
 const path = require('path');

commands/edit-face/anime-eyes.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const request = require('node-superfetch');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class AnimeEyesCommand extends Command {

commands/edit-face/danny-devito.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const request = require('node-superfetch');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class DannyDevitoCommand extends Command {

commands/edit-face/emoji-face.js

@@ -1,7 +1,7 @@
 const Command = require('../../framework/Command');
 const { GuildEmoji } = require('discord.js');
 const request = require('node-superfetch');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const twemoji = require('@twemoji/parser');
 
 module.exports = class EmojiFaceCommand extends Command {

commands/edit-face/eyes.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const request = require('node-superfetch');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class EyesCommand extends Command {

commands/edit-face/shrek.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const request = require('node-superfetch');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class ShrekCommand extends Command {

commands/edit-image-text/ace-attorney.js

@@ -1,9 +1,9 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { firstUpperCase } = require('../../util/Util');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 const characters = {
 	phoenix: ['phoenix', 'wright', 'naruhodo', 'ryuuichi', 'ryu', 'nick'],
 	edgeworth: ['miles', 'edgeworth', 'mitsurugi', 'reiji', 'edgey'],
@@ -82,7 +82,7 @@ module.exports = class AceAttorneyCommand extends Command {
 		ctx.fillText(firstUpperCase(character), 6, 176);
 		let text = wrapText(ctx, quote, 242);
 		text = text.length > 5 ? `${text.slice(0, 5).join('\n')}...` : text.join('\n');
-		ctx.fillText(text, 7, 199);
+		fillTextWithBreaks(ctx, text, 7, 199);
 		return msg.say({ files: [{ attachment: canvas.toBuffer(), name: `ace-attorney-${character}.png` }] });
 	}
 };

commands/edit-image-text/achievement.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { shortenText } = require('../../util/Canvas');
 

commands/edit-image-text/axis-cult-sign-up.js

@@ -1,7 +1,8 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
+const { fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class AxisCultSignUpCommand extends Command {
 	constructor(client) {
@@ -69,7 +70,7 @@ module.exports = class AxisCultSignUpCommand extends Command {
 		ctx.fillText(profession, 960, 2169);
 		ctx.fillText('Xiao', 960, 2370);
 		ctx.font = this.client.fonts.get('Konosuba.ttf').toCanvasString(123);
-		ctx.fillText('ERIS PADS\nHER CHEST!', 1037, 2874);
+		fillTextWithBreaks(ctx, 'ERIS PADS\nHER CHEST!', 1037, 2874);
 		return msg.say({ files: [{ attachment: canvas.toBuffer('image/jpeg'), name: 'axis-cult-sign-up.jpg' }] });
 	}
 };

commands/edit-image-text/caution.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image-text/certificate.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const moment = require('moment');
 const path = require('path');
 

commands/edit-image-text/chinese-restaurant.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image-text/danger.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image-text/font.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
-const { createCanvas } = require('canvas');
+const { createCanvas } = require('@napi-rs/canvas');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class FontCommand extends Command {
 	constructor(client) {
@@ -46,7 +46,7 @@ module.exports = class FontCommand extends Command {
 		ctx.fillStyle = 'white';
 		ctx.fillRect(0, 0, canvas.width, canvas.height);
 		ctx.fillStyle = 'black';
-		ctx.fillText(lines.join('\n'), 25, 25);
+		fillTextWithBreaks(ctx, lines.join('\n'), 25, 25);
 		return canvas.toBuffer();
 	}
 };

commands/edit-image-text/gandhi-quote.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image-text/highway-sign.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image-text/hollywood-star.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class HollywoodStarCommand extends Command {

commands/edit-image-text/jeopardy-question.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas } = require('canvas');
+const { createCanvas } = require('@napi-rs/canvas');
 const { wrapText } = require('../../util/Canvas');
 
 module.exports = class JeopardyQuestionCommand extends Command {

commands/edit-image-text/license-plate.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class LicensePlateCommand extends Command {

commands/edit-image-text/speed-limit.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class SpeedLimitCommand extends Command {

commands/edit-image-text/spongebob-time-card.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image-text/tweet.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const { TwitterOpenApi } = require('twitter-openapi-typescript');
 const emojiRegex = require('emoji-regex');
 const twemoji = require('@twemoji/parser');
@@ -10,7 +10,7 @@ const request = require('node-superfetch');
 const { readFile } = require('fs/promises');
 const path = require('path');
 const { formatNumberK, randomRange } = require('../../util/Util');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class TweetCommand extends Command {
 	constructor(client) {
@@ -224,7 +224,7 @@ module.exports = class TweetCommand extends Command {
 		const wrapped = wrapText(ctx, text, maxLineLen, true);
 		const emoji = text.match(emojiRegex());
 		if (!emoji) {
-			ctx.fillText(wrapped.join('\n'), x, y);
+			fillTextWithBreaks(ctx, wrapped.join('\n'), x, y);
 			this.fillHashtags(ctx, wrapped, x, y, emojiSize);
 			return ctx;
 		}

commands/edit-image-text/undertale.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 const characters = require('../../assets/json/undertale');

commands/edit-image-text/zero-dialogue.js

@@ -1,8 +1,8 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class ZeroDialogueCommand extends Command {
 	constructor(client) {
@@ -63,7 +63,7 @@ module.exports = class ZeroDialogueCommand extends Command {
 		ctx.textBaseline = 'top';
 		let text = wrapText(ctx, quote, 425);
 		text = text.length > 2 ? `${text.slice(0, 2).join('\n')}...` : text.join('\n');
-		ctx.fillText(text, 8, 8);
+		fillTextWithBreaks(ctx, text, 8, 8);
 		return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'zero-dialogue.png' }] });
 	}
 };

commands/edit-image/analog-clock.js

@@ -1,5 +1,5 @@
 const Command = require('../../framework/Command');
-const { createCanvas } = require('canvas');
+const { createCanvas } = require('@napi-rs/canvas');
 const moment = require('moment-timezone');
 const { firstUpperCase } = require('../../util/Util');
 

commands/edit-image/approved.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImage } = require('../../util/Canvas');

commands/edit-image/ascii.js

@@ -1,5 +1,5 @@
 const Command = require('../../framework/Command');
-const { loadImage } = require('canvas');
+const { loadImage } = require('@napi-rs/canvas');
 const imageToAscii = require('image-to-ascii');
 const request = require('node-superfetch');
 

commands/edit-image/blur.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const stackBlur = require('stackblur-canvas');
 

commands/edit-image/bob-ross.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImagePart } = require('../../util/Canvas');

commands/edit-image/brazzers.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/chocolate-milk.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/circle.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class CircleCommand extends Command {

commands/edit-image/color.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas } = require('canvas');
+const { createCanvas } = require('@napi-rs/canvas');
 const ntc = require('ntcjs');
 
 module.exports = class ColorCommand extends Command {

commands/edit-image/communist.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImage, drawImageWithTint } = require('../../util/Canvas');

commands/edit-image/contrast.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { contrast } = require('../../util/Canvas');
 

commands/edit-image/convert-image.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const formats = {
 	jpg: 'image/jpeg',

commands/edit-image/crop-to-content.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { cropToContent } = require('../../util/Canvas');
 

commands/edit-image/desaturate.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { desaturate } = require('../../util/Canvas');
 

commands/edit-image/dexter.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImagePart } = require('../../util/Canvas');

commands/edit-image/distort.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { distort } = require('../../util/Canvas');
 

commands/edit-image/fire-frame.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { drawImageWithTint } = require('../../util/Canvas');

commands/edit-image/fish-eye.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { fishEye } = require('../../util/Canvas');
 

commands/edit-image/frame.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImagePart } = require('../../util/Canvas');

commands/edit-image/ghost.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class GhostCommand extends Command {

commands/edit-image/glass-shatter.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/glitch.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { distort } = require('../../util/Canvas');
 

commands/edit-image/greyscale.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { greyscale } = require('../../util/Canvas');
 

commands/edit-image/gun.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/hands.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/ifunny.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/invert.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { invert } = require('../../util/Canvas');
 

commands/edit-image/lego-icon.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/mirror.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const types = ['x', 'y', 'both'];
 

commands/edit-image/motion-blur.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { motionBlur } = require('../../util/Canvas');
 

commands/edit-image/needs-more-jpeg.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class NeedsMoreJpegCommand extends Command {

commands/edit-image/pet.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const GIFEncoder = require('gifencoder');
 const request = require('node-superfetch');
 const path = require('path');

commands/edit-image/pixelize.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { pixelize } = require('../../util/Canvas');
 

commands/edit-image/police-tape.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImage } = require('../../util/Canvas');

commands/edit-image/rainbow.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/rejected.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImage } = require('../../util/Canvas');

commands/edit-image/resize.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class ResizeCommand extends Command {

commands/edit-image/rotate.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class RotateCommand extends Command {

commands/edit-image/sepia.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { sepia } = require('../../util/Canvas');
 

commands/edit-image/shake.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const GIFEncoder = require('gifencoder');
 const request = require('node-superfetch');
 

commands/edit-image/silhouette.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { silhouette } = require('../../util/Canvas');
 

commands/edit-image/sip.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/snapchat.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class SnapchatCommand extends Command {

commands/edit-image/spotify-now-playing.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/square.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 
 module.exports = class SquareCommand extends Command {

commands/edit-image/steam-card.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-image/subtitle.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-image/tint.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { drawImageWithTint } = require('../../util/Canvas');
 

commands/edit-image/vignette.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const { vignette } = require('../../util/Canvas');
 

commands/edit-image/wanted.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { sepia, centerImagePart } = require('../../util/Canvas');

commands/edit-image/wild-pokemon.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImagePart, greyscale, pixelize } = require('../../util/Canvas');

commands/edit-image/you-died.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImage, greyscale, drawImageWithTint } = require('../../util/Canvas');

commands/edit-meme/3000-years.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImagePart } = require('../../util/Canvas');

commands/edit-meme/alert.js

@@ -1,8 +1,8 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class AlertCommand extends Command {
 	constructor(client) {
@@ -51,7 +51,7 @@ module.exports = class AlertCommand extends Command {
 		ctx.textBaseline = 'top';
 		let text = wrapText(ctx, message, 540);
 		text = text.length > 3 ? `${text.slice(0, 3).join('\n')}...` : text.join('\n');
-		ctx.fillText(text, 48, 178);
+		fillTextWithBreaks(ctx, text, 48, 178);
 		return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'alert.png' }] });
 	}
 };

commands/edit-meme/bart-chalkboard.js

@@ -1,8 +1,8 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
-const { shortenText } = require('../../util/Canvas');
+const { shortenText, fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class LisaPresentationCommand extends Command {
 	constructor(client) {
@@ -52,7 +52,7 @@ module.exports = class LisaPresentationCommand extends Command {
 		const shortened = shortenText(ctx, text.toUpperCase(), 500);
 		const arr = [];
 		for (let i = 0; i < 12; i++) arr.push(shortened);
-		ctx.fillText(arr.join('\n'), 30, 27);
+		fillTextWithBreaks(ctx, arr.join('\n'), 30, 27);
 		return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'bart-chalkboard.png' }] });
 	}
 };

commands/edit-meme/be-like-bill.js

@@ -1,8 +1,8 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 const texts = require('../../assets/json/be-like-bill');
 
 module.exports = class BeLikeBillCommand extends Command {
@@ -50,7 +50,7 @@ module.exports = class BeLikeBillCommand extends Command {
 		ctx.drawImage(base, 0, 0);
 		ctx.font = this.client.fonts.get('arialbd.ttf').toCanvasString(23);
 		const text = wrapText(ctx, texts[Math.floor(Math.random() * texts.length)].replaceAll('{{name}}', name), 569);
-		ctx.fillText(`This is ${name}.\n\n${text.join('\n')}\n\n${name} is smart.\nBe like ${name}.`, 31, 80);
+		fillTextWithBreaks(ctx, `This is ${name}.\n\n${text.join('\n')}\n\n${name} is smart.\nBe like ${name}.`, 31, 80);
 		return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'be-like-bill.png' }] });
 	}
 };

commands/edit-meme/beautiful.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 

commands/edit-meme/boardroom-meeting.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 
 module.exports = class BoardroomMeetingCommand extends Command {

commands/edit-meme/catch.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { delay } = require('../../util/Util');
 

commands/edit-meme/challenger.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { silhouette, hasAlpha, centerImagePart } = require('../../util/Canvas');

commands/edit-meme/change-my-mind.js

@@ -1,8 +1,8 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
-const { wrapText } = require('../../util/Canvas');
+const { wrapText, fillTextWithBreaks } = require('../../util/Canvas');
 
 module.exports = class ChangeMyMindCommand extends Command {
 	constructor(client) {
@@ -55,7 +55,7 @@ module.exports = class ChangeMyMindCommand extends Command {
 			ctx.font = this.client.fonts.get('Noto-Regular.ttf').toCanvasString(fontSize);
 		}
 		const lines = wrapText(ctx, text, 337);
-		ctx.fillText(lines.join('\n'), 142, 430, 337);
+		fillTextWithBreaks(ctx, lines.join('\n'), 142, 430, 337);
 		ctx.rotate(24 * (Math.PI / 180));
 		return msg.say({ files: [{ attachment: canvas.toBuffer(), name: 'change-my-mind.png' }] });
 	}

commands/edit-meme/chi-idea.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const path = require('path');
 const { wrapText } = require('../../util/Canvas');
 

commands/edit-meme/crush.js

@@ -1,6 +1,6 @@
 const Command = require('../../framework/Command');
 const { PermissionFlagsBits } = require('discord.js');
-const { createCanvas, loadImage } = require('canvas');
+const { createCanvas, loadImage } = require('@napi-rs/canvas');
 const request = require('node-superfetch');
 const path = require('path');
 const { centerImagePart } = require('../../util/Canvas');