melosh/mal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: format theme and timezone

Browse Source
This commit is contained in:
mkelvers
2026-05-28 11:27:43 +02:00
committed by Milas Holsting
parent 6a5cf4f375
commit ecd11f70c3
2 changed files with 39 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
static/theme.ts
View File

@@ -1,6 +1,6 @@
type Theme = 'light' | 'dark'; type Theme = "light" | "dark";
const STORAGE_KEY = 'theme'; const STORAGE_KEY = "theme";
const getLocalStorage = (): Storage | null => { const getLocalStorage = (): Storage | null => {
try { try {
@@ -11,12 +11,12 @@ const getLocalStorage = (): Storage | null => {
}; };
const getPreferredTheme = (): Theme => { const getPreferredTheme = (): Theme => {
const prefersDark = window.matchMedia?.('(prefers-color-scheme: dark)')?.matches ?? false; const prefersDark = window.matchMedia?.("(prefers-color-scheme: dark)")?.matches ?? false;
return prefersDark ? 'dark' : 'light'; return prefersDark ? "dark" : "light";
}; };
const normalizeTheme = (raw: string | null): Theme | null => { const normalizeTheme = (raw: string | null): Theme | null => {
if (raw === 'light' || raw === 'dark') return raw; if (raw === "light" || raw === "dark") return raw;
return null; return null;
}; };
@@ -29,7 +29,7 @@ const getSavedTheme = (): Theme => {
}; };
const applyTheme = (theme: Theme): void => { const applyTheme = (theme: Theme): void => {
document.documentElement.setAttribute('data-theme', theme); document.documentElement.setAttribute("data-theme", theme);
document.documentElement.style.colorScheme = theme; document.documentElement.style.colorScheme = theme;
const storage = getLocalStorage(); const storage = getLocalStorage();
try { try {
@@ -41,7 +41,7 @@ const applyTheme = (theme: Theme): void => {
const cycleTheme = (): void => { const cycleTheme = (): void => {
const current = getSavedTheme(); const current = getSavedTheme();
const next: Theme = current === 'light' ? 'dark' : 'light'; const next: Theme = current === "light" ? "dark" : "light";
applyTheme(next); applyTheme(next);
}; };
@@ -50,17 +50,17 @@ const initTheme = (): void => {
applyTheme(saved); applyTheme(saved);
// delegated click handler on theme buttons // delegated click handler on theme buttons
document.addEventListener('click', e => { document.addEventListener("click", (e) => {
const target = e.target; const target = e.target;
if (!(target instanceof Element)) return; if (!(target instanceof Element)) return;
const btn = target.closest('#theme-toggle, #footer-theme-toggle'); const btn = target.closest("#theme-toggle, #footer-theme-toggle");
if (!(btn instanceof HTMLButtonElement)) return; if (!(btn instanceof HTMLButtonElement)) return;
cycleTheme(); cycleTheme();
}); });
}; };
if (document.readyState === 'loading') { if (document.readyState === "loading") {
document.addEventListener('DOMContentLoaded', initTheme); document.addEventListener("DOMContentLoaded", initTheme);
} else { } else {
initTheme(); initTheme();
} }

56
static/timezone.ts
View File

@@ -10,7 +10,7 @@ interface ParsedBroadcast {
} }
const parseBroadcastTime = (value: string | null): { hour: number; minute: number } | null => { const parseBroadcastTime = (value: string | null): { hour: number; minute: number } | null => {
if (!value || typeof value !== 'string') { if (!value || typeof value !== "string") {
return null; return null;
} }
@@ -42,13 +42,13 @@ const isJstTimezone = (timezone: string | null): boolean => {
} }
const normalized = timezone.trim().toLowerCase(); const normalized = timezone.trim().toLowerCase();
return normalized === 'asia/tokyo' || normalized === 'jst'; return normalized === "asia/tokyo" || normalized === "jst";
}; };
const parseFromStructuredAttrs = (node: Element): ParsedBroadcast | null => { const parseFromStructuredAttrs = (node: Element): ParsedBroadcast | null => {
const day = node.getAttribute('data-broadcast-day'); const day = node.getAttribute("data-broadcast-day");
const time = node.getAttribute('data-broadcast-time'); const time = node.getAttribute("data-broadcast-time");
const timezone = node.getAttribute('data-broadcast-timezone'); const timezone = node.getAttribute("data-broadcast-timezone");
if (!day || !time || !isJstTimezone(timezone)) { if (!day || !time || !isJstTimezone(timezone)) {
return null; return null;
@@ -63,7 +63,7 @@ const parseFromStructuredAttrs = (node: Element): ParsedBroadcast | null => {
}; };
const parseBroadcast = (text: string | null): ParsedBroadcast | null => { const parseBroadcast = (text: string | null): ParsedBroadcast | null => {
if (!text || typeof text !== 'string') { if (!text || typeof text !== "string") {
return null; return null;
} }
@@ -90,7 +90,7 @@ const parseBroadcast = (text: string | null): ParsedBroadcast | null => {
const normalizeDay = (day: string): number | null => { const normalizeDay = (day: string): number | null => {
// strip trailing 's' for plural forms, then lookup // strip trailing 's' for plural forms, then lookup
const key = day.trim().toLowerCase().replace(/s$/, ''); const key = day.trim().toLowerCase().replace(/s$/, "");
const days: Record<string, number> = { const days: Record<string, number> = {
mon: 1, mon: 1,
monday: 1, monday: 1,
@@ -111,7 +111,7 @@ const normalizeDay = (day: string): number | null => {
sunday: 0, sunday: 0,
}; };
if (typeof days[key] !== 'number') { if (typeof days[key] !== "number") {
return null; return null;
} }
@@ -134,11 +134,11 @@ const convertToLocal = (parsed: ParsedBroadcast, localOffsetMinutes: number): st
} }
const localDayIndex = (((sourceDayIndex + dayShift) % 7) + 7) % 7; // proper modulo const localDayIndex = (((sourceDayIndex + dayShift) % 7) + 7) % 7; // proper modulo
const localDay = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'][ const localDay = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"][
localDayIndex localDayIndex
]; ];
const time = `${localHour.toString().padStart(2, '0')}:${localMinute.toString().padStart(2, '0')}`; const time = `${localHour.toString().padStart(2, "0")}:${localMinute.toString().padStart(2, "0")}`;
return `${localDay} at ${time} (Local)`; return `${localDay} at ${time} (Local)`;
}; };
@@ -168,8 +168,8 @@ const nextAiringUTC = (parsed: ParsedBroadcast): Date | null => {
const formatRelative = (value: number, unit: Intl.RelativeTimeFormatUnit): string => { const formatRelative = (value: number, unit: Intl.RelativeTimeFormatUnit): string => {
// Intl.RelativeTimeFormat not available in all environments // Intl.RelativeTimeFormat not available in all environments
if (typeof Intl !== 'undefined' && typeof Intl.RelativeTimeFormat === 'function') { if (typeof Intl !== "undefined" && typeof Intl.RelativeTimeFormat === "function") {
const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: 'auto' }); const formatter = new Intl.RelativeTimeFormat(undefined, { numeric: "auto" });
return formatter.format(value, unit); return formatter.format(value, unit);
} }
@@ -181,39 +181,39 @@ const formatRelative = (value: number, unit: Intl.RelativeTimeFormatUnit): strin
const relativeText = (target: Date): string => { const relativeText = (target: Date): string => {
const diffMs = target.getTime() - Date.now(); const diffMs = target.getTime() - Date.now();
if (diffMs <= 0) { if (diffMs <= 0) {
return 'soon'; return "soon";
} }
const minutes = Math.ceil(diffMs / 60000); const minutes = Math.ceil(diffMs / 60000);
if (minutes < 60) { if (minutes < 60) {
return formatRelative(minutes, 'minute'); return formatRelative(minutes, "minute");
} }
const hours = Math.ceil(minutes / 60); const hours = Math.ceil(minutes / 60);
if (hours < 36) { if (hours < 36) {
return formatRelative(hours, 'hour'); return formatRelative(hours, "hour");
} }
const days = Math.ceil(hours / 24); const days = Math.ceil(hours / 24);
return formatRelative(days, 'day'); return formatRelative(days, "day");
}; };
const localDateTimeText = (date: Date): string => { const localDateTimeText = (date: Date): string => {
const formatter = new Intl.DateTimeFormat(undefined, { const formatter = new Intl.DateTimeFormat(undefined, {
weekday: 'short', weekday: "short",
hour: '2-digit', hour: "2-digit",
minute: '2-digit', minute: "2-digit",
}); });
return formatter.format(date); return formatter.format(date);
}; };
const updateNextAiring = (node: Element, parsed: ParsedBroadcast): void => { const updateNextAiring = (node: Element, parsed: ParsedBroadcast): void => {
const card = node.closest('[data-notification-content]'); const card = node.closest("[data-notification-content]");
if (!card) { if (!card) {
return; return;
} }
const nextNode = card.querySelector('[data-next-airing]'); const nextNode = card.querySelector("[data-next-airing]");
if (!(nextNode instanceof HTMLElement)) { if (!(nextNode instanceof HTMLElement)) {
return; return;
} }
@@ -228,12 +228,12 @@ const updateNextAiring = (node: Element, parsed: ParsedBroadcast): void => {
}; };
const updateNode = (node: Element, localOffsetMinutes: number): void => { const updateNode = (node: Element, localOffsetMinutes: number): void => {
const card = node.closest('[data-notification-content]'); const card = node.closest("[data-notification-content]");
const nextNode = card ? card.querySelector('[data-next-airing]') : null; const nextNode = card ? card.querySelector("[data-next-airing]") : null;
// try structured attrs first, fall back to text parsing // try structured attrs first, fall back to text parsing
const structured = parseFromStructuredAttrs(node); const structured = parseFromStructuredAttrs(node);
const source = node.getAttribute('data-jst-text'); const source = node.getAttribute("data-jst-text");
const parsed = structured || parseBroadcast(source); const parsed = structured || parseBroadcast(source);
if (!parsed) { if (!parsed) {
if (nextNode instanceof HTMLElement) { if (nextNode instanceof HTMLElement) {
@@ -256,14 +256,14 @@ const updateNode = (node: Element, localOffsetMinutes: number): void => {
const updateAll = (): void => { const updateAll = (): void => {
const localOffsetMinutes = -new Date().getTimezoneOffset(); const localOffsetMinutes = -new Date().getTimezoneOffset();
const nodes = document.querySelectorAll('[data-jst-text]'); const nodes = document.querySelectorAll("[data-jst-text]");
nodes.forEach(node => updateNode(node, localOffsetMinutes)); nodes.forEach((node) => updateNode(node, localOffsetMinutes));
}; };
const initTimezoneConversion = (): void => { const initTimezoneConversion = (): void => {
// run on initial load and after htmx swaps (content may change) // run on initial load and after htmx swaps (content may change)
document.addEventListener('DOMContentLoaded', updateAll); document.addEventListener("DOMContentLoaded", updateAll);
document.body.addEventListener('htmx:afterSwap', updateAll); document.body.addEventListener("htmx:afterSwap", updateAll);
}; };
initTimezoneConversion(); initTimezoneConversion();