Skip to content

A fully open source & end-to-end encrypted note taking alternative to Evernote.

Use Inter font instead of OpenSans in monograph OG image generation

copilot-swe-agent[bot]6f3fc8db3ded
diff --git a/apps/monograph/app/utils/generate-og-image.server.ts b/apps/monograph/app/utils/generate-og-image.server.ts
index ac514ef0c..92e0e1725 100644
--- a/apps/monograph/app/utils/generate-og-image.server.ts
+++ b/apps/monograph/app/utils/generate-og-image.server.ts
@@ -36,27 +36,27 @@ const fontMap = JSON.parse(
);
// Register fonts
-const OpenSans = path.join(
+const Inter = path.join(
__dirname,
import.meta.env.DEV ? "../assets/fonts/" : "../../assets/fonts/",
- "OpenSans-Regular.ttf"
+ "Inter-Regular.ttf"
);
-const OpenSansBold = path.join(
+const InterBold = path.join(
__dirname,
import.meta.env.DEV ? "../assets/fonts/" : "../../assets/fonts/",
- "OpenSans-SemiBold.ttf"
+ "Inter-SemiBold.ttf"
);
-console.log("OpenSans", GlobalFonts.registerFromPath(OpenSans, "OpenSans"));
+console.log("Inter", GlobalFonts.registerFromPath(Inter, "Inter"));
console.log(
"registering",
- "OpenSansBold",
- GlobalFonts.registerFromPath(OpenSansBold, "OpenSansBold")
+ "InterBold",
+ GlobalFonts.registerFromPath(InterBold, "InterBold")
);
const fontFamilies = {
- regular: ["OpenSans"],
- bold: ["OpenSansBold"]
+ regular: ["Inter"],
+ bold: ["InterBold"]
};
for (const font of fontMap) {
const id = (font.name + font.weight).replace(/ /g, "");
@@ -115,11 +115,11 @@ export async function makeImage(metadata: OGMetadata, cacheKey: string) {
// Draw bottom text
ctx.fillStyle = theme.primary.heading;
- ctx.font = "600 32px OpenSansBold";
+ ctx.font = "600 32px InterBold";
ctx.fillText("Notesnook Monograph", PADDING + 95, HEIGHT - PADDING - 55);
ctx.fillStyle = theme.secondary.paragraph;
- ctx.font = "25px OpenSans";
+ ctx.font = "25px Inter";
ctx.fillText(
"Anonymous, secure, and encrypted note sharing with password protection.",
PADDING + 95,
@@ -128,7 +128,7 @@ export async function makeImage(metadata: OGMetadata, cacheKey: string) {
// Draw date
ctx.fillStyle = theme.secondary.paragraph;
- ctx.font = "25px OpenSans";
+ ctx.font = "25px Inter";
ctx.fillText(metadata.date, PADDING, PADDING + 25);
// Draw title
diff --git a/apps/monograph/scripts/font-loader.mjs b/apps/monograph/scripts/font-loader.mjs
index 2d7b29605..10882f1c4 100644
--- a/apps/monograph/scripts/font-loader.mjs
+++ b/apps/monograph/scripts/font-loader.mjs
@@ -21,11 +21,6 @@ import { createWriteStream, existsSync, writeFileSync } from "fs";
import { constructURL } from "google-fonts-helper";
import { Writable } from "stream";
import { mkdir } from "fs/promises";
-import path from "path";
-import { fileURLToPath } from "url";
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = path.dirname(__filename);
const FONTS = [
{ locale: "ja-JP", slug: "Noto+Sans+JP", name: "Noto Sans JP" },
@@ -55,22 +50,6 @@ const FONTS = [
// { locale: "math", slug: "Noto+Sans+Math", name: "Noto Sans Math" }
];
-const OPEN_SANS_FONTS = [
- { weight: 400, filename: "OpenSans-Regular.ttf" },
- { weight: 600, filename: "OpenSans-SemiBold.ttf" }
-];
-
-async function downloadFont(url, destPath) {
- const fileStream = Writable.toWeb(
- createWriteStream(destPath, {
- autoClose: true,
- emitClose: true,
- flush: true
- })
- );
- await (await fetch(url)).body.pipeTo(fileStream);
-}
-
async function loadFonts(dir) {
const families = {};
for (const font of FONTS) {
@@ -114,70 +93,28 @@ async function loadFonts(dir) {
if (!font) continue;
const fileName = `${font.slug}+${face.weight}.ttf`;
- const filePath = `fonts/${fileName}`;
- if (existsSync(filePath)) continue;
-
- await downloadFont(face.src, filePath);
+ const path = `fonts/${fileName}`;
+ if (existsSync(path)) continue;
+
+ const fileStream = Writable.toWeb(
+ createWriteStream(path, {
+ autoClose: true,
+ emitClose: true,
+ flush: true
+ })
+ );
+ await (await fetch(face.src)).body.pipeTo(fileStream);
fontMap.push({
name: font.name,
locale: font.locale,
weight: face.weight,
- path: filePath
+ path
});
}
writeFileSync("fonts/fonts.json", JSON.stringify(fontMap, null, 2));
- // Download OpenSans fonts into app/assets/fonts/
- const assetsFontsDir = path.join(__dirname, "../app/assets/fonts");
- await mkdir(assetsFontsDir, { recursive: true });
-
- const openSansCss = await (
- await fetch(
- constructURL({ families: { "Open Sans": [400, 600] } }),
- {
- headers: {
- // Make sure it returns TTF.
- "User-Agent":
- "Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_8; de-at) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/5.0.5 Safari/533.21.1"
- }
- }
- )
- ).text();
-
- const openSansFaces = openSansCss
- .split("@font-face")
- .filter(Boolean)
- .map((fontFace) => {
- const src = fontFace.match(
- /src: url\((.+)\) format\('(opentype|truetype)'\)/
- );
- const weight = fontFace.match(/font-weight: (\d+)/);
- if (!src || !weight) return null;
- return { src: src[1], weight: weight[1] };
- })
- .filter(Boolean);
-
- for (const openSansFont of OPEN_SANS_FONTS) {
- const face = openSansFaces.find(
- (f) => f.weight === String(openSansFont.weight)
- );
- if (!face) {
- console.log(
- `Could not find OpenSans font face for weight ${openSansFont.weight}. The Google Fonts API response may have changed format or a network error occurred.`
- );
- continue;
- }
- const destPath = path.join(assetsFontsDir, openSansFont.filename);
- if (existsSync(destPath)) {
- console.log(`OpenSans ${openSansFont.weight} already exists, skipping`);
- continue;
- }
- console.log(`Downloading OpenSans ${openSansFont.weight}`);
- await downloadFont(face.src, destPath);
- }
-
console.log("Done");
}