@jant/core 0.3.36 → 0.3.37

package/src/routes/pages/archive.tsx

@@ -1,77 +1,211 @@
 /**
  * Archive Page Route
  *
- * Shows all posts, optionally filtered by format or visibility
+ * Tumblr-style archive grid with rich filtering:
+ * year, collection, format, media types, title presence.
+ * Page-based pagination with media-enriched post tiles.
  */
 
 import { Hono } from "hono";
-import type { Bindings, Format, Visibility } from "../../types.js";
+import type {
+  Bindings,
+  Format,
+  MediaKind,
+  PostWithMedia,
+} from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
-import { FORMATS, VISIBILITIES } from "../../types.js";
+import type {
+  ArchiveFilters,
+  ArchiveView,
+  ArchiveVisibility,
+} from "../../types/props.js";
+import { FORMATS, MEDIA_KINDS } from "../../types.js";
 import { ArchivePage } from "../../ui/pages/ArchivePage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toArchiveGroups } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toArchiveGroupsWithMedia,
+} from "../../lib/view.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import type { PostFilters } from "../../services/post.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
-const PAGE_SIZE = 50;
+const PAGE_SIZE = 60;
 
 export const archiveRoutes = new Hono<Env>();
 
-// Archive page - all posts
 archiveRoutes.get("/", async (c) => {
+  const { services, appConfig } = c.var;
+
+  // --- Parse query params ---------------------------------------------------
+
   const formatParam = c.req.query("format") as Format | undefined;
   const format =
     formatParam && FORMATS.includes(formatParam) ? formatParam : undefined;
-  const visibilityParam = c.req.query("visibility") as Visibility | undefined;
+
+  const yearParam = c.req.query("year");
+  const year = yearParam ? parseInt(yearParam, 10) : undefined;
+  const validYear = year && !isNaN(year) && year > 1970 ? year : undefined;
+
+  const collectionSlug = c.req.query("collection") || undefined;
+
+  const mediaParam = c.req.query("media") || undefined;
+  const mediaKinds = mediaParam
+    ? (mediaParam
+        .split(",")
+        .filter((m): m is MediaKind =>
+          (MEDIA_KINDS as readonly string[]).includes(m),
+        ) as MediaKind[])
+    : undefined;
+
+  const hasMediaParam = c.req.query("hasMedia");
+  const hasMedia =
+    hasMediaParam === "1" ? true : hasMediaParam === "0" ? false : undefined;
+
+  const hasTitleParam = c.req.query("hasTitle");
+  const hasTitle =
+    hasTitleParam === "1" ? true : hasTitleParam === "0" ? false : undefined;
+
+  const VALID_VISIBILITIES = ["public", "unlisted", "private", "featured"];
+  const visibilityParam = c.req.query("visibility");
+  const visibilityAll = visibilityParam === "all";
   const visibility =
-    visibilityParam &&
-    (VISIBILITIES as readonly string[]).includes(visibilityParam)
-      ? visibilityParam
+    visibilityParam && VALID_VISIBILITIES.includes(visibilityParam)
+      ? (visibilityParam as ArchiveVisibility)
+      : undefined;
+
+  const viewParam = c.req.query("view") as ArchiveView | undefined;
+  const view =
+    viewParam && (viewParam === "grid" || viewParam === "list")
+      ? viewParam
       : undefined;
 
-  // Parse cursor
-  const cursorParam = c.req.query("cursor");
-  const cursor = cursorParam ? parseInt(cursorParam, 10) : undefined;
+  const pageParam = c.req.query("page");
+  const currentPage = Math.max(1, parseInt(pageParam || "1", 10) || 1);
+
+  // --- Resolve collection slug to ID ----------------------------------------
+
+  const collection = collectionSlug
+    ? await services.collections.getBySlug(collectionSlug)
+    : undefined;
+  const collectionId = collection?.id;
+
+  // --- Build timestamp range for year filter --------------------------------
+
+  let publishedAfter: number | undefined;
+  let publishedBefore: number | undefined;
+  if (validYear) {
+    publishedAfter = Date.UTC(validYear, 0, 1) / 1000;
+    publishedBefore = Date.UTC(validYear + 1, 0, 1) / 1000;
+  }
+
+  // --- Build filters --------------------------------------------------------
 
   const navData = await getNavigationData(c);
 
-  // Fetch one extra to check for more
-  const posts = await c.var.services.posts.list({
+  // --- Map visibility filter to service-level filters -------------------------
+  // Visibility filter is only meaningful when authenticated — unauthenticated
+  // users cannot see unlisted or private posts regardless of the query param.
+
+  // Default to "public" when authenticated unless explicitly set to "all"
+  const effectiveVisibility = navData.isAuthenticated
+    ? visibilityAll
+      ? undefined
+      : (visibility ?? "public")
+    : undefined;
+
+  const filters: PostFilters = {
     format,
     status: "published",
-    visibility,
     excludeReplies: true,
-    cursor,
-    limit: PAGE_SIZE + 1,
-  });
+    excludePrivate: !navData.isAuthenticated,
+    excludeUnlisted: !navData.isAuthenticated,
+    ...(effectiveVisibility === "featured"
+      ? { featured: true }
+      : effectiveVisibility
+        ? { visibility: effectiveVisibility }
+        : {}),
+    collectionId,
+    publishedAfter,
+    publishedBefore,
+    mediaKinds: mediaKinds && mediaKinds.length > 0 ? mediaKinds : undefined,
+    hasMedia,
+    hasTitle,
+  };
 
-  const hasMore = posts.length > PAGE_SIZE;
-  const displayPosts = hasMore ? posts.slice(0, PAGE_SIZE) : posts;
+  // --- Parallel data fetches ------------------------------------------------
 
-  // Get next cursor
-  const nextCursor =
-    hasMore && displayPosts.length > 0
-      ? // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Length check above guarantees element exists
-        displayPosts[displayPosts.length - 1]!.id
-      : undefined;
+  const [totalCount, posts, availableYears, allCollections] = await Promise.all(
+    [
+      services.posts.count(filters),
+      services.posts.list({
+        ...filters,
+        limit: PAGE_SIZE,
+        offset: (currentPage - 1) * PAGE_SIZE,
+      }),
+      services.posts.getDistinctYears({
+        status: "published",
+        excludeReplies: true,
+      }),
+      services.collections.list(),
+    ],
+  );
+
+  const totalPages = Math.max(1, Math.ceil(totalCount / PAGE_SIZE));
 
-  // Group posts by year-month
-  const grouped = new Map<string, typeof displayPosts>();
-  for (const post of displayPosts) {
-    const date = new Date(post.publishedAt * 1000);
+  // --- Batch-load media for posts -------------------------------------------
+
+  const postIds = posts.map((p) => p.id);
+  const rawMediaMap = await services.media.getByPostIds(postIds);
+  const mediaCtx = createMediaContext(appConfig);
+  const mediaMap = buildMediaMap(
+    rawMediaMap,
+    mediaCtx.r2PublicUrl,
+    mediaCtx.imageTransformUrl,
+    mediaCtx.s3PublicUrl,
+  );
+
+  // --- Group posts by year-month with media ---------------------------------
+
+  const grouped = new Map<string, PostWithMedia[]>();
+  for (const post of posts) {
+    const publishedAt = post.publishedAt ?? post.updatedAt;
+    const date = new Date(publishedAt * 1000);
     const key = `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, "0")}`;
     if (!grouped.has(key)) {
       grouped.set(key, []);
     }
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion -- Map.set() above guarantees key exists
-    grouped.get(key)!.push(post);
+    grouped.get(key)!.push({
+      ...post,
+      mediaAttachments: mediaMap.get(post.id) ?? [],
+    });
   }
 
-  // Transform to View Models
-  const mediaCtx = createMediaContext(c.var.appConfig);
-  const groups = toArchiveGroups(grouped, mediaCtx);
+  const groups = toArchiveGroupsWithMedia(grouped, mediaCtx);
+
+  // --- Build active filter state for UI -------------------------------------
+
+  const archiveFilters: ArchiveFilters = {
+    year: validYear,
+    collectionSlug,
+    collectionTitle: collection?.title,
+    collectionIcon: collection?.icon,
+    format,
+    mediaKinds: mediaKinds && mediaKinds.length > 0 ? mediaKinds : undefined,
+    hasMedia,
+    hasTitle,
+    visibility: effectiveVisibility,
+    view,
+  };
+
+  const availableCollectionsList = allCollections.map((col) => ({
+    slug: col.slug,
+    title: col.title,
+    icon: col.icon,
+  }));
 
   return renderPublicPage(c, {
     title: `Archive - ${navData.siteName}`,
@@ -79,10 +213,12 @@ archiveRoutes.get("/", async (c) => {
     content: (
       <ArchivePage
         groups={groups}
-        hasMore={hasMore}
-        nextCursor={nextCursor}
-        format={format}
-        visibility={visibility}
+        currentPage={currentPage}
+        totalPages={totalPages}
+        filters={archiveFilters}
+        availableYears={availableYears}
+        availableCollections={availableCollectionsList}
+        isAuthenticated={navData.isAuthenticated}
       />
     ),
   });

package/src/routes/pages/collection.tsx

@@ -8,7 +8,11 @@ import type { AppVariables } from "../../types/app-context.js";
 import { CollectionPage } from "../../ui/pages/CollectionPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toPostViews } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toPostViews,
+  loadThreadRootPermalinks,
+} from "../../lib/view.js";
 import { defaultRssRenderer } from "../../lib/feed.js";
 import { buildMediaMap } from "../../lib/media-helpers.js";
 import { CollectionsSidebar } from "../../ui/shared/CollectionsSidebar.js";
@@ -23,23 +27,29 @@ collectionRoutes.get("/:slug", async (c) => {
   const collection = await c.var.services.collections.getBySlug(slug);
   if (!collection) return c.notFound();
 
-  // Fetch posts, all collections, dividers, and post counts in parallel
-  const [posts, allCollections, dividers, postCounts] = await Promise.all([
+  // Fetch posts, all collections, sidebar items, and post counts in parallel
+  const navData = await getNavigationData(c);
+
+  const [posts, allCollections, sidebarItems, postCounts] = await Promise.all([
     c.var.services.posts.list({
       collectionId: collection.id,
       status: "published",
-      excludeReplies: true,
+      excludePrivate: !navData.isAuthenticated,
     }),
     c.var.services.collections.list(),
-    c.var.services.collections.listDividers(),
+    c.var.services.collections.listSidebarItems(),
     c.var.services.collections.getPostCounts(),
   ]);
 
-  const navData = await getNavigationData(c);
-
-  // Batch-load media for posts
+  // Batch-load media and thread root permalinks in parallel
   const postIds = posts.map((p) => p.id);
-  const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
+  const [rawMediaMap, rootPermalinkMap] = await Promise.all([
+    c.var.services.media.getByPostIds(postIds),
+    loadThreadRootPermalinks(
+      posts,
+      c.var.services.posts.getById.bind(c.var.services.posts),
+    ),
+  ]);
   const mediaCtx = createMediaContext(c.var.appConfig);
   const mediaMap = buildMediaMap(
     rawMediaMap,
@@ -54,6 +64,7 @@ collectionRoutes.get("/:slug", async (c) => {
       mediaAttachments: mediaMap.get(p.id) ?? [],
     })),
     mediaCtx,
+    rootPermalinkMap,
   );
 
   const items = postViews.map((post) => ({ post }));
@@ -65,7 +76,7 @@ collectionRoutes.get("/:slug", async (c) => {
     sidebar: (
       <CollectionsSidebar
         collections={allCollections}
-        dividers={dividers}
+        sidebarItems={sidebarItems}
         activeSlug={slug}
         isAuthenticated={navData.isAuthenticated}
         postCounts={postCounts}
@@ -94,6 +105,7 @@ collectionRoutes.get("/:slug/feed", async (c) => {
     collectionId: collection.id,
     status: "published",
     excludeReplies: true,
+    excludePrivate: true,
     limit: feedLimit,
   });
 

package/src/routes/pages/collections.tsx

@@ -17,9 +17,9 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 export const collectionsPageRoutes = new Hono<Env>();
 
 collectionsPageRoutes.get("/", async (c) => {
-  const [allCollections, dividers, postCounts] = await Promise.all([
+  const [allCollections, sidebarItems, postCounts] = await Promise.all([
     c.var.services.collections.list(),
-    c.var.services.collections.listDividers(),
+    c.var.services.collections.listSidebarItems(),
     c.var.services.collections.getPostCounts(),
   ]);
 
@@ -36,7 +36,7 @@ collectionsPageRoutes.get("/", async (c) => {
     sidebar: (
       <CollectionsSidebar
         collections={allCollections}
-        dividers={dividers}
+        sidebarItems={sidebarItems}
         activeSlug={undefined}
         isAuthenticated={navData.isAuthenticated}
         postCounts={postCounts}

package/src/routes/pages/featured.tsx

@@ -9,7 +9,11 @@ import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toPostViewsFromPosts,
+  loadThreadRootPermalinks,
+} from "../../lib/view.js";
 import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -25,13 +29,33 @@ featuredRoutes.get("/", async (c) => {
   }
 
   const posts = await c.var.services.posts.list({
-    visibility: "featured",
+    featured: true,
     status: "published",
-    excludeReplies: true,
+    excludePrivate: !navData.isAuthenticated,
   });
 
   const mediaCtx = createMediaContext(c.var.appConfig);
-  const postViews = toPostViewsFromPosts(posts, mediaCtx);
+
+  const rootPermalinkMap = await loadThreadRootPermalinks(
+    posts,
+    c.var.services.posts.getById.bind(c.var.services.posts),
+  );
+
+  // Determine which posts are last in their thread for reply button visibility
+  const threadIds = [...new Set(posts.map((p) => p.threadId))];
+  const lastPostMap =
+    await c.var.services.posts.getLastPostIdsByThread(threadIds);
+  const isLastInThreadMap = new Map<string, boolean>();
+  for (const p of posts) {
+    isLastInThreadMap.set(p.id, lastPostMap.get(p.threadId) === p.id);
+  }
+
+  const postViews = toPostViewsFromPosts(
+    posts,
+    mediaCtx,
+    rootPermalinkMap,
+    isLastInThreadMap,
+  );
 
   // Convert to timeline items (simple — no thread previews)
   const items = postViews.map((post) => ({ post }));

package/src/routes/pages/home.tsx

@@ -14,7 +14,11 @@ import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleTimeline } from "../../lib/timeline.js";
-import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toPostViewsFromPosts,
+  loadThreadRootPermalinks,
+} from "../../lib/view.js";
 import { HomePage } from "../../ui/pages/HomePage.js";
 import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
 
@@ -28,12 +32,18 @@ homeRoutes.get("/", async (c) => {
   if (navData.homeDefaultView === "featured") {
     // Show featured posts on homepage
     const posts = await c.var.services.posts.list({
-      visibility: "featured",
+      featured: true,
       status: "published",
-      excludeReplies: true,
+      excludePrivate: !navData.isAuthenticated,
     });
     const mediaCtx = createMediaContext(c.var.appConfig);
-    const postViews = toPostViewsFromPosts(posts, mediaCtx);
+
+    const rootPermalinkMap = await loadThreadRootPermalinks(
+      posts,
+      c.var.services.posts.getById.bind(c.var.services.posts),
+    );
+
+    const postViews = toPostViewsFromPosts(posts, mediaCtx, rootPermalinkMap);
     const items = postViews.map((post) => ({ post }));
 
     return renderPublicPage(c, {
@@ -43,30 +53,21 @@ homeRoutes.get("/", async (c) => {
     });
   }
 
-  // Default: show latest posts
+  // Default: show latest posts (pinned posts sort to top via service layer)
   const pageParam = c.req.query("page");
   const page = pageParam ? Math.max(1, parseInt(pageParam, 10) || 1) : 1;
 
   const { items, currentPage, totalPages } = await assembleTimeline(c, {
     page,
+    isAuthenticated: navData.isAuthenticated,
   });
 
-  // Fetch pinned posts
-  const pinnedPosts = await c.var.services.posts.list({
-    pinned: true,
-    status: "published",
-    excludeReplies: true,
-  });
-  const mediaCtx = createMediaContext(c.var.appConfig);
-  const pinnedItems = toPostViewsFromPosts(pinnedPosts, mediaCtx);
-
   return renderPublicPage(c, {
     title: navData.siteName,
     navData,
     content: (
       <HomePage
         items={items}
-        pinnedItems={pinnedItems}
         currentPage={currentPage}
         totalPages={totalPages}
       />

package/src/routes/pages/latest.tsx

@@ -13,7 +13,6 @@ import type { AppVariables } from "../../types/app-context.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { assembleTimeline } from "../../lib/timeline.js";
-import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
 import { HomePage } from "../../ui/pages/HomePage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
@@ -33,24 +32,15 @@ latestRoutes.get("/", async (c) => {
 
   const { items, currentPage, totalPages } = await assembleTimeline(c, {
     page,
+    isAuthenticated: navData.isAuthenticated,
   });
 
-  // Fetch pinned posts
-  const pinnedPosts = await c.var.services.posts.list({
-    pinned: true,
-    status: "published",
-    excludeReplies: true,
-  });
-  const mediaCtx = createMediaContext(c.var.appConfig);
-  const pinnedItems = toPostViewsFromPosts(pinnedPosts, mediaCtx);
-
   return renderPublicPage(c, {
     title: `Latest - ${navData.siteName}`,
     navData,
     content: (
       <HomePage
         items={items}
-        pinnedItems={pinnedItems}
         currentPage={currentPage}
         totalPages={totalPages}
       />

package/src/routes/pages/new.tsx

@@ -0,0 +1,39 @@
+import { Hono } from "hono";
+import { msg } from "@lingui/core/macro";
+import type { Bindings } from "../../types.js";
+import type { AppVariables } from "../../types/app-context.js";
+import { requireAuth } from "../../middleware/auth.js";
+import { getNavigationData } from "../../lib/navigation.js";
+import { renderPublicPage } from "../../lib/render.js";
+import { getI18n } from "../../i18n/index.js";
+import { ComposePage } from "../../ui/pages/ComposePage.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+export const newPostRoutes = new Hono<Env>();
+
+newPostRoutes.use("/new", requireAuth());
+
+newPostRoutes.get("/new", async (c) => {
+  const navData = await getNavigationData(c);
+  const i18n = getI18n(c);
+
+  return renderPublicPage(c, {
+    title: `${i18n._(
+      msg({
+        message: "New post",
+        comment: "@context: Browser page title for the new post page",
+      }),
+    )} - ${navData.siteName}`,
+    navData,
+    showComposeDialog: false,
+    showHeader: false,
+    content: (
+      <ComposePage
+        collections={navData.collections}
+        uploadMaxFileSize={c.var.appConfig.uploadMaxFileSize}
+        closeHref="/"
+      />
+    ),
+  });
+});