@jant/core 0.3.27 → 0.3.29

package/src/routes/dash/settings.tsx

@@ -1,42 +1,23 @@
 /**
  * Dashboard Settings Routes
  *
- * Sub-pages: General, Appearance, Account
+ * Sub-pages: General, Account
  */
 
 import { Hono } from "hono";
+import { msg } from "@lingui/core/macro";
 import type { Bindings } from "../../types.js";
-import type { AppVariables } from "../../app.js";
+import type { AppVariables } from "../../types/app-context.js";
 import { DashLayout } from "../../ui/layouts/DashLayout.js";
 import { sse, dsRedirect, dsToast } from "../../lib/sse.js";
+import { getI18n } from "../../i18n/index.js";
 import { arrayBufferToBase64 } from "../../lib/favicon.js";
-import {
-  getSiteLanguage,
-  getSiteName,
-  getHomeDefaultView,
-  getTimeZone,
-  getSiteFooter,
-  isNoIndex,
-  getConfigFallback,
-} from "../../lib/config.js";
-import { SETTINGS_KEYS } from "../../lib/constants.js";
-import { getAvailableThemes } from "../../lib/theme.js";
-import { getMediaUrl, getPublicUrlForProvider } from "../../lib/image.js";
 import { TIMEZONES } from "../../lib/timezones.js";
-import { BUILTIN_FONT_THEMES } from "../../ui/font-themes.js";
+import { escapeHtml } from "../../lib/html.js";
+import { validateUploadFile, generateStorageKey } from "../../lib/upload.js";
 import { GeneralContent } from "../../ui/dash/settings/GeneralContent.js";
-import { AppearanceContent } from "../../ui/dash/settings/AppearanceContent.js";
 import { AccountContent } from "../../ui/dash/settings/AccountContent.js";
 
-/** Escape HTML special characters for safe insertion into HTML strings */
-function escapeHtml(str: string): string {
-  return str
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;");
-}
-
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const settingsRoutes = new Hono<Env>();
@@ -45,41 +26,11 @@ export const settingsRoutes = new Hono<Env>();
 // General settings
 // ===========================================================================
 
