diff --git a/build.ts b/build.ts index e55fa27..28e1633 100644 --- a/build.ts +++ b/build.ts @@ -27,4 +27,6 @@ for (const output of result.outputs) { } await mkdir(path.join(outdir, "fonts"), { recursive: true }); -await copyFile("src/assets/fonts/InstrumentSerif-Regular.ttf", path.join(outdir, "fonts/InstrumentSerif-Regular.ttf")); +for (const file of ["InstrumentSerif-Regular.ttf", "NotoSans-Regular.ttf", "NotoSans-Medium.ttf", "NotoSans-SemiBold.ttf"]) { + await copyFile(`src/assets/fonts/${file}`, path.join(outdir, "fonts", file)); +} diff --git a/docs/PRODUCTION.md b/docs/PRODUCTION.md index a8355c9..21b2532 100644 --- a/docs/PRODUCTION.md +++ b/docs/PRODUCTION.md @@ -36,8 +36,10 @@ The registered Discord callback is four habits, history, reminders, and live Discord state. The transfer hash and counts are recorded in `/opt/minabot/migration-manifest.json`. Local development was stopped before the snapshot so only production manages the existing live cards. -Do not restart development with the same bot/message state; use stubbed previews -or an isolated database and bot configuration. +Development now blocks channel writes at both snapshot-send and live-card entry +points. It also skips copied live-card recovery and change scheduling. Preview and +download remain available. Stubbed tests inject their own transport/configuration; +real writes through the environment loader are enabled only in production. Daily verified snapshots and pre-migration snapshots are stored under `/srv/minabot/data/backups`, retaining seven snapshots. The restore rehearsal diff --git a/src/assets/fonts/InstrumentSerif-OFL.txt b/src/assets/fonts/InstrumentSerif-OFL.txt new file mode 100644 index 0000000..669ce79 --- /dev/null +++ b/src/assets/fonts/InstrumentSerif-OFL.txt @@ -0,0 +1,93 @@ +Copyright 2022 The Instrument Serif Project Authors (https://github.com/Instrument/instrument-serif) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/assets/fonts/NotoSans-LICENSE.txt b/src/assets/fonts/NotoSans-LICENSE.txt new file mode 100644 index 0000000..c82d72e --- /dev/null +++ b/src/assets/fonts/NotoSans-LICENSE.txt @@ -0,0 +1,94 @@ +Copyright 2018 The Noto Project Authors (github.com/googlei18n/noto-fonts) + +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/src/assets/fonts/NotoSans-Medium.ttf b/src/assets/fonts/NotoSans-Medium.ttf new file mode 100644 index 0000000..e392104 Binary files /dev/null and b/src/assets/fonts/NotoSans-Medium.ttf differ diff --git a/src/assets/fonts/NotoSans-Regular.ttf b/src/assets/fonts/NotoSans-Regular.ttf new file mode 100644 index 0000000..d552209 Binary files /dev/null and b/src/assets/fonts/NotoSans-Regular.ttf differ diff --git a/src/assets/fonts/NotoSans-SemiBold.ttf b/src/assets/fonts/NotoSans-SemiBold.ttf new file mode 100644 index 0000000..b30aee4 Binary files /dev/null and b/src/assets/fonts/NotoSans-SemiBold.ttf differ diff --git a/src/assets/fonts/README.md b/src/assets/fonts/README.md new file mode 100644 index 0000000..b1890d9 --- /dev/null +++ b/src/assets/fonts/README.md @@ -0,0 +1,14 @@ +# Bundled share-card fonts + +Instrument Serif Regular/Italic: downloaded from the +[Google Fonts source](https://github.com/google/fonts/tree/main/ofl/instrumentserif). +License: `InstrumentSerif-OFL.txt` (also retained in the original `OFL.txt`). + +Noto Sans Regular (400), Medium (500), and SemiBold (600): downloaded from the +[Noto source](https://github.com/notofonts/noto-fonts/tree/main/hinted/ttf/NotoSans). +License: `NotoSans-LICENSE.txt`. + +Downloaded September 7, 2026. The files are versioned in this repository and copied +into the production image. Browser and native canvas renderers use the alias +`Mina Sans`; no system sans-serif font is selected for card text. The native font +loader fails startup if a required font cannot be registered. diff --git a/src/lib/progress-card.ts b/src/lib/progress-card.ts index b490c62..282e851 100644 --- a/src/lib/progress-card.ts +++ b/src/lib/progress-card.ts @@ -35,7 +35,7 @@ async function loadAvatar(url: string): Promise { /** Compact summary: fixed typography stays readable when Discord scales the attachment. */ export async function renderProgressCard(data: ShareData, user: PublicUser, privacy: CardPrivacy, theme: Theme = "light"): Promise<{ blob: Blob; alt: string; avatarMissing: boolean }> { - await document.fonts.load('64px "Instrument Serif"'); + await Promise.all(['400 64px "Instrument Serif"', '400 32px "Mina Sans"', '500 32px "Mina Sans"', '600 32px "Mina Sans"'].map(font => document.fonts.load(font))); const avatar = privacy.avatar && user.avatarUrl ? await loadAvatar(user.avatarUrl) : null; const canvas = document.createElement("canvas"); const shortRange = dayNumber(data.to) - dayNumber(data.from) < 84; @@ -52,7 +52,7 @@ export async function renderProgressCard(data: ShareData, user: PublicUser, priv ctx.scale(1.25, 1.25); const { ink, muted, paper, empty, rule, avatar: avatarBackground, dot } = themePalette[theme]; const green = "#285d49"; - const sans = '-apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif'; + const sans = '"Mina Sans"'; const text = (value: string, x: number, y: number, size = 32, color: string = ink, weight = "400", maxWidth = 864, align: CanvasTextAlign = "left", serif = false) => { ctx.font = `${weight} ${size}px ${serif ? '"Instrument Serif", Georgia, serif' : sans}`; ctx.fillStyle = color; ctx.textAlign = align; diff --git a/src/sharing/live-card-image.ts b/src/sharing/live-card-image.ts index 3fc8d09..e3535bd 100644 --- a/src/sharing/live-card-image.ts +++ b/src/sharing/live-card-image.ts @@ -10,9 +10,18 @@ import { cardDate } from "../lib/progress-card"; import { calendarTimeline } from "../components/design-system/calendar-model"; import { themedHabitShade } from "../lib/habit-palette"; -const sourceFont = new URL('../assets/fonts/InstrumentSerif-Regular.ttf', import.meta.url); -const builtFont = new URL('./fonts/InstrumentSerif-Regular.ttf', import.meta.url); -GlobalFonts.registerFromPath((existsSync(sourceFont) ? sourceFont : builtFont).pathname, 'Instrument Serif'); +for (const [file, family] of [ + ['InstrumentSerif-Regular.ttf', 'Instrument Serif'], + ['NotoSans-Regular.ttf', 'Mina Sans'], + ['NotoSans-Medium.ttf', 'Mina Sans'], + ['NotoSans-SemiBold.ttf', 'Mina Sans'], +]) { + const sourceFont = new URL(`../assets/fonts/${file}`, import.meta.url); + const builtFont = new URL(`./fonts/${file}`, import.meta.url); + if (!GlobalFonts.registerFromPath((existsSync(sourceFont) ? sourceFont : builtFont).pathname, family)) { + throw new Error(`Could not load bundled font: ${file}`); + } +} export function liveCardData(db: AppDatabase, userId: string, now: number) { const user = db.select().from(users).where(eq(users.id, userId)).get(); @@ -54,7 +63,7 @@ export async function renderLiveCard(data: LiveImageData, theme: Theme) { ctx.fillStyle = color; ctx.beginPath(); ctx.roundRect(x, y, Math.max(0, w), Math.max(0, h), radius); ctx.fill(); }; const text = (value: string, x: number, y: number, size: number, width: number, color: string = colors.ink, serif = false, weight = '400') => { - ctx.font = `${weight} ${size}px ${serif ? '"Instrument Serif"' : 'sans-serif'}`; ctx.fillStyle = color; + ctx.font = `${weight} ${size}px ${serif ? '"Instrument Serif"' : '"Mina Sans"'}`; ctx.fillStyle = color; const chars = Array.from(value); let fitted = value; while (chars.length && ctx.measureText(fitted).width > width) { chars.pop(); fitted = chars.join('') + '…'; } ctx.fillText(fitted, x, y); diff --git a/src/sharing/live-discord.ts b/src/sharing/live-discord.ts index 56e7bf0..0439005 100644 --- a/src/sharing/live-discord.ts +++ b/src/sharing/live-discord.ts @@ -65,7 +65,7 @@ export function createLiveDiscord(db: AppDatabase, auth: ReturnType