@jant/core 0.6.14 → 0.6.15

package/src/services/search.ts

@@ -10,6 +10,7 @@ import type { Post, Status, Format, SearchResult } from "../types.js";
 import type { DatabaseDialect } from "../db/dialect.js";
 import type { RawQueryClient } from "../db/raw-query.js";
 import { escapeHtml } from "../lib/html.js";
+import { resolvePostBodyHtml } from "../lib/post-body-html.js";
 import {
   buildSearchSnippet,
   extractSearchTerms,
@@ -46,11 +47,11 @@ interface RawSearchRow {
   url: string | null;
   body: string | null;
   body_html: string | null;
+  body_html_version: number;
   body_text: string | null;
   quote_text: string | null;
   summary: string | null;
   rating: number | null;
-  collection_id: string | null;
   reply_to_id: string | null;
   thread_id: string;
   published_at: number | null;
@@ -76,7 +77,12 @@ function mapRow(row: RawSearchRow): SearchResult {
       title: row.title,
       url: row.url,
       body: row.body,
-      bodyHtml: row.body_html,
+      bodyHtml: resolvePostBodyHtml({
+        id: row.id,
+        body: row.body,
+        bodyHtml: row.body_html,
+        bodyHtmlVersion: row.body_html_version,
+      }),
       bodyText: row.body_text,
       quoteText: row.quote_text,
       summary: row.summary,

package/src/services/settings.ts

@@ -163,15 +163,7 @@ export function createSettingsService(
   const { settings } = databaseSchema;
 
   function normalizeSettingValue(key: SettingsKey, value: string): string {
-    if (key !== SETTINGS_KEYS.TIME_ZONE) {
-      return normalizeEditableSettingValue(key, value);
-    }
-
-    if (!isSupportedTimeZone(value)) {
-      throw new ValidationError("Choose a valid time zone.");
-    }
-
-    return normalizeTimeZone(value);
+    return normalizeEditableSettingValue(key, value);
   }
 
   return {
@@ -333,7 +325,7 @@ export function createSettingsService(
           (opts.oldDashboardLanguage ?? "") !== dashboardLanguage;
       }
 
-      // CJK serif font setting
+      // Optional CJK fallback for content languages without a font profile.
       const cjkFont = data.cjkSerifFont?.trim() ?? "";
       if (cjkFont && isCjkSerifFont(cjkFont) && cjkFont !== "off") {
         await this.set("CJK_SERIF_FONT", cjkFont);

package/src/services/site-admin.ts

@@ -18,12 +18,13 @@ import { getConfiguredSingleSiteUrl } from "../lib/env.js";
 import { resolveConfig } from "../lib/resolve-config.js";
 import { buildThemeStyle } from "../lib/theme.js";
 import { now } from "../lib/time.js";
+import { normalizeTimeZone } from "../lib/timezones.js";
 import { detectLocaleFromHeader } from "../i18n/detect.js";
 import { baseLocale } from "../i18n/locales.js";
 import { BUILTIN_COLOR_THEMES } from "../ui/color-themes.js";
 import {
   BUILTIN_FONT_THEMES,
-  getCjkSerifCssVariables,
+  getCjkFontCssVariables,
   getFontThemeCssVariables,
 } from "../ui/font-themes.js";
 import type { Site, SiteDomain } from "../types.js";
@@ -217,7 +218,7 @@ export function createSiteAdminService(
     media,
     navItems,
     pathRegistry,
-    postCollections,
+    threadCollections,
     posts,
     settings,
     siteDomains,
@@ -297,6 +298,43 @@ export function createSiteAdminService(
     };
   }
 
+  async function completeManagedSiteSetup(
+    targetDb: Database,
+    siteId: string,
+    input: {
+      siteName: string;
+      siteLanguage?: string | null;
+      timeZone: string;
+    },
+  ): Promise<void> {
+    const settingsService = createSettingsService(
+      targetDb,
+      siteId,
+      databaseSchema,
+      databaseDialect,
+    );
+    if (await settingsService.isOnboardingComplete()) {
+      return;
+    }
+
+    await settingsService.set(SETTINGS_KEYS.SITE_NAME, input.siteName);
+    await settingsService.updateLocaleSettings(
+      {
+        siteLanguage: input.siteLanguage?.trim()
+          ? detectLocaleFromHeader(input.siteLanguage)
+          : baseLocale,
+        cjkSerifFont: "off",
+        timeZone: input.timeZone,
+      },
+      {
+        oldLanguage: "",
+      },
+    );
+    const navItems = createNavItemService(targetDb, siteId, databaseSchema);
+    await navItems.materializeDefaultNavigation();
+    await settingsService.completeOnboarding();
+  }
+
   async function createWithDatabase(
     targetDb: Database,
     input: CreateManagedSiteInput,
@@ -304,6 +342,11 @@ export function createSiteAdminService(
     const siteKey = input.key.trim();
     const primaryHost = input.primaryHost.trim().toLowerCase();
     const siteName = input.siteName.trim();
+    // Browser-detected timezone metadata is optional. Preserve any runtime-
+    // supported IANA name or fixed offset, but never fail the whole managed
+    // site transaction when a browser reports a value this runtime does not
+    // recognize.
+    const timeZone = normalizeTimeZone(input.timeZone);
     const idempotencyKey = input.idempotencyKey?.trim() || null;
 
     if (idempotencyKey) {
@@ -317,6 +360,11 @@ export function createSiteAdminService(
             "Idempotency key was reused with a different site key or primary host.",
           );
         }
+        await completeManagedSiteSetup(targetDb, existing.site.id, {
+          siteName,
+          siteLanguage: input.siteLanguage,
+          timeZone,
+        });
         return existing;
       }
     }
@@ -381,44 +429,11 @@ export function createSiteAdminService(
       );
     }
 
-    await targetDb
-      .insert(settings)
-      .values({
-        siteId,
-        key: SETTINGS_KEYS.SITE_NAME,
-        value: siteName,
-        updatedAt: timestamp,
-      })
-      .onConflictDoUpdate({
-        target: [settings.siteId, settings.key],
-        set: {
-          value: siteName,
-          updatedAt: timestamp,
-        },
-      });
-
-    const settingsService = createSettingsService(
-      targetDb,
-      siteId,
-      databaseSchema,
-      databaseDialect,
-    );
-    await settingsService.updateLocaleSettings(
-      {
-        siteLanguage: input.siteLanguage?.trim()
-          ? detectLocaleFromHeader(input.siteLanguage)
-          : baseLocale,
-        cjkSerifFont: "off",
-        timeZone: input.timeZone?.trim() ?? "",
-      },
-      {
-        oldLanguage: "",
-      },
-    );
-    await settingsService.completeOnboarding();
-
-    const navItems = createNavItemService(targetDb, siteId, databaseSchema);
-    await navItems.ensureSystemDefaults();
+    await completeManagedSiteSetup(targetDb, siteId, {
+      siteName,
+      siteLanguage: input.siteLanguage,
+      timeZone,
+    });
 
     return {
       site: toSite(siteRow),
@@ -479,8 +494,8 @@ export function createSiteAdminService(
     }
 
     await targetDb
-      .delete(postCollections)
-      .where(eq(postCollections.siteId, siteId));
+      .delete(threadCollections)
+      .where(eq(threadCollections.siteId, siteId));
     await targetDb.delete(pathRegistry).where(eq(pathRegistry.siteId, siteId));
     await targetDb
       .delete(collectionDirectoryItems)
@@ -768,7 +783,10 @@ export function createSiteAdminService(
           )
         : undefined;
       const fontOverrides = {
-        ...getCjkSerifCssVariables(appConfig.cjkSerifFont),
+        ...getCjkFontCssVariables(
+          appConfig.siteLanguage,
+          appConfig.cjkSerifFont,
+        ),
         ...(fontTheme ? getFontThemeCssVariables(fontTheme) : {}),
       };
       const themeCss = buildThemeStyle(
@@ -792,6 +810,8 @@ export function createSiteAdminService(
           siteDescription: appConfig.siteDescription,
           siteLanguage: appConfig.siteLanguage,
           showJantBrandingOnHome: appConfig.showJantBrandingOnHome,
+          publicApiEnabled: appConfig.publicApiEnabled,
+          rssFeedsEnabled: appConfig.rssFeedsEnabled,
           mainRssFeed: appConfig.mainRssFeed,
           siteFooter: appConfig.siteFooter,
           showHeaderAvatar: appConfig.showHeaderAvatar,

package/src/style-cjk-jp.css

@@ -1,3 +1,3 @@
-/* Optional Japanese font pack, loaded only when CJK font is set to Japanese. */
+/* Japanese serif profile, loaded when the resolved font profile is Japanese. */
 
 @import "./styles/fonts/noto-serif-jp/noto-serif-jp.css";

package/src/style-cjk-kr.css

@@ -1,3 +1,3 @@
-/* Optional Korean font pack, loaded only when CJK font is set to Korean. */
+/* Korean serif profile, loaded when the resolved font profile is Korean. */
 
 @import "./styles/fonts/noto-serif-kr/noto-serif-kr.css";

package/src/style-cjk-tc.css

@@ -1,3 +1,3 @@
-/* Optional Traditional Chinese font pack, loaded only for zh-Hant sites. */
+/* Traditional Chinese serif profile, loaded when the resolved font profile is zh-Hant. */
 
 @import "./styles/fonts/noto-serif-tc/noto-serif-tc.css";

package/src/style-cjk.css

@@ -1,3 +1,3 @@
-/* Optional Simplified Chinese font pack, loaded only for zh-Hans sites. */
+/* Simplified Chinese serif profile, loaded when the resolved font profile is zh-Hans. */
 
 @import "./styles/fonts/noto-serif-sc/noto-serif-sc.css";