-/** Resolve the avatar storage key to a URL */
-async function resolveAvatarUrl(c: {
-  var: { services: AppVariables["services"] };
-  env: Bindings;
-}): Promise<string> {
-  const avatarKey = await c.var.services.settings.get("SITE_AVATAR");
-  if (!avatarKey) return "";
-  const publicUrl = getPublicUrlForProvider(
-    c.env.STORAGE_DRIVER || "r2",
-    c.env.R2_PUBLIC_URL,
-    c.env.S3_PUBLIC_URL,
-  );
-  return getMediaUrl(avatarKey, publicUrl);
-}
-
 settingsRoutes.get("/", async (c) => {
-  const { settings } = c.var.services;
+  const { allSettings, appConfig } = c.var;
 
-  const dbSiteName = await settings.get("SITE_NAME");
-  const dbSiteDescription = await settings.get("SITE_DESCRIPTION");
-  const [siteLanguage, homeDefaultView, timeZone, siteFooter, noindex] =
-    await Promise.all([
-      getSiteLanguage(c),
-      getHomeDefaultView(c),
-      getTimeZone(c),
-      getSiteFooter(c),
-      isNoIndex(c),
-    ]);
-
-  const siteNameFallback = getConfigFallback(c, "SITE_NAME");
-  const siteDescriptionFallback = getConfigFallback(c, "SITE_DESCRIPTION");
-
-  const siteAvatarUrl = await resolveAvatarUrl(c);
-  const showHeaderAvatar =
-    (await settings.get("SHOW_HEADER_AVATAR")) === "true";
+  const dbSiteName = allSettings["SITE_NAME"] ?? "";
+  const dbSiteDescription = allSettings["SITE_DESCRIPTION"] ?? "";
 
   const saved = c.req.query("saved") !== undefined;
 
@@ -87,22 +38,22 @@ settingsRoutes.get("/", async (c) => {
     <DashLayout
       c={c}
       title="Settings"
-      siteName={dbSiteName || siteNameFallback}
+      siteName={dbSiteName || appConfig.fallbacks.siteName}
       currentPath="/dash/settings"
       toast={saved ? { message: "Settings saved successfully." } : undefined}
     >
       <GeneralContent
         siteName={dbSiteName || ""}
         siteDescription={dbSiteDescription || ""}
-        siteLanguage={siteLanguage}
-        homeDefaultView={homeDefaultView}
-        siteNameFallback={siteNameFallback}
-        siteDescriptionFallback={siteDescriptionFallback}
-        siteAvatarUrl={siteAvatarUrl}
-        showHeaderAvatar={showHeaderAvatar}
-        timeZone={timeZone}
-        siteFooter={siteFooter}
-        noindex={noindex}
+        siteLanguage={appConfig.siteLanguage}
+        homeDefaultView={appConfig.homeDefaultView}
+        siteNameFallback={appConfig.fallbacks.siteName}
+        siteDescriptionFallback={appConfig.fallbacks.siteDescription}
+        siteAvatarUrl={appConfig.siteAvatarUrl}
+        showHeaderAvatar={appConfig.showHeaderAvatar}
+        timeZone={appConfig.timeZone}
+        siteFooter={appConfig.siteFooter}
+        noindex={appConfig.noindex}
         timezones={TIMEZONES}
       />
     </DashLayout>,
@@ -110,9 +61,11 @@ settingsRoutes.get("/", async (c) => {
 });
 
 settingsRoutes.post("/", async (c) => {
+  const i18n = getI18n(c);
   const body = await c.req.json<{
     siteName: string;
     siteDescription: string;
+    siteFooter: string;
     siteLanguage: string;
     homeDefaultView: string;
     timeZone: string;
@@ -120,7 +73,7 @@ settingsRoutes.post("/", async (c) => {
 
   const { settings } = c.var.services;
 
-  const oldLanguage = (await settings.get("SITE_LANGUAGE")) ?? "en";
+  const oldLanguage = c.var.allSettings["SITE_LANGUAGE"] ?? "en";
 
   if (body.siteName.trim()) {
     await settings.set("SITE_NAME", body.siteName.trim());
@@ -134,6 +87,13 @@ settingsRoutes.post("/", async (c) => {
     await settings.remove("SITE_DESCRIPTION");
   }
 
+  // Footer
+  if (body.siteFooter?.trim()) {
+    await settings.set("SITE_FOOTER", body.siteFooter.trim());
+  } else {
+    await settings.remove("SITE_FOOTER");
+  }
+
   await settings.set("SITE_LANGUAGE", body.siteLanguage);
 
   // Save homepage default view (only store if non-default)
@@ -151,7 +111,29 @@ settingsRoutes.post("/", async (c) => {
   }
 
   const languageChanged = oldLanguage !== body.siteLanguage;
-  const displayName = body.siteName.trim() || getConfigFallback(c, "SITE_NAME");
+  const displayName =
+    body.siteName.trim() || c.var.appConfig.fallbacks.siteName;
+
+  // ── JSON response mode (used by Lit settings bridge) ──────────────
+  const wantsJson = c.req.header("accept")?.includes("application/json");
+  if (wantsJson) {
+    if (languageChanged) {
+      return c.json({
+        status: "redirect" as const,
+        url: "/dash/settings?saved",
+      });
+    }
+    return c.json({
+      status: "ok" as const,
+      toast: i18n._(
+        msg({
+          message: "Settings saved successfully.",
+          comment: "@context: Toast after saving general settings",
+        }),
+      ),
+      siteName: displayName,
+    });
+  }
 
   return sse(c, async (stream) => {
     if (languageChanged) {
@@ -165,10 +147,18 @@ settingsRoutes.post("/", async (c) => {
         mode: "inner",
         selector: "title",
       });
-      await stream.toast("Settings saved successfully.");
+      await stream.toast(
+        i18n._(
+          msg({
+            message: "Settings saved successfully.",
+            comment: "@context: Toast after saving general settings",
+          }),
+        ),
+      );
       await stream.patchSignals({
         _orig_siteName: body.siteName,
         _orig_siteDescription: body.siteDescription,
+        _orig_siteFooter: body.siteFooter,
         _orig_siteLanguage: body.siteLanguage,
         _orig_homeDefaultView: body.homeDefaultView,
         _orig_timeZone: body.timeZone,
@@ -178,26 +168,8 @@ settingsRoutes.post("/", async (c) => {
   });
 });
 
-settingsRoutes.post("/footer", async (c) => {
-  const body = await c.req.json<{ siteFooter: string }>();
-  const { settings } = c.var.services;
-
-  if (body.siteFooter?.trim()) {
-    await settings.set("SITE_FOOTER", body.siteFooter.trim());
-  } else {
-    await settings.remove("SITE_FOOTER");
-  }
-
-  return sse(c, async (stream) => {
-    await stream.toast("Footer saved successfully.");
-    await stream.patchSignals({
-      _orig_siteFooter: body.siteFooter,
-      _footerDirty: false,
-    });
-  });
-});
-
 settingsRoutes.post("/seo", async (c) => {
+  const i18n = getI18n(c);
   const body = await c.req.json<{ noindex: string }>();
   const { settings } = c.var.services;
 
@@ -210,8 +182,29 @@ settingsRoutes.post("/seo", async (c) => {
     await settings.set("NOINDEX", "true");
   }
 
+  // ── JSON response mode (used by Lit settings bridge) ──────────────
+  const wantsJson = c.req.header("accept")?.includes("application/json");
+  if (wantsJson) {
+    return c.json({
+      status: "ok" as const,
+      toast: i18n._(
+        msg({
+          message: "SEO settings saved successfully.",
+          comment: "@context: Toast after saving SEO settings",
+        }),
+      ),
+    });
+  }
+
   return sse(c, async (stream) => {
-    await stream.toast("SEO settings saved successfully.");
+    await stream.toast(
+      i18n._(
+        msg({
+          message: "SEO settings saved successfully.",
+          comment: "@context: Toast after saving SEO settings",
+        }),
+      ),
+    );
     await stream.patchSignals({
       _orig_noindex: body.noindex,
       _seoDirty: false,
@@ -224,41 +217,40 @@ settingsRoutes.post("/seo", async (c) => {
 // ===========================================================================
 
 settingsRoutes.post("/avatar", async (c) => {
+  const i18n = getI18n(c);
   const storage = c.var.storage;
   if (!storage) {
-    return dsToast("Storage not configured.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "Storage not configured.",
+          comment: "@context: Error toast when file storage is not set up",
+        }),
+      ),
+      "error",
+    );
   }
 
   const formData = await c.req.formData();
   const file = formData.get("file") as File | null;
   if (!file) {
-    return dsToast("No file provided.", "error");
-  }
-
-  const allowedTypes = [
-    "image/jpeg",
-    "image/png",
-    "image/gif",
-    "image/webp",
-    "image/svg+xml",
-  ];
-  if (!allowedTypes.includes(file.type)) {
-    return dsToast("File type not allowed.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "No file provided.",
+          comment: "@context: Error toast when no file was selected for upload",
+        }),
+      ),
+      "error",
+    );
   }
 
-  const maxSize = 10 * 1024 * 1024;
-  if (file.size > maxSize) {
-    return dsToast("File too large (max 10MB).", "error");
+  const uploadError = validateUploadFile(file);
+  if (uploadError) {
+    return dsToast(uploadError, "error");
   }
 
-  const { uuidv7 } = await import("uuidv7");
-  const ext = file.name.split(".").pop() || "bin";
-  const id = uuidv7();
-  const date = new Date();
-  const year = date.getUTCFullYear();
-  const month = String(date.getUTCMonth() + 1).padStart(2, "0");
-  const filename = `${id}.${ext}`;
-  const storageKey = `media/${year}/${month}/${filename}`;
+  const { id, filename, storageKey } = generateStorageKey(file.name);
 
   try {
     await storage.put(storageKey, file.stream(), {
@@ -272,39 +264,80 @@ settingsRoutes.post("/avatar", async (c) => {
       mimeType: file.type,
       size: file.size,
       storageKey,
-      provider: c.env.STORAGE_DRIVER || "r2",
+      provider: c.var.appConfig.storageDriver,
     });
 
     await c.var.services.settings.set("SITE_AVATAR", storageKey);
 
-    // Store favicon variants as base64 in settings (small files, accessed every page load)
+    // Store favicon ICO as base64 in settings (tiny file, accessed every page load)
     const faviconFile = formData.get("favicon") as File | null;
-    const appleTouchFile = formData.get("appleTouch") as File | null;
-
     if (faviconFile) {
       const b64 = arrayBufferToBase64(await faviconFile.arrayBuffer());
       await c.var.services.settings.set("SITE_FAVICON_ICO", b64);
     }
 
+    // Store apple-touch-icon in R2 (180x180 PNG, not tiny enough for base64)
+    const appleTouchFile = formData.get("appleTouch") as File | null;
     if (appleTouchFile) {
-      const b64 = arrayBufferToBase64(await appleTouchFile.arrayBuffer());
-      await c.var.services.settings.set("SITE_FAVICON_APPLE_TOUCH", b64);
+      const appleTouchKey = "favicon/apple-touch-icon.png";
+      await storage.put(
+        appleTouchKey,
+        new Uint8Array(await appleTouchFile.arrayBuffer()),
+        { contentType: "image/png" },
+      );
+      await c.var.services.settings.set(
+        "SITE_FAVICON_APPLE_TOUCH",
+        appleTouchKey,
+      );
     }
 
+    // Set favicon version for cache-busting
+    const now = new Date();
+    const version =
+      String(now.getUTCFullYear()) +
+      String(now.getUTCMonth() + 1).padStart(2, "0") +
+      String(now.getUTCDate()).padStart(2, "0") +
+      String(now.getUTCHours()).padStart(2, "0") +
+      String(now.getUTCMinutes()).padStart(2, "0");
+    await c.var.services.settings.set("SITE_FAVICON_VERSION", version);
+
     return dsRedirect("/dash/settings?saved");
   } catch {
-    return dsToast("Upload failed. Please try again.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "Upload failed. Please try again.",
+          comment: "@context: Error toast when avatar upload fails",
+        }),
+      ),
+      "error",
+    );
   }
 });
 
 settingsRoutes.post("/avatar/remove", async (c) => {
+  const storage = c.var.storage;
+  const appleTouchKey = c.var.allSettings["SITE_FAVICON_APPLE_TOUCH"];
+  if (storage && appleTouchKey) {
+    await storage.delete(appleTouchKey);
+  }
+
   await c.var.services.settings.remove("SITE_AVATAR");
   await c.var.services.settings.remove("SITE_FAVICON_ICO");
   await c.var.services.settings.remove("SITE_FAVICON_APPLE_TOUCH");
+  await c.var.services.settings.remove("SITE_FAVICON_VERSION");
+
+  // ── JSON response mode (used by Lit settings bridge) ──────────────
+  const wantsJson = c.req.header("accept")?.includes("application/json");
+  if (wantsJson) {
+    return c.json({ status: "redirect" as const, url: "/dash/settings?saved" });
+  }
+
   return dsRedirect("/dash/settings?saved");
 });
 
 settingsRoutes.post("/avatar/display", async (c) => {
+  const i18n = getI18n(c);
   const body = await c.req.json<{ showHeaderAvatar: string }>();
   const { settings } = c.var.services;
 
@@ -314,8 +347,29 @@ settingsRoutes.post("/avatar/display", async (c) => {
     await settings.remove("SHOW_HEADER_AVATAR");
   }
 
+  // ── JSON response mode (used by Lit settings bridge) ──────────────
+  const wantsJson = c.req.header("accept")?.includes("application/json");
+  if (wantsJson) {
+    return c.json({
+      status: "ok" as const,
+      toast: i18n._(
+        msg({
+          message: "Avatar display setting saved successfully.",
+          comment: "@context: Toast after saving avatar display preference",
+        }),
+      ),
+    });
+  }
+
   return sse(c, async (stream) => {
-    await stream.toast("Avatar display setting saved successfully.");
+    await stream.toast(
+      i18n._(
+        msg({
+          message: "Avatar display setting saved successfully.",
+          comment: "@context: Toast after saving avatar display preference",
+        }),
+      ),
+    );
     await stream.patchSignals({
       _orig_showHeaderAvatar: body.showHeaderAvatar,
       _avatarDisplayDirty: false,
@@ -323,96 +377,12 @@ settingsRoutes.post("/avatar/display", async (c) => {
   });
 });
 
-// ===========================================================================
-// Appearance
-// ===========================================================================
-
-settingsRoutes.get("/appearance", async (c) => {
-  const { settings } = c.var.services;
-  const siteName = await getSiteName(c);
-  const currentThemeId = (await settings.get(SETTINGS_KEYS.THEME)) ?? "default";
-  const currentFontThemeId = (await settings.get("FONT_THEME")) ?? "default";
-  const customCSS = (await settings.get(SETTINGS_KEYS.CUSTOM_CSS)) ?? "";
-  const themes = getAvailableThemes(c.var.config);
-  const saved = c.req.query("saved") !== undefined;
-
-  return c.html(
-    <DashLayout
-      c={c}
-      title="Settings"
-      siteName={siteName}
-      currentPath="/dash/settings"
-      toast={saved ? { message: "Theme saved successfully." } : undefined}
-    >
-      <AppearanceContent
-        themes={themes}
-        currentThemeId={currentThemeId}
-        fontThemes={BUILTIN_FONT_THEMES}
-        currentFontThemeId={currentFontThemeId}
-        customCSS={customCSS}
-      />
-    </DashLayout>,
-  );
-});
-
-settingsRoutes.post("/appearance", async (c) => {
-  const body = await c.req.json<{ theme: string }>();
-  const { settings } = c.var.services;
-  const themes = getAvailableThemes(c.var.config);
-
-  const validTheme = themes.find((t) => t.id === body.theme);
-  if (!validTheme) {
-    return dsToast("Invalid theme selected.", "error");
-  }
-
-  if (validTheme.id === "default") {
-    await settings.remove(SETTINGS_KEYS.THEME);
-  } else {
-    await settings.set(SETTINGS_KEYS.THEME, validTheme.id);
-  }
-
-  return dsRedirect("/dash/settings/appearance?saved");
-});
-
-settingsRoutes.post("/font-theme", async (c) => {
-  const body = await c.req.json<{ fontTheme: string }>();
-  const { settings } = c.var.services;
-
-  const validFont = BUILTIN_FONT_THEMES.find((f) => f.id === body.fontTheme);
-  if (!validFont) {
-    return dsToast("Invalid font theme selected.", "error");
-  }
-
-  if (validFont.id === "default") {
-    await settings.remove("FONT_THEME");
-  } else {
-    await settings.set("FONT_THEME", validFont.id);
-  }
-
-  return dsRedirect("/dash/settings/appearance?saved");
-});
-
-settingsRoutes.post("/custom-css", async (c) => {
-  const body = await c.req.json<{ customCSS: string }>();
-  const { settings } = c.var.services;
-
-  const css = body.customCSS?.trim() ?? "";
-
-  if (css) {
-    await settings.set(SETTINGS_KEYS.CUSTOM_CSS, css);
-  } else {
-    await settings.remove(SETTINGS_KEYS.CUSTOM_CSS);
-  }
-
-  return dsToast("Custom CSS saved successfully.");
-});
-
 // ===========================================================================
 // Account
 // ===========================================================================
 
 settingsRoutes.get("/account", async (c) => {
-  const siteName = await getSiteName(c);
+  const siteName = c.var.appConfig.siteName;
   const session = await c.var.auth.api.getSession({
     headers: c.req.raw.headers,
   });
@@ -433,11 +403,20 @@ settingsRoutes.get("/account", async (c) => {
 });
 
 settingsRoutes.post("/account", async (c) => {
+  const i18n = getI18n(c);
   const body = await c.req.json<{ userName: string }>();
   const name = body.userName?.trim();
 
   if (!name) {
-    return dsToast("Name is required.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "Name is required.",
+          comment: "@context: Error toast when display name is empty",
+        }),
+      ),
+      "error",
+    );
   }
 
   try {
@@ -446,13 +425,29 @@ settingsRoutes.post("/account", async (c) => {
       headers: c.req.raw.headers,
     });
   } catch {
-    return dsToast("Failed to update profile.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "Failed to update profile.",
+          comment: "@context: Error toast when profile update fails",
+        }),
+      ),
+      "error",
+    );
   }
 
-  return dsToast("Profile saved successfully.");
+  return dsToast(
+    i18n._(
+      msg({
+        message: "Profile saved successfully.",
+        comment: "@context: Toast after saving user profile",
+      }),
+    ),
+  );
 });
 
 settingsRoutes.post("/password", async (c) => {
+  const i18n = getI18n(c);
   const body = await c.req.json<{
     currentPassword: string;
     newPassword: string;
@@ -460,7 +455,16 @@ settingsRoutes.post("/password", async (c) => {
   }>();
 
   if (body.newPassword !== body.confirmPassword) {
-    return dsToast("Passwords do not match.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "Passwords do not match.",
+          comment:
+            "@context: Error toast when new password and confirmation differ",
+        }),
+      ),
+      "error",
+    );
   }
 
   try {
@@ -473,11 +477,27 @@ settingsRoutes.post("/password", async (c) => {
       headers: c.req.raw.headers,
     });
   } catch {
-    return dsToast("Current password is incorrect.", "error");
+    return dsToast(
+      i18n._(
+        msg({
+          message: "Current password is incorrect.",
+          comment:
+            "@context: Error toast when current password verification fails",
+        }),
+      ),
+      "error",
+    );
   }
 
   return sse(c, async (stream) => {
-    await stream.toast("Password changed successfully.");
+    await stream.toast(
+      i18n._(
+        msg({
+          message: "Password changed successfully.",
+          comment: "@context: Toast after changing account password",
+        }),
+      ),
+    );
     await stream.patchSignals({
       currentPassword: "",
       newPassword: "",

package/src/routes/feed/__tests__/rss.test.ts

@@ -1,11 +1,12 @@
 import { describe, it, expect } from "vitest";
 import { Hono } from "hono";
 import type { Bindings } from "../../../types.js";
-import type { AppVariables } from "../../../app.js";
+import type { AppVariables } from "../../../types/app-context.js";
 import { createTestDatabase } from "../../../__tests__/helpers/db.js";
 import { createPostService } from "../../../services/post.js";
 import { createSettingsService } from "../../../services/settings.js";
 import { createMediaService } from "../../../services/media.js";
+import { resolveConfig } from "../../../lib/resolve-config.js";
 import { rssRoutes } from "../rss.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -22,13 +23,16 @@ function createFeedTestApp(envOverrides: Partial<Bindings> = {}) {
   const app = new Hono<Env>();
 
   app.use("*", async (c, next) => {
-    c.env = {
+    const env = {
       SITE_URL: "http://localhost:9019",
       ...envOverrides,
     } as Bindings;
+    c.env = env;
 
     c.set("services", services as AppVariables["services"]);
-    c.set("config", {});
+    const allSettings = await services.settings.getAll();
+    c.set("allSettings", allSettings);
+    c.set("appConfig", resolveConfig(env, allSettings));
     await next();
   });