welcomer/leaver

index.js

@@ -24,8 +24,8 @@ module.exports = {
     ConvolutionMatrix: Canvacord.CONVOLUTION_MATRIX,
     Rank: require("./src/Rank"),
     Spotify: require("./src/Spotify"),
-    Welcomer: load("./src/Welcomer"),
-    Leaver: load("./src/Leaver"),
+    Welcomer: require("./src/Welcomer"),
+    Leaver: require("./src/Leaver"),
     CaptchaGen: load("captcha-canvas") ? load("captcha-canvas").CaptchaGenerator : null,
     FortniteShop: load("discord-canvas") ? load("discord-canvas").FortniteShop : null,
     FortniteStats: load("discord-canvas") ? load("discord-canvas").FortniteStats : null,

scripts/postinstall.mjs

@@ -1,3 +1,4 @@
 import { build } from "./assets/build.mjs"
 
-await build(false);
+// make sure to build assets if executed through postinstall script
+await build(true);

src/Assets.js

@@ -1,6 +1,7 @@
 const fs = require("fs");
+const path = require("path");
 
-const ASSETS_DIR = "CANVACORD_ASSETS" in process.env ? process.env.CANVACORD_ASSETS : `${__dirname}/../assets`;
+const ASSETS_DIR = "CANVACORD_ASSETS" in process.env ? process.env.CANVACORD_ASSETS : path.join(__dirname, "..", "assets");
 
 let loaded = false;
 
@@ -17,7 +18,7 @@ function loadAssets(warnIfFailed = true) {
                 const name = d.split(".").shift();
                 (asset === "fonts" ? store.fonts : store.images)[name] = {
                     name,
-                    path: `${ASSETS_DIR}/${asset}/${d}`,
+                    path: path.join(ASSETS_DIR, asset, d),
                     type: asset === "fonts" ? "FONT" : "IMAGE"
                 };
             });

src/Canvacord.js

@@ -375,12 +375,11 @@ class Canvacord {
     static async registerFonts(fontArray = []) {
         if (!fontArray.length) {
             // Canvas.GlobalFonts.loadFontsFromDir(`${Canvacord.assets.ASSETS_DIR}/fonts`)
-            Canvas.GlobalFonts.registerFromPath(Canvacord.assets.font.get("MANROPE_BOLD"), "MANROPE_BOLD");
-            Canvas.GlobalFonts.registerFromPath(Canvacord.assets.font.get("MANROPE_REGULAR"), "MANROPE_REGULAR");
-            Canvas.GlobalFonts.registerFromPath(Canvacord.assets.font.get("WHITNEY_MEDIUM"), "WHITNEY_MEDIUM");
-            Canvas.GlobalFonts.registerFromPath(Canvacord.assets.font.get("WHITNEY_BOOK"), "WHITNEY_BOOK");
-            Canvas.GlobalFonts.registerFromPath(Canvacord.assets.font.get("ROBOTO_LIGHT"), "ROBOTO_LIGHT");
-            Canvas.GlobalFonts.registerFromPath(Canvacord.assets.font.get("ROBOTO_REGULAR"), "ROBOTO_REGULAR");
+            const fonts = Canvacord.assets.font.all();
+
+            for (const font in fonts) {
+                Canvas.GlobalFonts.registerFromPath(fonts[font].path, fonts[font].name);
+            }
         } else {
             fontArray.forEach(font => {
                 Canvas.GlobalFonts.registerFromPath(font.path, font.name || font.face?.family);
@@ -1323,7 +1322,7 @@ class Canvacord {
 
     /**
      * Canvacord assets
-     * @type {CanvacordAssets}
+     * @e {CanvacordAssets}
      * @private
      */
     static get assets() {

src/Leaver.js

@@ -1,4 +1,4 @@
-const { Base } = require("discord-canvas");
+const Base = require("./base/GreetingsCard");
 const Util = require("./Util");
 
 class Leaver extends Base {
@@ -88,7 +88,7 @@ class Leaver extends Base {
      * @returns {Promise<Buffer>}
      */
     async build() {
-        return (await this.toAttachment()).toBuffer();
+        return (await this.toAttachment()).encode("png");
     }
 
 }

src/base/GreetingsCard.js

@@ -4,7 +4,6 @@
 */
 
 const Canvas = require("@napi-rs/canvas");
-const assets = require("../Assets");
 
 const _1pxBase64 = `data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA+f8AAIDpAAB1MAAA6mAAADqYAAAXb5JfxUYAAAATSURBVHjaYvj//z8DAAAA//8DAAj8Av7TpXVhAAAAAElFTkSuQmCC`
 
@@ -150,7 +149,7 @@ module.exports = class Greeting {
 
         // Draw # for discriminator
         ctx.fillStyle = this.colorHashtag;
-        ctx.font = "75px SketchMatch";
+        ctx.font = "75px SKETCHMATCH";
         ctx.fillText("#", canvas.width - 690, canvas.height - 165);
 
         // Draw title

test/index.js

@@ -1,34 +1,3 @@
 const canvacord = require("../index");
 
-const img = "https://cdn.discordapp.com/embed/avatars/0.png";
-const img2 = "https://cdn.discordapp.com/embed/avatars/4.png";
-
-// console.log(canvacord)
-
-canvacord.Canvacord.trigger(img).then(r => canvacord.write(r, "./images/triggered.gif"));
-
-const rank = new canvacord.Rank()
-    .setAvatar(img)
-    .setCurrentXP(50)
-    .setRequiredXP(360)
-    .setStatus("dnd")
-    .setProgressBar("#FFFFFF", "COLOR")
-    .setUsername("Snowflake")
-    .setDiscriminator("0007");
-
-rank.build()
-    .then(data => {
-        canvacord.write(data, "./images/RankCard.png");
-    });
-
-canvacord.Canvas.reply({
-    avatar1: img,
-    avatar2: img2,
-    user1: "Maximus",
-    user2: "Snowflake",
-    hex1: "#ff00ff",
-    hex2: "#7289da",
-    mainText: "kok 😋",
-    replyText: "Pog 😋"
-})
-    .then(img => canvacord.write(img, "./images/reply.png"));
+console.log(canvacord);