@jant/core 0.6.14 → 0.6.15

package/src/routes/pages/archive.tsx

@@ -27,10 +27,15 @@ import type {
 import { FORMATS, MEDIA_KINDS } from "../../types.js";
 import { ArchivePage } from "../../ui/pages/ArchivePage.js";
 import { defaultFeedRenderer } from "../../lib/feed.js";
+import {
+  getFeedEntryUpdatedAt,
+  getRssPublishedBefore,
+  RSS_FEED_CACHE_CONTROL,
+} from "../../lib/feed-policy.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { buildPageTitle } from "../../lib/page-title.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { formatYearMonth, toISOString } from "../../lib/time.js";
+import { formatYearMonth } from "../../lib/time.js";
 import { toAbsoluteSiteUrl, toPublicPath } from "../../lib/url.js";
 import {
   createMediaContext,
@@ -207,6 +212,8 @@ function buildArchivePostFilters(
     hasMedia: params.hasMedia,
     hasTitle: params.hasTitle,
     hasReplies: params.hasReplies,
+    sortBy: "published",
+    ignorePinnedSort: true,
   };
 }
 
@@ -456,7 +463,9 @@ export async function renderArchivePage(
         isAuthenticated={navData.isAuthenticated}
         sitePathPrefix={navData.sitePathPrefix}
         timeZone={appConfig.timeZone}
-        feedHref={`/archive/feed${feedQuery}`}
+        feedHref={
+          appConfig.rssFeedsEnabled ? `/archive/feed${feedQuery}` : undefined
+        }
       />
     ),
   });
