@jant/core 0.3.23 → 0.3.24

package/src/routes/dash/posts.tsx

@@ -53,7 +53,7 @@ function NewPostContent({ collections }: { collections: Collection[] }) {
 // List posts
 postsRoutes.get("/", async (c) => {
   const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet", "unlisted", "draft"],
+    excludeReplies: true,
   });
   const siteName = await getSiteName(c);
 
@@ -89,25 +89,32 @@ postsRoutes.get("/new", async (c) => {
 // Create post
 postsRoutes.post("/", async (c) => {
   const body = await c.req.json<{
-    type: string;
+    format: string;
     title?: string;
-    content: string;
-    visibility: string;
-    sourceUrl?: string;
-    sourceName?: string;
-    path?: string;
+    body: string;
+    status: string;
+    featured?: boolean;
+    pinned?: boolean;
+    slug?: string;
+    url?: string;
+    quoteText?: string;
+    rating?: number;
+    collectionId?: number;
     mediaIds?: string[];
-    collectionIds?: number[];
   }>();
 
   const post = await c.var.services.posts.create({
-    type: body.type as Post["type"],
+    format: body.format as Post["format"],
     title: body.title || undefined,
-    content: body.content,
-    visibility: body.visibility as Post["visibility"],
-    sourceUrl: body.sourceUrl || undefined,
-    sourceName: body.sourceName || undefined,
-    path: body.path || undefined,
+    body: body.body,
+    status: body.status as Post["status"],
+    featured: body.featured,
+    pinned: body.pinned,
+    slug: body.slug || undefined,
+    url: body.url || undefined,
+    quoteText: body.quoteText || undefined,
+    rating: body.rating || undefined,
+    collectionId: body.collectionId || undefined,
   });
 
   // Attach media if provided
@@ -115,14 +122,6 @@ postsRoutes.post("/", async (c) => {
     await c.var.services.media.attachToPost(post.id, body.mediaIds);
   }
 
-  // Sync collection associations
-  if (body.collectionIds) {
-    await c.var.services.collections.syncPostCollections(
-      post.id,
-      body.collectionIds,
-    );
-  }
-
   return dsRedirect(`/dash/posts/${sqid.encode(post.id)}`);
 });
 
@@ -132,6 +131,7 @@ function ViewPostContent({ post }: { post: Post }) {
     message: "Post",
     comment: "@context: Default post title",
   });
+  const permalink = post.slug ? `/${post.slug}` : `/p/${sqid.encode(post.id)}`;
 
   return (
     <>
@@ -143,7 +143,7 @@ function ViewPostContent({ post }: { post: Post }) {
             message: "Edit",
             comment: "@context: Button to edit post",
           })}
-          viewHref={`/p/${sqid.encode(post.id)}`}
+          viewHref={permalink}
           viewLabel={t({
             message: "View",
             comment: "@context: Button to view post",
@@ -155,7 +155,7 @@ function ViewPostContent({ post }: { post: Post }) {
         <section>
           <div
             class="prose"
-            dangerouslySetInnerHTML={{ __html: post.contentHtml || "" }}
+            dangerouslySetInnerHTML={{ __html: post.bodyHtml || "" }}
           />
         </section>
       </div>
@@ -170,7 +170,6 @@ function EditPostContent({
   imageTransformUrl,
   s3PublicUrl,
   collections,
-  postCollectionIds,
 }: {
   post: Post;
   mediaAttachments: Media[];
@@ -178,7 +177,6 @@ function EditPostContent({
   imageTransformUrl?: string;
   s3PublicUrl?: string;
   collections: Collection[];
-  postCollectionIds: number[];
 }) {
   const { t } = useLingui();
   return (
@@ -194,7 +192,6 @@ function EditPostContent({
         imageTransformUrl={imageTransformUrl}
         s3PublicUrl={s3PublicUrl}
         collections={collections}
-        postCollectionIds={postCollectionIds}
       />
     </>
   );
@@ -237,9 +234,6 @@ postsRoutes.get("/:id/edit", async (c) => {
   const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
   const s3PublicUrl = c.env.S3_PUBLIC_URL;
   const collections = await c.var.services.collections.list();
-  const postCollections =
-    await c.var.services.collections.getCollectionsForPost(post.id);
-  const postCollectionIds = postCollections.map((col) => col.id);
 
   return c.html(
     <DashLayout
@@ -255,7 +249,6 @@ postsRoutes.get("/:id/edit", async (c) => {
         imageTransformUrl={imageTransformUrl}
         s3PublicUrl={s3PublicUrl}
         collections={collections}
-        postCollectionIds={postCollectionIds}
       />
     </DashLayout>,
   );
@@ -267,25 +260,32 @@ postsRoutes.post("/:id", async (c) => {
   if (!id) return c.notFound();
 
   const body = await c.req.json<{
-    type: string;
+    format: string;
     title?: string;
-    content?: string;
-    visibility: string;
-    sourceUrl?: string;
-    sourceName?: string;
-    path?: string;
+    body?: string;
+    status: string;
+    featured?: boolean;
+    pinned?: boolean;
+    slug?: string;
+    url?: string;
+    quoteText?: string;
+    rating?: number;
+    collectionId?: number;
     mediaIds?: string[];
-    collectionIds?: number[];
   }>();
 
   await c.var.services.posts.update(id, {
-    type: body.type as Post["type"],
+    format: body.format as Post["format"],
     title: body.title || null,
-    content: body.content || null,
-    visibility: body.visibility as Post["visibility"],
-    sourceUrl: body.sourceUrl || null,
-    sourceName: body.sourceName || null,
-    path: body.path || null,
+    body: body.body || null,
+    status: body.status as Post["status"],
+    featured: body.featured,
+    pinned: body.pinned,
+    slug: body.slug || null,
+    url: body.url || null,
+    quoteText: body.quoteText || null,
+    rating: body.rating || null,
+    collectionId: body.collectionId || null,
   });
 
   // Update media attachments if provided
@@ -293,14 +293,6 @@ postsRoutes.post("/:id", async (c) => {
     await c.var.services.media.attachToPost(id, body.mediaIds);
   }
 
-  // Sync collection associations
-  if (body.collectionIds !== undefined) {
-    await c.var.services.collections.syncPostCollections(
-      id,
-      body.collectionIds,
-    );
-  }
-
   return dsRedirect(`/dash/posts/${sqid.encode(id)}`);
 });
 

package/src/routes/feed/rss.ts

@@ -26,7 +26,8 @@ async function buildFeedData(c: Context<Env>): Promise<FeedData> {
   const siteLanguage = await getSiteLanguage(c);
 
   const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
+    status: "published",
+    excludeReplies: true,
     limit: 50,
   });
 

package/src/routes/feed/sitemap.ts

@@ -6,7 +6,11 @@ import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { defaultSitemapRenderer } from "../../lib/feed.js";
-import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import {
+  createMediaContext,
+  toPostViewsFromPosts,
+  toPageView,
+} from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -17,16 +21,22 @@ sitemapRoutes.get("/sitemap.xml", async (c) => {
   const siteUrl = c.env.SITE_URL;
 
   const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
+    status: "published",
+    excludeReplies: true,
     limit: 1000,
   });
 
-  // Transform to PostView[]
+  // Fetch published pages
+  const allPages = await c.var.services.pages.list();
+  const publishedPages = allPages.filter((p) => p.status === "published");
+
+  // Transform to View Models
   const mediaCtx = createMediaContext(c);
   const postViews = toPostViewsFromPosts(posts, mediaCtx);
+  const pageViews = publishedPages.map(toPageView);
 
   const renderer = c.var.config.theme?.feed?.sitemap ?? defaultSitemapRenderer;
-  const xml = renderer({ siteUrl, posts: postViews });
+  const xml = renderer({ siteUrl, posts: postViews, pages: pageViews });
 
   return new Response(xml, {
     headers: {

package/src/routes/pages/archive.tsx

@@ -1,14 +1,14 @@
 /**
  * Archive Page Route
  *
- * Shows all posts, optionally filtered by type
+ * Shows all posts, optionally filtered by format or featured status
  */
 
 import { Hono } from "hono";
-import type { Bindings, PostType } from "../../types.js";
+import type { Bindings, Format } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { POST_TYPES } from "../../types.js";
-import { ArchivePage as DefaultArchivePage } from "../../themes/minimal/pages/ArchivePage.js";
+import { FORMATS } from "../../types.js";
+import { ArchivePage as DefaultArchivePage } from "../../themes/threads/pages/ArchivePage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { createMediaContext, toArchiveGroups } from "../../lib/view.js";
@@ -21,9 +21,11 @@ export const archiveRoutes = new Hono<Env>();
 
 // Archive page - all posts
 archiveRoutes.get("/", async (c) => {
-  const typeParam = c.req.query("type") as PostType | undefined;
-  const type =
-    typeParam && POST_TYPES.includes(typeParam) ? typeParam : undefined;
+  const formatParam = c.req.query("format") as Format | undefined;
+  const format =
+    formatParam && FORMATS.includes(formatParam) ? formatParam : undefined;
+  const featuredParam = c.req.query("featured");
+  const featured = featuredParam === "true" ? true : undefined;
 
   // Parse cursor
   const cursorParam = c.req.query("cursor");
@@ -33,8 +35,9 @@ archiveRoutes.get("/", async (c) => {
 
   // Fetch one extra to check for more
   const posts = await c.var.services.posts.list({
-    type,
-    visibility: ["featured", "quiet"],
+    format,
+    status: "published",
+    featured,
     excludeReplies: true,
     cursor,
     limit: PAGE_SIZE + 1,
@@ -77,7 +80,8 @@ archiveRoutes.get("/", async (c) => {
         groups={groups}
         hasMore={hasMore}
         nextCursor={nextCursor}
-        type={type}
+        format={format}
+        featured={featured}
         theme={components}
       />
     ),

package/src/routes/pages/collection.tsx

@@ -5,7 +5,7 @@
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { CollectionPage as DefaultCollectionPage } from "../../themes/minimal/pages/CollectionPage.js";
+import { CollectionPage as DefaultCollectionPage } from "../../themes/threads/pages/CollectionPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
 import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
@@ -14,13 +14,19 @@ type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const collectionRoutes = new Hono<Env>();
 
-collectionRoutes.get("/:path", async (c) => {
-  const path = c.req.param("path");
+collectionRoutes.get("/:slug", async (c) => {
+  const slug = c.req.param("slug");
 
-  const collection = await c.var.services.collections.getByPath(path);
+  const collection = await c.var.services.collections.getBySlug(slug);
   if (!collection) return c.notFound();
 
-  const posts = await c.var.services.collections.getPosts(collection.id);
+  // Fetch posts in this collection
+  const posts = await c.var.services.posts.list({
+    collectionId: collection.id,
+    status: "published",
+    excludeReplies: true,
+  });
+
   const navData = await getNavigationData(c);
 
   // Transform to View Models
@@ -35,7 +41,12 @@ collectionRoutes.get("/:path", async (c) => {
     description: collection.description ?? undefined,
     navData,
     content: (
-      <Page collection={collection} posts={postViews} theme={components} />
+      <Page
+        collection={collection}
+        posts={postViews}
+        hasMore={false}
+        theme={components}
+      />
     ),
   });
 });

package/src/routes/pages/home.tsx

@@ -2,109 +2,83 @@
  * Home Page Route
  *
  * Timeline feed with per-type card components and thread previews.
+ * Handles both full-page rendering and load-more SSE responses.
  */
 
 import { Hono } from "hono";
-import type { Bindings, TimelineItemView } from "../../types.js";
+import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { buildMediaMap } from "../../lib/media-helpers.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { HomePage as DefaultHomePage } from "../../themes/minimal/pages/HomePage.js";
-import { createMediaContext, toPostView, toPostViews } from "../../lib/view.js";
+import { assembleTimeline } from "../../lib/timeline.js";
+import { sse } from "../../lib/sse.js";
+import { createMediaContext, toPostViewsFromPosts } from "../../lib/view.js";
+import { HomePage as DefaultHomePage } from "../../themes/threads/pages/HomePage.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
-const PAGE_SIZE = 20;
-
 export const homeRoutes = new Hono<Env>();
 
 homeRoutes.get("/", async (c) => {
-  const navData = await getNavigationData(c);
+  const cursorParam = c.req.query("cursor");
+  const cursor = cursorParam ? parseInt(cursorParam, 10) : undefined;
+  const lastDate = c.req.query("lastDate");
 
-  // Fetch one extra to determine if there are more
-  const posts = await c.var.services.posts.list({
-    visibility: ["featured", "quiet"],
-    excludeReplies: true,
-    excludeTypes: ["page"],
-    limit: PAGE_SIZE + 1,
+  const { items, hasMore, nextCursor } = await assembleTimeline(c, {
+    cursor: cursor && !isNaN(cursor) ? cursor : undefined,
   });
 
-  const hasMore = posts.length > PAGE_SIZE;
-  const displayPosts = hasMore ? posts.slice(0, PAGE_SIZE) : posts;
-
-  // Batch load media attachments
-  const postIds = displayPosts.map((p) => p.id);
-  const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
-  const mediaCtx = createMediaContext(c);
-  const mediaMap = buildMediaMap(
-    rawMediaMap,
-    mediaCtx.r2PublicUrl,
-    mediaCtx.imageTransformUrl,
-    mediaCtx.s3PublicUrl,
-  );
-
-  // Get reply counts to identify thread roots
-  const replyCounts = await c.var.services.posts.getReplyCounts(postIds);
-  const threadRootIds = postIds.filter((id) => (replyCounts.get(id) ?? 0) > 0);
-
-  // Batch load thread previews
-  const threadPreviews = await c.var.services.posts.getThreadPreviews(
-    threadRootIds,
-    3,
-  );
-
-  // Batch load media for preview replies
-  const previewReplyIds: number[] = [];
-  for (const replies of threadPreviews.values()) {
-    for (const reply of replies) {
-      previewReplyIds.push(reply.id);
+  // SSE load-more response
+  if (cursor && !isNaN(cursor)) {
+    if (items.length === 0) {
+      return sse(c, async (stream) => {
+        stream.remove("#load-more-container");
+      });
     }
-  }
-  const previewMediaMap =
-    previewReplyIds.length > 0
-      ? buildMediaMap(
-          await c.var.services.media.getByPostIds(previewReplyIds),
-          mediaCtx.r2PublicUrl,
-          mediaCtx.imageTransformUrl,
-          mediaCtx.s3PublicUrl,
-        )
-      : new Map();
 
-  // Assemble timeline items with View Models
-  const items: TimelineItemView[] = displayPosts.map((post) => {
-    const postView = toPostView(
-      { ...post, mediaAttachments: mediaMap.get(post.id) ?? [] },
-      mediaCtx,
-    );
+    const themeConfig = c.var.config.theme;
+    const renderMore = themeConfig?.timelineMore;
+    if (!renderMore) {
+      // Should never happen — default theme always provides timelineMore
+      return sse(c, async (stream) => {
+        stream.remove("#load-more-container");
+      });
+    }
 
-    const replyCount = replyCounts.get(post.id) ?? 0;
-    const previewReplies = threadPreviews.get(post.id);
+    const patches = renderMore({
+      items,
+      lastDate: lastDate ?? undefined,
+      hasMore,
+      nextCursor,
+      theme: themeConfig?.components,
+    });
+
+    return sse(c, async (stream) => {
+      for (const patch of patches) {
+        if (patch.mode === "remove") {
+          stream.remove(patch.selector);
+        } else {
+          stream.patchElements(patch.content, {
+            mode: patch.mode,
+            selector: patch.selector,
+          });
+        }
+      }
+    });
+  }
 
-    if (replyCount > 0 && previewReplies) {
-      return {
-        post: postView,
-        threadPreview: {
-          replies: toPostViews(
-            previewReplies.map((r) => ({
-              ...r,
-              mediaAttachments: previewMediaMap.get(r.id) ?? [],
-            })),
-            mediaCtx,
-          ),
-          totalReplyCount: replyCount,
-        },
-      };
-    }
+  // Full page render
+  const navData = await getNavigationData(c);
 
-    return { post: postView };
+  // Fetch pinned posts
+  const pinnedPosts = await c.var.services.posts.list({
+    pinned: true,
+    status: "published",
+    excludeReplies: true,
   });
+  const mediaCtx = createMediaContext(c);
+  const pinnedItems = toPostViewsFromPosts(pinnedPosts, mediaCtx);
 
-  // Determine next cursor
-  const lastPost = displayPosts[displayPosts.length - 1];
-  const nextCursor = hasMore && lastPost ? lastPost.id : undefined;
-
-  // Resolve page component
   const components = c.var.config.theme?.components;
   const Page = components?.HomePage ?? DefaultHomePage;
 
@@ -114,6 +88,7 @@ homeRoutes.get("/", async (c) => {
     content: (
       <Page
         items={items}
+        pinnedItems={pinnedItems}
         hasMore={hasMore}
         nextCursor={nextCursor}
         theme={components}

package/src/routes/pages/page.tsx

@@ -1,51 +1,88 @@
 /**
  * Custom Page Route
  *
- * Catch-all route for custom pages accessible via their path field
+ * Serves pages from the pages table and posts with custom slugs.
+ * This is a catch-all route mounted at "/" - must be registered last.
  */
 
 import { Hono } from "hono";
 import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
-import { SinglePage as DefaultSinglePage } from "../../themes/minimal/pages/SinglePage.js";
+import { SinglePage as DefaultSinglePage } from "../../themes/threads/pages/SinglePage.js";
+import { PostPage as DefaultPostPage } from "../../themes/threads/pages/PostPage.js";
 import { getNavigationData } from "../../lib/navigation.js";
 import { renderPublicPage } from "../../lib/render.js";
-import { createMediaContext, toPostViewFromPost } from "../../lib/view.js";
+import { buildMediaMap } from "../../lib/media-helpers.js";
+import { createMediaContext, toPageView, toPostView } from "../../lib/view.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const pageRoutes = new Hono<Env>();
 
-// Catch-all for custom page paths
-pageRoutes.get("/:path", async (c) => {
-  const path = c.req.param("path");
+// Catch-all for custom page paths and post slugs
+pageRoutes.get("/:slug", async (c) => {
+  const slug = c.req.param("slug");
 
-  // Look up page by path
-  const page = await c.var.services.posts.getByPath(path);
+  // First, try to find a page by slug
+  const page = await c.var.services.pages.getBySlug(slug);
 
-  // Not found or not a page
-  if (!page || page.type !== "page") {
-    return c.notFound();
-  }
+  if (page) {
+    // Don't show draft pages
+    if (page.status === "draft") {
+      return c.notFound();
+    }
+
+    const navData = await getNavigationData(c);
+    const pageView = toPageView(page);
 
-  // Don't show drafts
-  if (page.visibility === "draft") {
-    return c.notFound();
+    const components = c.var.config.theme?.components;
+    const Page = components?.SinglePage ?? DefaultSinglePage;
+
+    return renderPublicPage(c, {
+      title: `${page.title || slug} - ${navData.siteName}`,
+      description: page.body?.slice(0, 160),
+      navData,
+      content: <Page page={pageView} theme={components} />,
+    });
   }
 
-  const navData = await getNavigationData(c);
+  // Then, try to find a post by slug
+  const post = await c.var.services.posts.getBySlug(slug);
+
+  if (post) {
+    // Don't show draft posts
+    if (post.status === "draft") {
+      return c.notFound();
+    }
 
-  // Transform to View Model
-  const mediaCtx = createMediaContext(c);
-  const pageView = toPostViewFromPost(page, mediaCtx);
+    // Load media attachments
+    const rawMediaMap = await c.var.services.media.getByPostIds([post.id]);
+    const mediaCtx = createMediaContext(c);
+    const mediaMap = buildMediaMap(
+      rawMediaMap,
+      mediaCtx.r2PublicUrl,
+      mediaCtx.imageTransformUrl,
+      mediaCtx.s3PublicUrl,
+    );
 
-  const components = c.var.config.theme?.components;
-  const Page = components?.SinglePage ?? DefaultSinglePage;
+    const postView = toPostView(
+      { ...post, mediaAttachments: mediaMap.get(post.id) ?? [] },
+      mediaCtx,
+    );
+
+    const navData = await getNavigationData(c);
+    const title = post.title || navData.siteName;
+
+    const components = c.var.config.theme?.components;
+    const PostPage = components?.PostPage ?? DefaultPostPage;
+
+    return renderPublicPage(c, {
+      title,
+      description: post.body?.slice(0, 160),
+      navData,
+      content: <PostPage post={postView} theme={components} />,
+    });
+  }
 
-  return renderPublicPage(c, {
-    title: `${page.title} - ${navData.siteName}`,
-    description: page.content?.slice(0, 160),
-    navData,
-    content: <Page page={pageView} theme={components} />,
-  });
+  return c.notFound();
 });