@jant/core 0.3.35 → 0.3.37

package/src/routes/auth/setup.tsx

@@ -14,7 +14,8 @@ import { BaseLayout } from "../../ui/layouts/BaseLayout.js";
 import { dsRedirect, dsToast } from "../../lib/sse.js";
 import { SetupSchema } from "../../lib/schemas.js";
 import { mapIanaToTimezone } from "../../lib/timezones.js";
-import { getI18n } from "../../i18n/index.js";
+import { getI18n, baseLocale } from "../../i18n/index.js";
+import { detectLocaleFromHeader } from "../../i18n/detect.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -40,8 +41,8 @@ const SetupContent: FC = () => {
         </header>
         <section>
           <form
-            data-signals="{name: '', email: '', password: '', _timezone: ''}"
-            data-init="$_timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || ''"
+            data-signals="{siteName: '', email: '', password: '', timezone: '', language: ''}"
+            data-init="$timezone = Intl.DateTimeFormat().resolvedOptions().timeZone || ''; $language = navigator.language || ''"
             data-on:submit__prevent="@post('/setup')"
             data-indicator="_loading"
             class="flex flex-col gap-4"
@@ -49,16 +50,16 @@ const SetupContent: FC = () => {
             <div class="field">
               <label class="label">
                 {t({
-                  message: "Your Name",
-                  comment: "@context: Setup form field - user name",
+                  message: "Site Name",
+                  comment: "@context: Setup form field - site name",
                 })}
               </label>
               <input
                 type="text"
-                data-bind="name"
+                data-bind="siteName"
                 class="input"
                 required
-                placeholder="John Doe"
+                placeholder="My Blog"
               />
             </div>
             <div class="field">
@@ -139,27 +140,29 @@ setupRoutes.post("/setup", async (c) => {
 
   const body = await c.req.json<Record<string, string>>();
   const parsed = SetupSchema.safeParse(body);
-  const browserTimezone = body._timezone;
+  const browserTimezone = body.timezone;
+  const browserLanguage = body.language;
 
   if (!parsed.success) {
     const errorMsg =
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for setup form",
         }),
       );
     return dsToast(errorMsg, "error");
   }
 
