@jant/core 0.3.6 → 0.3.7

package/dist/routes/api/posts.js

@@ -2,9 +2,32 @@
  * Posts API Routes
  */ import { Hono } from "hono";
 import * as sqid from "../../lib/sqid.js";
-import { CreatePostSchema, UpdatePostSchema } from "../../lib/schemas.js";
+import { CreatePostSchema, UpdatePostSchema, validateMediaForPostType } from "../../lib/schemas.js";
 import { requireAuthApi } from "../../middleware/auth.js";
+import { getMediaUrl, getImageUrl } from "../../lib/image.js";
 export const postsApiRoutes = new Hono();
+/**
+ * Converts a Media record to a MediaAttachment API response shape.
+ */ function toMediaAttachment(m, r2PublicUrl, imageTransformUrl) {
+    const url = getMediaUrl(m.id, m.r2Key, r2PublicUrl);
+    const previewUrl = getImageUrl(url, imageTransformUrl, {
+        width: 400,
+        quality: 80,
+        format: "auto",
+        fit: "cover"
+    });
+    return {
+        id: m.id,
+        url,
+        previewUrl,
+        alt: m.alt,
+        blurhash: m.blurhash,
+        width: m.width,
+        height: m.height,
+        position: m.position,
+        mimeType: m.mimeType
+    };
+}
 // List posts
 postsApiRoutes.get("/", async (c)=>{
     const type = c.req.query("type");
@@ -22,10 +45,16 @@ postsApiRoutes.get("/", async (c)=>{
         cursor: cursor ? sqid.decode(cursor) ?? undefined : undefined,
         limit
     });
+    // Batch load media for all posts
+    const postIds = posts.map((p)=>p.id);
+    const mediaMap = await c.var.services.media.getByPostIds(postIds);
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
     return c.json({
         posts: posts.map((p)=>({
                 ...p,
-                sqid: sqid.encode(p.id)
+                sqid: sqid.encode(p.id),
+                mediaAttachments: (mediaMap.get(p.id) ?? []).map((m)=>toMediaAttachment(m, r2PublicUrl, imageTransformUrl))
             })),
         nextCursor: posts.length === limit ? sqid.encode(posts[posts.length - 1]?.id ?? 0) : null
     });
@@ -40,9 +69,13 @@ postsApiRoutes.get("/:id", async (c)=>{
     if (!post) return c.json({
         error: "Not found"
     }, 404);
+    const mediaList = await c.var.services.media.getByPostId(post.id);
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
     return c.json({
         ...post,
-        sqid: sqid.encode(post.id)
+        sqid: sqid.encode(post.id),
+        mediaAttachments: mediaList.map((m)=>toMediaAttachment(m, r2PublicUrl, imageTransformUrl))
     });
 });
 // Create post (requires auth)
@@ -57,6 +90,24 @@ postsApiRoutes.post("/", requireAuthApi(), async (c)=>{
         }, 400);
     }
     const body = parseResult.data;
+    // Validate media for post type
+    if (body.mediaIds) {
+        const mediaError = validateMediaForPostType(body.type, body.mediaIds);
+        if (mediaError) {
+            return c.json({
+                error: mediaError
+            }, 400);
+        }
+        // Verify all media IDs exist
+        if (body.mediaIds.length > 0) {
+            const existing = await c.var.services.media.getByIds(body.mediaIds);
+            if (existing.length !== body.mediaIds.length) {
+                return c.json({
+                    error: "One or more media IDs are invalid"
+                }, 400);
+            }
+        }
+    }
     const post = await c.var.services.posts.create({
         type: body.type,
         title: body.title,
@@ -68,9 +119,17 @@ postsApiRoutes.post("/", requireAuthApi(), async (c)=>{
         replyToId: body.replyToId ? sqid.decode(body.replyToId) ?? undefined : undefined,
         publishedAt: body.publishedAt
     });
+    // Attach media
+    if (body.mediaIds && body.mediaIds.length > 0) {
+        await c.var.services.media.attachToPost(post.id, body.mediaIds);
+    }
+    const mediaList = await c.var.services.media.getByPostId(post.id);
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
     return c.json({
         ...post,
-        sqid: sqid.encode(post.id)
+        sqid: sqid.encode(post.id),
+        mediaAttachments: mediaList.map((m)=>toMediaAttachment(m, r2PublicUrl, imageTransformUrl))
     }, 201);
 });
 // Update post (requires auth)
@@ -89,6 +148,33 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
         }, 400);
     }
     const body = parseResult.data;
