fix: font wont load on certain os

shittybot · Apr 19, 2024 · e9f8d93 · e9f8d93
1 parent 07e5c14
commit e9f8d93
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "songcard",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": "src/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

diff --git a/src/themes/classicCard.js b/src/themes/classicCard.js
@@ -1,5 +1,6 @@
 const { createCanvas, loadImage } = require("canvas");
 const Jimp = require("jimp");
+const path = require("path");
 
 async function classicCard({
   imageBg,
@@ -8,6 +9,10 @@ async function classicCard({
   trackDuration,
   trackTotalDuration,
 }) {
+  const Canvas = require("canvas");
+  const fontPath = path.join(__dirname, '..', 'fonts', 'NotoSans-Regular.ttf');
+  Canvas.registerFont(fontPath, { family: "Noto Sans" });
+
   const prettyMilliseconds = (await import("pretty-ms")).default;
   const canvasWidth = 1200;
   const canvasHeight = 400;

diff --git a/src/themes/simpleCard.js b/src/themes/simpleCard.js
@@ -1,10 +1,11 @@
 const { createCanvas, loadImage } = require("canvas");
 const Jimp = require("jimp");
-const { resolve } = require("path");
+const path = require("path");
 
 async function simpleCard({ imageBg, imageText }) {
   const Canvas = require("canvas");
-  Canvas.registerFont(resolve("./src/fonts/NotoSans-Regular.ttf"), { family: "Noto Sans" })
+  const fontPath = path.join(__dirname, '..', 'fonts', 'NotoSans-Regular.ttf');
+  Canvas.registerFont(fontPath, { family: "Noto Sans" });
 
   const canvasWidth = 600;
   const canvasHeight = 600;