-  const { name, email, password } = parsed.data;
+  const { siteName, email, password } = parsed.data;
 
   if (!c.var.auth) {
     return dsToast(
       i18n._(
         msg({
-          message: "AUTH_SECRET not configured",
+          message: "Auth secret is missing. Check your environment variables.",
           comment:
             "@context: Error toast when authentication secret is missing from server config",
         }),
@@ -170,14 +173,15 @@ setupRoutes.post("/setup", async (c) => {
 
   try {
     const signUpResponse = await c.var.auth.api.signUpEmail({
-      body: { name, email, password },
+      body: { name: siteName.trim(), email, password },
     });
 
     if (!signUpResponse || "error" in signUpResponse) {
       return dsToast(
         i18n._(
           msg({
-            message: "Failed to create account",
+            message:
+              "Couldn't create your account. Check the details and try again.",
             comment: "@context: Error toast when account creation fails",
           }),
         ),
@@ -187,6 +191,9 @@ setupRoutes.post("/setup", async (c) => {
 
     await c.var.services.settings.completeOnboarding();
 
+    // Save site name
+    await c.var.services.settings.set("SITE_NAME", siteName.trim());
+
     // Save auto-detected timezone
     if (browserTimezone) {
       const tz = mapIanaToTimezone(browserTimezone);
@@ -195,37 +202,37 @@ setupRoutes.post("/setup", async (c) => {
       }
     }
 
+    // Save auto-detected language from browser's navigator.language
+    if (browserLanguage) {
+      const detectedLang = detectLocaleFromHeader(browserLanguage);
+      if (detectedLang !== baseLocale) {
+        await c.var.services.settings.set("SITE_LANGUAGE", detectedLang);
+      }
+    }
+
+    // Seed default navigation items (order: Collections, Archive, RSS, Settings)
     await c.var.services.navItems.create({
       type: "link",
       label: "Collections",
       url: "/c",
     });
-    // Seed default navigation items
+
     await c.var.services.navItems.create({
       type: "link",
       label: "Archive",
       url: "/archive",
     });
 
-    // Seed default About page
-    const aboutPage = await c.var.services.pages.create({
-      slug: "about",
-      title: "About",
-      body: [
-        "Welcome to my corner of the internet.",
-        "",
-        "This is a place where I share my thoughts, ideas, and things I find interesting. Feel free to look around and get to know what this site is all about.",
-        "",
-        "If you'd like to get in touch, don't hesitate to reach out.",
-      ].join("\n"),
-      status: "published",
+    await c.var.services.navItems.create({
+      type: "system",
+      label: "RSS",
+      url: "/feed",
     });
 
     await c.var.services.navItems.create({
-      type: "page",
-      label: "About",
-      url: "/about",
-      pageId: aboutPage.id,
+      type: "system",
+      label: "Settings",
+      url: "/settings",
     });
 
     return dsRedirect("/signin?setup");
@@ -235,7 +242,8 @@ setupRoutes.post("/setup", async (c) => {
     return dsToast(
       i18n._(
         msg({
-          message: "Failed to create account",
+          message:
+            "Couldn't create your account. Check the details and try again.",
           comment: "@context: Error toast when account creation fails",
         }),
       ),

package/src/routes/auth/signin.tsx

@@ -40,7 +40,8 @@ const SigninContent: FC<{
           {demoEmail && demoPassword && (
             <p class="text-muted-foreground text-sm mb-4">
               {t({
-                message: "Demo account pre-filled. Just click Sign In.",
+                message:
+                  "Demo credentials are pre-filled — hit Sign In to continue.",
                 comment:
                   "@context: Hint shown on signin page when demo credentials are pre-filled",
               })}
@@ -110,9 +111,9 @@ signinRoutes.get("/signin", async (c) => {
   const isReset = c.req.query("reset") !== undefined;
   let toast: { message: string } | undefined;
   if (isSetup) {
-    toast = { message: "Account created successfully. Please sign in." };
+    toast = { message: "Account created. Sign in to get started." };
   } else if (isReset) {
-    toast = { message: "Password reset successfully. Please sign in." };
+    toast = { message: "Password reset. Sign in with your new password." };
   }
 
   return c.html(
@@ -132,7 +133,7 @@ signinRoutes.post("/signin", async (c) => {
     return dsToast(
       i18n._(
         msg({
-          message: "Auth not configured",
+          message: "Authentication isn't set up. Check your server config.",
           comment:
             "@context: Error toast when authentication system is unavailable",
         }),
@@ -149,7 +150,8 @@ signinRoutes.post("/signin", async (c) => {
       parsed.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for sign-in form",
         }),
       );
@@ -165,12 +167,13 @@ signinRoutes.post("/signin", async (c) => {
       headers: c.req.raw.headers,
     });
 
-    return dsRedirect("/dash", { headers });
+    return dsRedirect("/", { headers });
   } catch {
     return dsToast(
       i18n._(
         msg({
-          message: "Invalid email or password",
+          message:
+            "Wrong email or password. Check your credentials and try again.",
           comment: "@context: Error toast when sign-in credentials are wrong",
         }),
       ),
@@ -179,21 +182,17 @@ signinRoutes.post("/signin", async (c) => {
   }
 });
 
-signinRoutes.get("/signout", async (c) => {
+signinRoutes.post("/signout", async (c) => {
   if (c.var.auth) {
     try {
       const res = await c.var.auth.api.signOut({
         headers: c.req.raw.headers,
         asResponse: true,
       });
-      const redirect = c.redirect("/");
-      for (const cookie of res.headers.getSetCookie()) {
-        redirect.headers.append("Set-Cookie", cookie);
-      }
-      return redirect;
+      return dsRedirect("/", { headers: res.headers });
     } catch {
       // Ignore signout errors
     }
   }
-  return c.redirect("/");
+  return dsRedirect("/");
 });

package/src/routes/compose.tsx

@@ -2,26 +2,19 @@
  * Compose Route
  *
  * Handles post creation from the public-site compose dialog.
- * Published posts are prepended to the homepage timeline via SSE.
+ * On publish the client reloads the page to pick up the new post.
  * Drafts close the dialog and show a confirmation toast.
  */
 
-import { Hono, type Context } from "hono";
+import { Hono } from "hono";
 import { msg } from "@lingui/core/macro";
-import type { Bindings, Post } from "../types.js";
+import type { Bindings } from "../types.js";
 import type { AppVariables } from "../types/app-context.js";
 import { requireAuth } from "../middleware/auth.js";
 import { CreatePostSchema } from "../lib/schemas.js";
 import { ValidationError } from "../lib/errors.js";
 import { sse, dsToast } from "../lib/sse.js";
 import { getI18n } from "../i18n/index.js";
-import {
-  toPostView,
-  toPostViewFromPost,
-  createMediaContext,
-} from "../lib/view.js";
-import { buildMediaMap } from "../lib/media-helpers.js";
-import { TimelineItemFromPost } from "../ui/feed/TimelineItem.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -48,40 +41,7 @@ const INITIAL_SIGNALS = {
 
 /** Script fragment that closes the compose dialog and self-removes */
 const CLOSE_DIALOG_SCRIPT =
-  "<script data-effect=\"el.remove()\">document.getElementById('compose-dialog').close()</script>";
-
-/** Build a timeline card HTML string for a newly created post */
-async function buildTimelineCard(
-  c: Context<Env>,
-  post: Post,
-  mediaIds: string[] | undefined,
-): Promise<string> {
-  const mediaCtx = createMediaContext(c.var.appConfig);
-  let postView;
-
-  if (mediaIds && mediaIds.length > 0) {
-    const rawMediaMap = await c.var.services.media.getByPostIds([post.id]);
-    const mediaMap = buildMediaMap(
-      rawMediaMap,
-      mediaCtx.r2PublicUrl,
-      mediaCtx.imageTransformUrl,
-      mediaCtx.s3PublicUrl,
-    );
-    postView = toPostView(
-      { ...post, mediaAttachments: mediaMap.get(post.id) ?? [] },
-      mediaCtx,
-    );
-  } else {
-    postView = toPostViewFromPost(post, mediaCtx);
-  }
-
-  return (
-    <div>
-      <TimelineItemFromPost post={postView} />
-      <hr class="feed-divider" />
-    </div>
-  ).toString();
-}
+  "<div data-init=\"document.getElementById('compose-dialog').close(); el.remove()\"></div>";
 
 composeRoutes.post("/", async (c) => {
   const i18n = getI18n(c);
@@ -94,7 +54,8 @@ composeRoutes.post("/", async (c) => {
       result.error.issues[0]?.message ??
       i18n._(
         msg({
-          message: "Invalid input",
+          message:
+            "Something doesn't look right. Check the form and try again.",
           comment: "@context: Fallback validation error for compose form",
         }),
       );
@@ -121,16 +82,26 @@ composeRoutes.post("/", async (c) => {
     }
   }
 
-  const post = await c.var.services.posts.create({
-    format: data.format,
-    title: data.title || undefined,
-    body: data.body || undefined,
-    status: data.status ?? "published",
-    url: data.url || undefined,
-    quoteText: data.quoteText || undefined,
-    rating: data.rating || undefined,
-    collectionIds: data.collectionIds?.length ? data.collectionIds : undefined,
-  });
+  const post = await c.var.services.posts.create(
+    {
+      format: data.format,
+      title: data.title || undefined,
+      body: data.body || undefined,
+      bodyMarkdown: data.bodyMarkdown || undefined,
+      status: data.status ?? "published",
+      visibility: data.visibility || undefined,
+      featured: data.featured,
+      url: data.url || undefined,
+      quoteText: data.quoteText || undefined,
+      rating: data.rating || undefined,
+      collectionIds: data.collectionIds,
+      replyToId: data.replyToId,
+    },
+    {
+      maxParagraphs: c.var.appConfig.summaryMaxParagraphs,
+      maxChars: c.var.appConfig.summaryMaxChars,
+    },
+  );
 
   // Attach media if provided
   if (data.mediaIds && data.mediaIds.length > 0) {
@@ -163,8 +134,7 @@ composeRoutes.post("/", async (c) => {
       });
     }
 
-    const cardHtml = await buildTimelineCard(c, post, data.mediaIds);
-    return c.json({ status: "published" as const, cardHtml });
+    return c.json({ status: "published" as const, permalink: `/${post.slug}` });
   }
 
   // ── SSE response mode (used by Datastar) ─────────────────────────
@@ -186,13 +156,7 @@ composeRoutes.post("/", async (c) => {
     });
   }
 
-  const cardHtml = await buildTimelineCard(c, post, data.mediaIds);
-
   return sse(c, async (stream) => {
-    await stream.patchElements(cardHtml, {
-      mode: "prepend",
-      selector: "#timeline-items",
-    });
     await stream.patchElements(CLOSE_DIALOG_SCRIPT, {
       mode: "append",
       selector: "body",

package/src/routes/dash/__tests__/settings-avatar.test.ts

@@ -38,7 +38,7 @@ function createMockFile(
   };
 }
 
-describe("Dashboard Settings - Avatar Upload Logic", () => {
+describe("Settings - Avatar Upload Logic", () => {
   let db: Database;
   let settingsService: ReturnType<typeof createSettingsService>;
   let mediaService: ReturnType<typeof createMediaService>;
@@ -57,7 +57,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const avatarKey = await settingsService.get("SITE_AVATAR");
@@ -72,7 +77,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const mediaList = await mediaService.list();
@@ -89,7 +99,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file, faviconIco: fakeIcoData.buffer },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const stored = await settingsService.get("SITE_FAVICON_ICO");
@@ -105,7 +120,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file, appleTouchIcon: appleTouchData },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const stored = await settingsService.get("SITE_FAVICON_APPLE_TOUCH");
@@ -120,7 +140,12 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
 
       await settingsService.uploadAvatar(
         { file },
-        { media: mediaService, storage, storageProvider: "r2" },
+        {
+          media: mediaService,
+          storage,
+          storageProvider: "r2",
+          maxFileSizeMB: 500,
+        },
       );
 
       const stored = await settingsService.get("SITE_FAVICON_VERSION");
@@ -135,19 +160,29 @@ describe("Dashboard Settings - Avatar Upload Logic", () => {
       await expect(
         settingsService.uploadAvatar(
           { file },
-          { media: mediaService, storage, storageProvider: "r2" },
+          {
+            media: mediaService,
+            storage,
+            storageProvider: "r2",
+            maxFileSizeMB: 500,
+          },
         ),
       ).rejects.toThrow("File type not allowed");
     });
 
     it("throws ValidationError for oversized file", async () => {
       const storage = createMockStorage();
-      const file = createMockFile("big.png", "image/png", 20 * 1024 * 1024);
+      const file = createMockFile("big.png", "image/png", 501 * 1024 * 1024);
 
       await expect(
         settingsService.uploadAvatar(
           { file },
-          { media: mediaService, storage, storageProvider: "r2" },
+          {
+            media: mediaService,
+            storage,
+            storageProvider: "r2",
+            maxFileSizeMB: 500,
+          },
         ),
       ).rejects.toThrow("File too large");
     });