@jant/core 0.3.6 → 0.3.7

package/src/routes/dash/posts.tsx

@@ -5,7 +5,7 @@ import { getSiteName } from "../../lib/config.js";
 
 import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
-import type { Bindings, Post } from "../../types.js";
+import type { Bindings, Post, Media, Collection } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { DashLayout } from "../../theme/layouts/index.js";
 import {
@@ -38,14 +38,14 @@ function PostsListContent({ posts }: { posts: Post[] }) {
   );
 }
 
-function NewPostContent() {
+function NewPostContent({ collections }: { collections: Collection[] }) {
   const { t } = useLingui();
   return (
     <>
       <h1 class="text-2xl font-semibold mb-6">
         {t({ message: "New Post", comment: "@context: Page heading" })}
       </h1>
-      <PostForm action="/dash/posts" />
+      <PostForm action="/dash/posts" collections={collections} />
     </>
   );
 }
@@ -72,6 +72,7 @@ postsRoutes.get("/", async (c) => {
 // New post form
 postsRoutes.get("/new", async (c) => {
   const siteName = await getSiteName(c);
+  const collections = await c.var.services.collections.list();
 
   return c.html(
     <DashLayout
@@ -80,7 +81,7 @@ postsRoutes.get("/new", async (c) => {
       siteName={siteName}
       currentPath="/dash/posts"
     >
-      <NewPostContent />
+      <NewPostContent collections={collections} />
     </DashLayout>,
   );
 });
@@ -93,7 +94,10 @@ postsRoutes.post("/", async (c) => {
     content: string;
     visibility: string;
     sourceUrl?: string;
+    sourceName?: string;
     path?: string;
+    mediaIds?: string[];
+    collectionIds?: number[];
   }>();
 
   const post = await c.var.services.posts.create({
@@ -102,9 +106,23 @@ postsRoutes.post("/", async (c) => {
     content: body.content,
     visibility: body.visibility as Post["visibility"],
     sourceUrl: body.sourceUrl || undefined,
+    sourceName: body.sourceName || undefined,
     path: body.path || undefined,
   });
 
+  // Attach media if provided
+  if (body.mediaIds && body.mediaIds.length > 0) {
+    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)}`);
 });
 
@@ -145,14 +163,36 @@ function ViewPostContent({ post }: { post: Post }) {
   );
 }
 
-function EditPostContent({ post }: { post: Post }) {
+function EditPostContent({
+  post,
+  mediaAttachments,
+  r2PublicUrl,
+  imageTransformUrl,
+  collections,
+  postCollectionIds,
+}: {
+  post: Post;
+  mediaAttachments: Media[];
+  r2PublicUrl?: string;
+  imageTransformUrl?: string;
+  collections: Collection[];
+  postCollectionIds: number[];
+}) {
   const { t } = useLingui();
   return (
     <>
       <h1 class="text-2xl font-semibold mb-6">
         {t({ message: "Edit Post", comment: "@context: Page heading" })}
       </h1>
-      <PostForm post={post} action={`/dash/posts/${sqid.encode(post.id)}`} />
+      <PostForm
+        post={post}
+        action={`/dash/posts/${sqid.encode(post.id)}`}
+        mediaAttachments={mediaAttachments}
+        r2PublicUrl={r2PublicUrl}
+        imageTransformUrl={imageTransformUrl}
+        collections={collections}
+        postCollectionIds={postCollectionIds}
+      />
     </>
   );
 }
@@ -189,6 +229,13 @@ postsRoutes.get("/:id/edit", async (c) => {
   if (!post) return c.notFound();
 
   const siteName = await getSiteName(c);
+  const mediaAttachments = await c.var.services.media.getByPostId(post.id);
+  const r2PublicUrl = c.env.R2_PUBLIC_URL;
+  const imageTransformUrl = c.env.IMAGE_TRANSFORM_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
@@ -197,7 +244,14 @@ postsRoutes.get("/:id/edit", async (c) => {
       siteName={siteName}
       currentPath="/dash/posts"
     >
-      <EditPostContent post={post} />
+      <EditPostContent
+        post={post}
+        mediaAttachments={mediaAttachments}
+        r2PublicUrl={r2PublicUrl}
+        imageTransformUrl={imageTransformUrl}
+        collections={collections}
+        postCollectionIds={postCollectionIds}
+      />
     </DashLayout>,
   );
 });
@@ -213,7 +267,10 @@ postsRoutes.post("/:id", async (c) => {
     content?: string;
     visibility: string;
     sourceUrl?: string;
+    sourceName?: string;
     path?: string;
+    mediaIds?: string[];
+    collectionIds?: number[];
   }>();
 
   await c.var.services.posts.update(id, {
@@ -222,9 +279,23 @@ postsRoutes.post("/:id", async (c) => {
     content: body.content || null,
     visibility: body.visibility as Post["visibility"],
     sourceUrl: body.sourceUrl || null,
+    sourceName: body.sourceName || null,
     path: body.path || null,
   });
 
+  // Update media attachments if provided
+  if (body.mediaIds !== undefined) {
+    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)}`);
 });
 
@@ -233,6 +304,7 @@ postsRoutes.post("/:id/delete", async (c) => {
   const id = sqid.decode(c.req.param("id"));
   if (!id) return c.notFound();
 
+  await c.var.services.media.detachFromPost(id);
   await c.var.services.posts.delete(id);
 
   return dsRedirect("/dash/posts");

package/src/routes/feed/rss.ts

@@ -7,6 +7,7 @@ import type { Bindings } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getMediaUrl } from "../../lib/image.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
@@ -18,25 +19,37 @@ rssRoutes.get("/", async (c) => {
   const siteName = all["SITE_NAME"] ?? "Jant";
   const siteDescription = all["SITE_DESCRIPTION"] ?? "";
   const siteUrl = c.env.SITE_URL;
+  const r2PublicUrl = c.env.R2_PUBLIC_URL;
 
   const posts = await c.var.services.posts.list({
     visibility: ["featured", "quiet"],
     limit: 50,
   });
 
+  // Batch load media for enclosures
+  const postIds = posts.map((p) => p.id);
+  const mediaMap = await c.var.services.media.getByPostIds(postIds);
+
   const items = posts
     .map((post) => {
       const link = `${siteUrl}/p/${sqid.encode(post.id)}`;
       const title = post.title || `Post #${post.id}`;
       const pubDate = new Date(post.publishedAt * 1000).toUTCString();
 
+      // Add enclosure for first media attachment
+      const postMedia = mediaMap.get(post.id);
+      const firstMedia = postMedia?.[0];
+      const enclosure = firstMedia
+        ? `\n      <enclosure url="${getMediaUrl(firstMedia.id, firstMedia.r2Key, r2PublicUrl)}" length="${firstMedia.size}" type="${firstMedia.mimeType}"/>`
+        : "";
+
       return `
     <item>
       <title><![CDATA[${escapeXml(title)}]]></title>
       <link>${link}</link>
       <guid isPermaLink="true">${link}</guid>
       <pubDate>${pubDate}</pubDate>
-      <description><![CDATA[${post.contentHtml || ""}]]></description>
+      <description><![CDATA[${post.contentHtml || ""}]]></description>${enclosure}
     </item>`;
     })
     .join("");

package/src/routes/pages/home.tsx

@@ -4,18 +4,28 @@
 
 import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
-import type { Bindings, Post } from "../../types.js";
+import type { Bindings, Post, MediaAttachment } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { BaseLayout } from "../../theme/layouts/index.js";
+import { MediaGallery } from "../../theme/components/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
 import { getSiteName } from "../../lib/config.js";
+import { getMediaUrl, getImageUrl } from "../../lib/image.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const homeRoutes = new Hono<Env>();
 
-function HomeContent({ siteName, posts }: { siteName: string; posts: Post[] }) {
+function HomeContent({
+  siteName,
+  posts,
+  mediaMap,
+}: {
+  siteName: string;
+  posts: Post[];
+  mediaMap: Map<number, MediaAttachment[]>;
+}) {
   const { t } = useLingui();
 
   return (
@@ -47,40 +57,46 @@ function HomeContent({ siteName, posts }: { siteName: string; posts: Post[] }) {
             })}
           </p>
         ) : (
-          posts.map((post) => (
-            <article key={post.id} class="h-entry">
-              {post.title && (
-                <h2 class="p-name text-lg font-medium mb-2">
-                  <a
-                    href={`/p/${sqid.encode(post.id)}`}
-                    class="u-url hover:underline"
-                  >
-                    {post.title}
-                  </a>
-                </h2>
-              )}
-              <div
-                class="e-content prose prose-sm"
-                dangerouslySetInnerHTML={{ __html: post.contentHtml || "" }}
-              />
-              <footer class="mt-2 text-sm text-muted-foreground">
-                <time
-                  class="dt-published"
-                  datetime={time.toISOString(post.publishedAt)}
-                >
-                  {time.formatDate(post.publishedAt)}
-                </time>
-                {post.visibility === "featured" && (
-                  <span class="ml-2 text-xs">
-                    {t({
-                      message: "Featured",
-                      comment: "@context: Post visibility badge",
-                    })}
-                  </span>
+          posts.map((post) => {
+            const attachments = mediaMap.get(post.id) ?? [];
+            return (
+              <article key={post.id} class="h-entry">
+                {post.title && (
+                  <h2 class="p-name text-lg font-medium mb-2">
+                    <a
+                      href={`/p/${sqid.encode(post.id)}`}
+                      class="u-url hover:underline"
+                    >
+                      {post.title}
+                    </a>
+                  </h2>
+                )}
+                <div
+                  class="e-content prose prose-sm"
+                  dangerouslySetInnerHTML={{ __html: post.contentHtml || "" }}
+                />
+                {attachments.length > 0 && (
+                  <MediaGallery attachments={attachments} />
                 )}
-              </footer>
-            </article>
-          ))
+                <footer class="mt-2 text-sm text-muted-foreground">
+                  <time
+                    class="dt-published"
+                    datetime={time.toISOString(post.publishedAt)}
+                  >
+                    {time.formatDate(post.publishedAt)}
+                  </time>
+                  {post.visibility === "featured" && (
+                    <span class="ml-2 text-xs">
+                      {t({
+                        message: "Featured",
+                        comment: "@context: Post visibility badge",
+                      })}
+                    </span>
+                  )}
+                </footer>
+              </article>
+            );
+          })
         )}
       </main>
 
@@ -109,9 +125,37 @@ homeRoutes.get("/", async (c) => {
     limit: 20,
   });
 
+  // Batch load media attachments
+  const postIds = posts.map((p) => p.id);
+  const rawMediaMap = await c.var.services.media.getByPostIds(postIds);
+  const r2PublicUrl = c.env.R2_PUBLIC_URL;
+  const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+
+  const mediaMap = new Map<number, MediaAttachment[]>();
+  for (const [postId, mediaList] of rawMediaMap) {
+    mediaMap.set(
+      postId,
+      mediaList.map((m) => ({
+        id: m.id,
+        url: getMediaUrl(m.id, m.r2Key, r2PublicUrl),
+        previewUrl: getImageUrl(
+          getMediaUrl(m.id, m.r2Key, r2PublicUrl),
+          imageTransformUrl,
+          { width: 400, quality: 80, format: "auto", fit: "cover" },
+        ),
+        alt: m.alt,
+        blurhash: m.blurhash,
+        width: m.width,
+        height: m.height,
+        position: m.position,
+        mimeType: m.mimeType,
+      })),
+    );
+  }
+
   return c.html(
     <BaseLayout title={siteName} c={c}>
-      <HomeContent siteName={siteName} posts={posts} />
+      <HomeContent siteName={siteName} posts={posts} mediaMap={mediaMap} />
     </BaseLayout>,
   );
 });

package/src/routes/pages/post.tsx

@@ -5,17 +5,25 @@ import { getSiteName } from "../../lib/config.js";
 
 import { Hono } from "hono";
 import { useLingui } from "@lingui/react/macro";
-import type { Bindings, Post } from "../../types.js";
+import type { Bindings, Post, MediaAttachment } from "../../types.js";
 import type { AppVariables } from "../../app.js";
 import { BaseLayout } from "../../theme/layouts/index.js";
+import { MediaGallery } from "../../theme/components/index.js";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getMediaUrl, getImageUrl } from "../../lib/image.js";
 
 type Env = { Bindings: Bindings; Variables: AppVariables };
 
 export const postRoutes = new Hono<Env>();
 
-function PostContent({ post }: { post: Post }) {
+function PostContent({
+  post,
+  mediaAttachments,
+}: {
+  post: Post;
+  mediaAttachments: MediaAttachment[];
+}) {
   const { t } = useLingui();
 
   return (
@@ -30,6 +38,10 @@ function PostContent({ post }: { post: Post }) {
           dangerouslySetInnerHTML={{ __html: post.contentHtml || "" }}
         />
 
+        {mediaAttachments.length > 0 && (
+          <MediaGallery attachments={mediaAttachments} />
+        )}
+
         <footer class="mt-6 pt-4 border-t text-sm text-muted-foreground">
           <time
             class="dt-published"
@@ -82,12 +94,33 @@ postRoutes.get("/:id", async (c) => {
     return c.notFound();
   }
 
+  // Load media attachments
+  const rawMedia = await c.var.services.media.getByPostId(post.id);
+  const r2PublicUrl = c.env.R2_PUBLIC_URL;
+  const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+
+  const mediaAttachments: MediaAttachment[] = rawMedia.map((m) => ({
+    id: m.id,
+    url: getMediaUrl(m.id, m.r2Key, r2PublicUrl),
+    previewUrl: getImageUrl(
+      getMediaUrl(m.id, m.r2Key, r2PublicUrl),
+      imageTransformUrl,
+      { width: 400, quality: 80, format: "auto", fit: "cover" },
+    ),
+    alt: m.alt,
+    blurhash: m.blurhash,
+    width: m.width,
+    height: m.height,
+    position: m.position,
+    mimeType: m.mimeType,
+  }));
+
   const siteName = await getSiteName(c);
   const title = post.title || siteName;
 
   return c.html(
     <BaseLayout title={title} description={post.content?.slice(0, 160)} c={c}>
-      <PostContent post={post} />
+      <PostContent post={post} mediaAttachments={mediaAttachments} />
     </BaseLayout>,
   );
 });

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

@@ -223,4 +223,106 @@ describe("CollectionService", () => {
       expect(posts).toEqual([]);
     });
   });
+
+  describe("syncPostCollections", () => {
+    it("adds collections to a post with no existing collections", async () => {
+      const col1 = await collectionService.create({ title: "Col 1" });
+      const col2 = await collectionService.create({ title: "Col 2" });
+      const post = await postService.create({
+        type: "note",
+        content: "test",
+      });
+
+      await collectionService.syncPostCollections(post.id, [col1.id, col2.id]);
+
+      const collections = await collectionService.getCollectionsForPost(
+        post.id,
+      );
+      expect(collections).toHaveLength(2);
+      expect(collections.map((c) => c.id).sort()).toEqual(
+        [col1.id, col2.id].sort(),
+      );
+    });
+
+    it("removes collections no longer in the list", async () => {
+      const col1 = await collectionService.create({ title: "Col 1" });
+      const col2 = await collectionService.create({ title: "Col 2" });
+      const post = await postService.create({
+        type: "note",
+        content: "test",
+      });
+
+      await collectionService.addPost(col1.id, post.id);
+      await collectionService.addPost(col2.id, post.id);
+
+      // Sync with only col1 — col2 should be removed
+      await collectionService.syncPostCollections(post.id, [col1.id]);
+
+      const collections = await collectionService.getCollectionsForPost(
+        post.id,
+      );
+      expect(collections).toHaveLength(1);
+      expect(collections[0]?.id).toBe(col1.id);
+    });
+
+    it("handles mixed adds and removes", async () => {
+      const col1 = await collectionService.create({ title: "Col 1" });
+      const col2 = await collectionService.create({ title: "Col 2" });
+      const col3 = await collectionService.create({ title: "Col 3" });
+      const post = await postService.create({
+        type: "note",
+        content: "test",
+      });
+
+      // Start with col1 and col2
+      await collectionService.addPost(col1.id, post.id);
+      await collectionService.addPost(col2.id, post.id);
+
+      // Sync to col2 and col3 (remove col1, keep col2, add col3)
+      await collectionService.syncPostCollections(post.id, [col2.id, col3.id]);
+
+      const collections = await collectionService.getCollectionsForPost(
+        post.id,
+      );
+      expect(collections).toHaveLength(2);
+      expect(collections.map((c) => c.id).sort()).toEqual(
+        [col2.id, col3.id].sort(),
+      );
+    });
+
+    it("removes all collections when synced with empty array", async () => {
+      const col1 = await collectionService.create({ title: "Col 1" });
+      const post = await postService.create({
+        type: "note",
+        content: "test",
+      });
+
+      await collectionService.addPost(col1.id, post.id);
+
+      await collectionService.syncPostCollections(post.id, []);
+
+      const collections = await collectionService.getCollectionsForPost(
+        post.id,
+      );
+      expect(collections).toHaveLength(0);
+    });
+
+    it("is a no-op when already in sync", async () => {
+      const col1 = await collectionService.create({ title: "Col 1" });
+      const post = await postService.create({
+        type: "note",
+        content: "test",
+      });
+
+      await collectionService.addPost(col1.id, post.id);
+
+      await collectionService.syncPostCollections(post.id, [col1.id]);
+
+      const collections = await collectionService.getCollectionsForPost(
+        post.id,
+      );
+      expect(collections).toHaveLength(1);
+      expect(collections[0]?.id).toBe(col1.id);
+    });
+  });
 });