+    // Validate media for post type if mediaIds is provided
+    if (body.mediaIds !== undefined) {
+        // Need the post type — use the new type if provided, else fetch existing
+        let postType = body.type;
+        if (!postType) {
+            const existing = await c.var.services.posts.getById(id);
+            if (!existing) return c.json({
+                error: "Not found"
+            }, 404);
+            postType = existing.type;
+        }
+        const mediaError = validateMediaForPostType(postType, body.mediaIds);
+        if (mediaError) {
+            return c.json({
+                error: mediaError
+            }, 400);
+        }
+        // Verify all media IDs exist
+        if (body.mediaIds.length > 0) {
+            const existing = await c.var.services.media.getByIds(body.mediaIds);
+            if (existing.length !== body.mediaIds.length) {
+                return c.json({
+                    error: "One or more media IDs are invalid"
+                }, 400);
+            }
+        }
+    }
     const post = await c.var.services.posts.update(id, {
         type: body.type,
         title: body.title,
@@ -102,9 +188,17 @@ postsApiRoutes.put("/:id", requireAuthApi(), async (c)=>{
     if (!post) return c.json({
         error: "Not found"
     }, 404);
+    // Update media attachments if provided (including empty array to clear)
+    if (body.mediaIds !== undefined) {
+        await c.var.services.media.attachToPost(post.id, body.mediaIds);
+    }
+    const mediaList = await c.var.services.media.getByPostId(post.id);
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
     return c.json({
         ...post,
-        sqid: sqid.encode(post.id)
+        sqid: sqid.encode(post.id),
+        mediaAttachments: mediaList.map((m)=>toMediaAttachment(m, r2PublicUrl, imageTransformUrl))
     });
 });
 // Delete post (requires auth)
@@ -113,6 +207,8 @@ postsApiRoutes.delete("/:id", requireAuthApi(), async (c)=>{
     if (!id) return c.json({
         error: "Invalid ID"
     }, 400);
+    // Detach media before deleting
+    await c.var.services.media.detachFromPost(id);
     const success = await c.var.services.posts.delete(id);
     if (!success) return c.json({
         error: "Not found"

package/dist/routes/dash/media.js

@@ -398,6 +398,44 @@ mediaRoutes.get("/", async (c)=>{
         })
     }));
 });
+// Media picker (returns HTML fragment for PostForm dialog)
+// Must be defined before /:id to avoid "picker" matching as an ID
+mediaRoutes.get("/picker", async (c)=>{
+    const mediaList = await c.var.services.media.list(100);
+    const r2PublicUrl = c.env.R2_PUBLIC_URL;
+    const imageTransformUrl = c.env.IMAGE_TRANSFORM_URL;
+    if (mediaList.length === 0) {
+        return c.html(/*#__PURE__*/ _jsx("p", {
+            class: "text-muted-foreground text-sm col-span-4",
+            children: "No media uploaded yet. Upload media from the Media page first."
+        }));
+    }
+    return c.html(/*#__PURE__*/ _jsx(_Fragment, {
+        children: mediaList.filter((m)=>m.mimeType.startsWith("image/")).map((m)=>{
+            const url = getMediaUrl(m.id, m.r2Key, r2PublicUrl);
+            const thumbUrl = getImageUrl(url, imageTransformUrl, {
+                width: 150,
+                quality: 80,
+                format: "auto",
+                fit: "cover"
+            });
+            return /*#__PURE__*/ _jsx("button", {
+                type: "button",
+                class: "aspect-square rounded-lg overflow-hidden border-2 hover:border-primary cursor-pointer transition-colors",
+                "data-on:click": `$mediaIds.includes('${m.id}') ? ($mediaIds = $mediaIds.filter(id => id !== '${m.id}')) : ($mediaIds = [...$mediaIds, '${m.id}'])`,
+                "data-class:border-primary": `$mediaIds.includes('${m.id}')`,
+                "data-class:ring-2": `$mediaIds.includes('${m.id}')`,
+                "data-class:ring-primary": `$mediaIds.includes('${m.id}')`,
+                children: /*#__PURE__*/ _jsx("img", {
+                    src: thumbUrl,
+                    alt: m.alt || m.originalName,
+                    class: "w-full h-full object-cover",
+                    loading: "lazy"
+                })
+            }, m.id);
+        })
+    }));
+});
 // View single media
 mediaRoutes.get("/:id", async (c)=>{
     const id = c.req.param("id");

package/dist/routes/dash/posts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"posts.d.ts","sourceRoot":"","sources":["../../../src/routes/dash/posts.tsx"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAWjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,WAAW,kDAAkB,CAAC"}
+{"version":3,"file":"posts.d.ts","sourceRoot":"","sources":["../../../src/routes/dash/posts.tsx"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAA2B,MAAM,gBAAgB,CAAC;AACxE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAWjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,WAAW,kDAAkB,CAAC"}

package/dist/routes/dash/posts.js

@@ -30,7 +30,7 @@ function PostsListContent({ posts }) {
         ]
     });
 }
-function NewPostContent() {
+function NewPostContent({ collections }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
@@ -42,7 +42,8 @@ function NewPostContent() {
                 })
             }),
             /*#__PURE__*/ _jsx(PostForm, {
-                action: "/dash/posts"
+                action: "/dash/posts",
+                collections: collections
             })
         ]
     });