@@ -615,6 +624,12 @@ async function buildArchiveFeedData(
   const collection = params.collectionSlug
     ? await services.collections.getBySlug(params.collectionSlug)
     : undefined;
+  const rssPublishedBefore = getRssPublishedBefore(
+    appConfig.rssPublishDelaySeconds,
+  );
+  const yearPublishedBefore = params.validYear
+    ? Date.UTC(params.validYear + 1, 0, 1) / 1000
+    : undefined;
 
   // Feed mirrors the unauthenticated archive page: published + non-private,
   // including Hidden-from-Latest. /archive is the canonical "all posts" view,
@@ -634,9 +649,12 @@ async function buildArchiveFeedData(
     ...(params.validYear
       ? {
           publishedAfter: Date.UTC(params.validYear, 0, 1) / 1000,
-          publishedBefore: Date.UTC(params.validYear + 1, 0, 1) / 1000,
         }
       : {}),
+    publishedBefore:
+      yearPublishedBefore === undefined
+        ? rssPublishedBefore
+        : Math.min(yearPublishedBefore, rssPublishedBefore),
     limit: appConfig.rssFeedLimit,
   };
 
@@ -648,7 +666,9 @@ async function buildArchiveFeedData(
   // Batch load media, aliases, and thread replies
   const postIds = posts.map((p) => p.id);
   const [threadMap, rawMediaMap, aliasesMap] = await Promise.all([
-    services.posts.getPublishedThreads(rootIds),
+    services.posts.getPublishedThreads(rootIds, {
+      publishedBefore: rssPublishedBefore,
+    }),
     services.media.getByPostIds(postIds),
     services.paths.getPostAliases(postIds),
   ]);
@@ -702,9 +722,9 @@ async function buildArchiveFeedData(
     aliasMap,
   ).map((postView, index) => {
     const post = posts[index] as (typeof posts)[number];
+    const thread = threadMap.get(post.id);
 
     // Build thread replies
-    const thread = threadMap.get(post.id);
     const replies =
       thread && thread.length > 1
         ? toPostViews(
@@ -720,7 +740,7 @@ async function buildArchiveFeedData(
 
     return {
       ...postView,
-      feedUpdatedAt: toISOString(post.lastActivityAt),
+      feedUpdatedAt: getFeedEntryUpdatedAt(post, thread),
       threadReplies: replies,
     };
   });
@@ -748,7 +768,7 @@ archiveRoutes.get("/feed", async (c) => {
   return new Response(defaultFeedRenderer(feedData), {
     headers: {
       "Content-Type": "application/atom+xml; charset=utf-8",
-      "Cache-Control": "public, max-age=180",
+      "Cache-Control": RSS_FEED_CACHE_CONTROL,
     },
   });
 });

package/src/routes/pages/collection.tsx

@@ -19,9 +19,13 @@ import {
 } from "../../lib/collection-sort.js";
 import { assembleCollectionTimeline } from "../../lib/timeline.js";
 import { defaultFeedRenderer } from "../../lib/feed.js";
+import {
+  getFeedEntryUpdatedAt,
+  getRssPublishedBefore,
+  RSS_FEED_CACHE_CONTROL,
+} from "../../lib/feed-policy.js";
 import { toPlainText as markdownToPlainText } from "../../lib/markdown.js";
 import { buildMediaMap } from "../../lib/media-helpers.js";
-import { toISOString } from "../../lib/time.js";
 import { createMediaContext, toPostViews } from "../../lib/view.js";
 import { toAbsoluteSiteUrl, toPublicPath } from "../../lib/url.js";
 import {
@@ -147,16 +151,17 @@ export async function renderCollectionPage(
   );
   const isAggregate = selection.collections.length > 1;
 
-  const ratedPostCount = await c.var.services.posts.countUpTo(
-    {
+  const ratedThreadCount =
+    await c.var.services.posts.countCollectionThreadRootsUpToForCollections(
       collectionIds,
-      status: "published",
-      excludePrivate: !navData.isAuthenticated,
-      hasRating: true,
-    },
-    2,
-  );
-  const showRatingSort = supportsCollectionRatingSort(ratedPostCount);
+      {
+        status: "published",
+        excludePrivate: !navData.isAuthenticated,
+        hasRating: true,
+      },
+      2,
+    );
+  const showRatingSort = supportsCollectionRatingSort(ratedThreadCount);
   const requestedDefaultSort = isAggregate
     ? "newest"
     : primaryCollection.sortOrder;
@@ -219,7 +224,17 @@ export async function renderCollectionPage(
         defaultSort={defaultSort}
         showRatingSort={showRatingSort}
         isAuthenticated={navData.isAuthenticated}
+        isInNavigation={navData.links.some(
+          (item) =>
+            item.type === "collection" &&
+            item.collectionId === primaryCollection.id,
+        )}
         sitePathPrefix={navData.sitePathPrefix}
+        feedHref={
+          c.var.appConfig.rssFeedsEnabled
+            ? `${canonicalPagePath}/feed`
+            : undefined
+        }
       />
     ),
   });
@@ -254,6 +269,9 @@ export async function renderCollectionFeed(
   const siteUrl = appConfig.siteUrl;
   const siteLanguage = appConfig.siteLanguage;
   const feedLimit = appConfig.rssFeedLimit;
+  const publishedBefore = getRssPublishedBefore(
+    appConfig.rssPublishDelaySeconds,
+  );
   const primaryCollection = selection.collections[0];
   if (!primaryCollection) return null;
 
@@ -264,6 +282,7 @@ export async function renderCollectionFeed(
         status: "published",
         excludePrivate: true,
         ignoreCollectionPinnedSort: true,
+        publishedBefore,
         limit: feedLimit,
       },
     );
@@ -274,7 +293,7 @@ export async function renderCollectionFeed(
 
   const postIds = posts.map((post) => post.id);
   const [threadMap, rawMediaMap, aliasesMap] = await Promise.all([
-    c.var.services.posts.getPublishedThreads(rootIds),
+    c.var.services.posts.getPublishedThreads(rootIds, { publishedBefore }),
     c.var.services.media.getByPostIds(postIds),
     c.var.services.paths.getPostAliases(postIds),
   ]);
@@ -345,15 +364,9 @@ export async function renderCollectionFeed(
           )
         : undefined;
 
-    // feedUpdatedAt = max(lastActivityAt, collectedAt)
-    const lastActivity = toISOString(post.lastActivityAt);
-    const collectedIso = collectedAt ? toISOString(collectedAt) : null;
-    const feedUpdatedAt =
-      collectedIso && collectedIso > lastActivity ? collectedIso : lastActivity;
-
     return {
       ...postView,
-      feedUpdatedAt,
+      feedUpdatedAt: getFeedEntryUpdatedAt(post, thread, [collectedAt]),
       threadReplies: replies,
     };
   });
@@ -382,7 +395,7 @@ export async function renderCollectionFeed(
   return new Response(xml, {
     headers: {
       "Content-Type": "application/atom+xml; charset=utf-8",
-      "Cache-Control": "public, max-age=180",
+      "Cache-Control": RSS_FEED_CACHE_CONTROL,
     },
   });
 }

package/src/routes/pages/collections.tsx

@@ -1,7 +1,7 @@
 /**
  * Collections Listing Page Route
  *
- * Lists all collections with their post counts.
+ * Lists all collections with their Thread counts.
  */
 
 import { Hono } from "hono";
@@ -70,6 +70,11 @@ collectionsPageRoutes.get("/", async (c) => {
       <CollectionsPage
         items={directoryData.items}
         isAuthenticated={navData.isAuthenticated ?? false}
+        navigationCollectionIds={navData.links.flatMap((item) =>
+          item.type === "collection" && item.collectionId
+            ? [item.collectionId]
+            : [],
+        )}
         sitePathPrefix={navData.sitePathPrefix}
         siteOrigin={c.var.appConfig.siteOrigin}
       />

package/src/routes/pages/page.tsx

@@ -5,14 +5,19 @@
  * Must be registered last.
  */
 
+import { msg } from "@lingui/core/macro";
 import { Hono, type Context } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../types/app-context.js";
+import { getI18n } from "../../i18n/index.js";
+import { requireAuth } from "../../middleware/auth.js";
 import { PostPage } from "../../ui/pages/PostPage.js";
+import { DraftPreviewBar } from "../../ui/shared/DraftPreviewBar.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { buildPageTitle } from "../../lib/page-title.js";
 import { buildPostMeta } from "../../lib/post-meta.js";
+import { isReservedPath } from "../../lib/constants.js";
 import {
   assemblePostPageDisplay,
   type PostPageDisplayData,
@@ -203,7 +208,7 @@ function canRenderDraftAboutEditor(
 async function renderPost(
   c: Context<Env>,
   post: Post,
-  options: { allowDraft?: boolean } = {},
+  options: { allowDraft?: boolean; isPreview?: boolean } = {},
 ) {
   // Start navData fetch immediately — it's independent of thread/media queries
   const navDataPromise = getNavigationData(c);
@@ -211,6 +216,7 @@ async function renderPost(
     // Private-post access is validated before renderPost() is called.
     isAuthenticated: true,
     allowDraft: options.allowDraft,
+    includeDraftThread: options.isPreview,
   });
   if (!display) {
     return c.notFound();
@@ -218,6 +224,37 @@ async function renderPost(
 
   const navData = await navDataPromise;
   const meta = buildPostMeta(post, navData.siteName);
+  const postView =
+    options.isPreview && display.postView.status === "draft"
+      ? {
+          ...display.postView,
+          permalink: toPublicPath(
+            `/preview/${display.postView.slug}`,
+            c.var.appConfig.sitePathPrefix,
+          ),
+        }
+      : display.postView;
+  const threadPostViews = options.isPreview
+    ? display.threadPostViews?.map((threadPost) =>
+        threadPost.status === "draft"
+          ? {
+              ...threadPost,
+              permalink: toPublicPath(
+                `/preview/${threadPost.slug}`,
+                c.var.appConfig.sitePathPrefix,
+              ),
+            }
+          : threadPost,
+      )
+    : display.threadPostViews;
+  const previewTitle = options.isPreview
+    ? getI18n(c)._(
+        msg({
+          message: "Draft preview",
+          comment: "@context: Browser title prefix for a draft preview page",
+        }),
+      )
+    : null;
   const canonicalHref = buildPostCanonicalHref(
     display.postView,
     display.threadPostViews,
@@ -225,7 +262,9 @@ async function renderPost(
   );
 
   return renderPublicPage(c, {
-    title: buildPageTitle(meta.title, navData.siteName),
+    title: previewTitle
+      ? buildPageTitle(previewTitle, meta.title, navData.siteName)
+      : buildPageTitle(meta.title, navData.siteName),
     description: meta.description,
     ...(post.status === "published"
       ? {
@@ -247,18 +286,59 @@ async function renderPost(
         }
       : {}),
     navData,
+    ...(options.isPreview
+      ? {
+          pageChrome: <DraftPreviewBar />,
+          showComposeDialog: false,
+          noindex: true,
+        }
+      : {}),
     content: (
-      <PostPage post={display.postView} threadPosts={display.threadPostViews} />
+      <PostPage
+        post={postView}
+        threadPosts={threadPostViews}
+        isPreview={options.isPreview}
+      />
     ),
   });
 }
 
+pageRoutes.get("/preview/:slug", requireAuth(), async (c) => {
+  const post = await c.var.services.posts.getBySlug(c.req.param("slug"));
+  if (!post) return c.notFound();
+
+  if (post.status === "published") {
+    return c.redirect(
+      toPublicPath(`/${post.slug}`, c.var.appConfig.sitePathPrefix),
+    );
+  }
+
+  c.header("Cache-Control", "private, no-store");
+  c.header("X-Robots-Tag", "noindex, nofollow");
+  return renderPost(c, post, { allowDraft: true, isPreview: true });
+});
+
 // Catch-all for path-registry backed post URLs, aliases, and redirects
 pageRoutes.get("/*", async (c) => {
   const fullPath = c.req.path.slice(1); // Remove leading /
   if (!fullPath) return c.notFound();
   const sitePathPrefix = c.var.appConfig.sitePathPrefix;
 
+  // Explicit application routes are registered before this catch-all. Any
+  // unmatched path under a reserved prefix is therefore an application 404,
+  // never a legacy alias or redirect from path_registry.
+  if (isReservedPath(fullPath)) return c.notFound();
+
+  // Stored redirects outrank the normal post/collection/deep-link resolvers,
+  // but can never shadow an explicit or reserved application route.
+  const resolved = await c.var.services.paths.resolve(fullPath);
+  if (resolved?.kind === "redirect" && resolved.redirectToPath) {
+    return c.redirect(
+      toPublicHref(`/${resolved.redirectToPath}`, sitePathPrefix),
+      resolved.redirectType ?? 301,
+    );
+  }
+
   if (fullPath.endsWith("/feed")) {
     const collectionPath = fullPath.slice(0, -"/feed".length);
     if (!collectionPath) return c.notFound();
@@ -360,16 +440,8 @@ pageRoutes.get("/*", async (c) => {
     }
   }
 
-  const resolved = await c.var.services.paths.resolve(fullPath);
   if (!resolved) return c.notFound();
 
-  if (resolved.kind === "redirect" && resolved.redirectToPath) {
-    return c.redirect(
-      toPublicHref(`/${resolved.redirectToPath}`, sitePathPrefix),
-      resolved.redirectType ?? 301,
-    );
-  }
-
   if (resolved.kind === "archive" && resolved.archiveQuery) {
     const overrides = Object.fromEntries(
       new URLSearchParams(resolved.archiveQuery),

package/src/routes/site-skill.ts

@@ -0,0 +1,18 @@
+import { Hono } from "hono";
+import { renderSiteSkill } from "../lib/site-skill.js";
+import type { Bindings } from "../types.js";
+import type { AppVariables } from "../types/app-context.js";
+
+type Env = { Bindings: Bindings; Variables: AppVariables };
+
+export const siteSkillRoutes = new Hono<Env>();
+
+siteSkillRoutes.get("/skill.md", (c) => {
+  return new Response(renderSiteSkill(c.var.appConfig.siteUrl), {
+    headers: {
+      "Cache-Control": "public, max-age=300, s-maxage=3600",
+      "Content-Type": "text/markdown; charset=utf-8",
+      "X-Robots-Tag": "noindex",
+    },
+  });
+});

package/src/services/__tests__/auth.test.ts

@@ -11,7 +11,7 @@ import {
   media,
   navItems,
   pathRegistry,
-  postCollections,
+  threadCollections,
   posts,
   session,
   settings as settingsTable,
@@ -165,9 +165,9 @@ describe("AuthService", () => {
       updatedAt: timestamp,
     });
 
-    await db.insert(postCollections).values({
+    await db.insert(threadCollections).values({
       siteId: DEFAULT_TEST_SITE_ID,
-      postId: "pst_01km9authdelete00000000000",
+      threadId: "pst_01km9authdelete00000000000",
       collectionId: "col_01km9authdelete00000000000",
       createdAt: timestamp,
     });
@@ -245,7 +245,9 @@ describe("AuthService", () => {
       const remainingDirectoryItems = await db
         .select()
         .from(collectionDirectoryItems);
-      const remainingPostCollections = await db.select().from(postCollections);
+      const remainingThreadCollections = await db
+        .select()
+        .from(threadCollections);
       const remainingNavItems = await db.select().from(navItems);
       const remainingApiTokens = await db.select().from(apiTokens);
       const existingSites = await db.select().from(sites);
@@ -262,7 +264,7 @@ describe("AuthService", () => {
       expect(remainingCollections).toHaveLength(0);
       expect(remainingPaths).toHaveLength(0);
       expect(remainingDirectoryItems).toHaveLength(0);
-      expect(remainingPostCollections).toHaveLength(0);
+      expect(remainingThreadCollections).toHaveLength(0);
       expect(remainingNavItems).toHaveLength(0);
       expect(remainingApiTokens).toHaveLength(0);
       expect(existingSites).toHaveLength(0);