@@ -71,12 +72,15 @@ 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(/*#__PURE__*/ _jsx(DashLayout, {
         c: c,
         title: "New Post",
         siteName: siteName,
         currentPath: "/dash/posts",
-        children: /*#__PURE__*/ _jsx(NewPostContent, {})
+        children: /*#__PURE__*/ _jsx(NewPostContent, {
+            collections: collections
+        })
     }));
 });
 // Create post
@@ -88,8 +92,17 @@ postsRoutes.post("/", async (c)=>{
         content: body.content,
         visibility: body.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)}`);
 });
 function ViewPostContent({ post }) {
@@ -135,7 +148,7 @@ function ViewPostContent({ post }) {
         ]
     });
 }
-function EditPostContent({ post }) {
+function EditPostContent({ post, mediaAttachments, r2PublicUrl, imageTransformUrl, collections, postCollectionIds }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs(_Fragment, {
         children: [
@@ -148,7 +161,12 @@ function EditPostContent({ post }) {
             }),
             /*#__PURE__*/ _jsx(PostForm, {
                 post: post,
-                action: `/dash/posts/${sqid.encode(post.id)}`
+                action: `/dash/posts/${sqid.encode(post.id)}`,
+                mediaAttachments: mediaAttachments,
+                r2PublicUrl: r2PublicUrl,
+                imageTransformUrl: imageTransformUrl,
+                collections: collections,
+                postCollectionIds: postCollectionIds
             })
         ]
     });
@@ -178,13 +196,24 @@ postsRoutes.get("/:id/edit", async (c)=>{
     const post = await c.var.services.posts.getById(id);
     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(/*#__PURE__*/ _jsx(DashLayout, {
         c: c,
         title: `Edit: ${post.title || "Post"}`,
         siteName: siteName,
         currentPath: "/dash/posts",
         children: /*#__PURE__*/ _jsx(EditPostContent, {
-            post: post
+            post: post,
+            mediaAttachments: mediaAttachments,
+            r2PublicUrl: r2PublicUrl,
+            imageTransformUrl: imageTransformUrl,
+            collections: collections,
+            postCollectionIds: postCollectionIds
         })
     }));
 });
@@ -199,14 +228,24 @@ postsRoutes.post("/:id", async (c)=>{
         content: body.content || null,
         visibility: body.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)}`);
 });
 // Delete post
 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/dist/routes/feed/rss.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"rss.d.ts","sourceRoot":"","sources":["../../../src/routes/feed/rss.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAIjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,SAAS,kDAAkB,CAAC"}
+{"version":3,"file":"rss.d.ts","sourceRoot":"","sources":["../../../src/routes/feed/rss.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,SAAS,kDAAkB,CAAC"}

package/dist/routes/feed/rss.js

@@ -3,6 +3,7 @@
  */ import { Hono } from "hono";
 import * as sqid from "../../lib/sqid.js";
 import * as time from "../../lib/time.js";
+import { getMediaUrl } from "../../lib/image.js";
 export const rssRoutes = new Hono();
 // RSS 2.0 Feed - main feed at /feed
 rssRoutes.get("/", async (c)=>{
@@ -10,6 +11,7 @@ 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",
@@ -17,17 +19,24 @@ rssRoutes.get("/", async (c)=>{
         ],
         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("");
     const rss = `<?xml version="1.0" encoding="UTF-8"?>

package/dist/routes/pages/home.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"home.d.ts","sourceRoot":"","sources":["../../../src/routes/pages/home.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAMjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,UAAU,kDAAkB,CAAC"}
+{"version":3,"file":"home.d.ts","sourceRoot":"","sources":["../../../src/routes/pages/home.tsx"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAQjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,UAAU,kDAAkB,CAAC"}

package/dist/routes/pages/home.js

@@ -4,11 +4,13 @@ import { jsx as _jsx, jsxs as _jsxs } from "hono/jsx/jsx-runtime";
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
 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";
 export const homeRoutes = new Hono();
-function HomeContent({ siteName, posts }) {
+function HomeContent({ siteName, posts, mediaMap }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs("div", {
         class: "container py-8",
@@ -48,7 +50,9 @@ function HomeContent({ siteName, posts }) {
                         id: "ODiSoW",
                         message: "No posts yet."
                     })
-                }) : posts.map((post)=>/*#__PURE__*/ _jsxs("article", {
+                }) : posts.map((post)=>{
+                    const attachments = mediaMap.get(post.id) ?? [];
+                    return /*#__PURE__*/ _jsxs("article", {
                         class: "h-entry",
                         children: [
                             post.title && /*#__PURE__*/ _jsx("h2", {
@@ -65,6 +69,9 @@ function HomeContent({ siteName, posts }) {
                                     __html: post.contentHtml || ""
                                 }
                             }),
+                            attachments.length > 0 && /*#__PURE__*/ _jsx(MediaGallery, {
+                                attachments: attachments
+                            }),
                             /*#__PURE__*/ _jsxs("footer", {
                                 class: "mt-2 text-sm text-muted-foreground",
                                 children: [
@@ -83,7 +90,8 @@ function HomeContent({ siteName, posts }) {
                                 ]
                             })
                         ]
-                    }, post.id))
+                    }, post.id);
+                })
             }),
             posts.length >= 20 && /*#__PURE__*/ _jsx("nav", {
                 class: "mt-8 text-center",
@@ -108,12 +116,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();
+    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(/*#__PURE__*/ _jsx(BaseLayout, {
         title: siteName,
         c: c,
         children: /*#__PURE__*/ _jsx(HomeContent, {
             siteName: siteName,
-            posts: posts
+            posts: posts,
+            mediaMap: mediaMap
         })
     }));
 });

package/dist/routes/pages/post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../src/routes/pages/post.tsx"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAQ,MAAM,gBAAgB,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAKjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,UAAU,kDAAkB,CAAC"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../src/routes/pages/post.tsx"],"names":[],"mappings":"AACA;;GAEG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAE5B,OAAO,KAAK,EAAE,QAAQ,EAAyB,MAAM,gBAAgB,CAAC;AACtE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAOjD,KAAK,GAAG,GAAG;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,SAAS,EAAE,YAAY,CAAA;CAAE,CAAC;AAE3D,eAAO,MAAM,UAAU,kDAAkB,CAAC"}

package/dist/routes/pages/post.js

@@ -5,10 +5,12 @@ import { getSiteName } from "../../lib/config.js";
  */ import { Hono } from "hono";
 import { useLingui as $_useLingui } from "@jant/core/i18n";
 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";
 export const postRoutes = new Hono();
-function PostContent({ post }) {
+function PostContent({ post, mediaAttachments }) {
     const { i18n: $__i18n, _: $__ } = $_useLingui();
     return /*#__PURE__*/ _jsxs("div", {
         class: "container py-8",
@@ -26,6 +28,9 @@ function PostContent({ post }) {
                             __html: post.contentHtml || ""
                         }
                     }),
+                    mediaAttachments.length > 0 && /*#__PURE__*/ _jsx(MediaGallery, {
+                        attachments: mediaAttachments
+                    }),
                     /*#__PURE__*/ _jsxs("footer", {
                         class: "mt-6 pt-4 border-t text-sm text-muted-foreground",
                         children: [
@@ -78,6 +83,26 @@ postRoutes.get("/:id", async (c)=>{
     if (post.visibility === "draft") {
         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 = 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(/*#__PURE__*/ _jsx(BaseLayout, {
@@ -85,7 +110,8 @@ postRoutes.get("/:id", async (c)=>{
         description: post.content?.slice(0, 160),
         c: c,
         children: /*#__PURE__*/ _jsx(PostContent, {
-            post: post
+            post: post,
+            mediaAttachments: mediaAttachments
         })
     }));
 });

package/dist/services/collection.d.ts

@@ -16,6 +16,7 @@ export interface CollectionService {
     removePost(collectionId: number, postId: number): Promise<void>;
     getPosts(collectionId: number): Promise<Post[]>;
     getCollectionsForPost(postId: number): Promise<Collection[]>;
+    syncPostCollections(postId: number, collectionIds: number[]): Promise<void>;
 }
 export interface CreateCollectionData {
     title: string;

package/dist/services/collection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../src/services/collection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAChD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACpD,IAAI,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC9B,MAAM,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC3E,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;CAC9D;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,QAAQ,GAAG,iBAAiB,CAmKvE"}
+{"version":3,"file":"collection.d.ts","sourceRoot":"","sources":["../../src/services/collection.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AAEpD,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAChD,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IACpD,IAAI,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC9B,MAAM,CAAC,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IACxD,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,oBAAoB,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CAAC;IAC3E,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,OAAO,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC7D,UAAU,CAAC,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,QAAQ,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IAChD,qBAAqB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IAC7D,mBAAmB,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC7E;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,wBAAgB,uBAAuB,CAAC,EAAE,EAAE,QAAQ,GAAG,iBAAiB,CAqLvE"}

package/dist/services/collection.js

@@ -103,6 +103,19 @@ export function createCollectionService(db) {
                 collection: collections
             }).from(postCollections).innerJoin(collections, eq(postCollections.collectionId, collections.id)).where(eq(postCollections.postId, postId));
             return rows.map((r)=>toCollection(r.collection));
+        },
+        async syncPostCollections (postId, collectionIds) {
+            const current = await this.getCollectionsForPost(postId);
+            const currentIds = new Set(current.map((c)=>c.id));
+            const desiredIds = new Set(collectionIds);
+            const toAdd = collectionIds.filter((id)=>!currentIds.has(id));
+            const toRemove = current.map((c)=>c.id).filter((id)=>!desiredIds.has(id));
+            for (const collectionId of toAdd){
+                await this.addPost(collectionId, postId);
+            }
+            for (const collectionId of toRemove){
+                await this.removePost(collectionId, postId);
+            }
         }
     };
 }

package/dist/services/media.d.ts

@@ -7,10 +7,15 @@ import type { Database } from "../db/index.js";
 import type { Media } from "../types.js";
 export interface MediaService {
     getById(id: string): Promise<Media | null>;
+    getByIds(ids: string[]): Promise<Media[]>;
+    getByPostId(postId: number): Promise<Media[]>;
+    getByPostIds(postIds: number[]): Promise<Map<number, Media[]>>;
     list(limit?: number): Promise<Media[]>;
     create(data: CreateMediaData): Promise<Media>;
     delete(id: string): Promise<boolean>;
     getByR2Key(r2Key: string): Promise<Media | null>;
+    attachToPost(postId: number, mediaIds: string[]): Promise<void>;
+    detachFromPost(postId: number): Promise<void>;
 }
 export interface CreateMediaData {
     postId?: number;
@@ -22,6 +27,8 @@ export interface CreateMediaData {
     width?: number;
     height?: number;
     alt?: string;
+    position?: number;
+    blurhash?: string;
 }
 export declare function createMediaService(db: Database): MediaService;
 //# sourceMappingURL=media.d.ts.map

package/dist/services/media.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/services/media.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC3C,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACvC,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAClD;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,GAAG,YAAY,CA2E7D"}
+{"version":3,"file":"media.d.ts","sourceRoot":"","sources":["../../src/services/media.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,MAAM,WAAW,YAAY;IAC3B,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IAC3C,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAC1C,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9C,YAAY,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;IAC/D,IAAI,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IACvC,MAAM,CAAC,IAAI,EAAE,eAAe,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;IAC9C,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;IACjD,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAChE,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC/C;AAED,MAAM,WAAW,eAAe;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,kBAAkB,CAAC,EAAE,EAAE,QAAQ,GAAG,YAAY,CA+I7D"}