@jant/core 0.3.6 → 0.3.8

package/src/i18n/locales/zh-Hant.ts

@@ -1 +1 @@
-/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"+7Wr2a\":[\"Edit: \",[\"title\"]],\"+MACwa\":[\"尚未有任何收藏。\"],\"+owNNn\":[\"文章\"],\"+zy2Nq\":[\"類型\"],\"/0D1Xp\":[\"編輯收藏集\"],\"/Rj5P4\":[\"您的姓名\"],\"07Epll\":[\"這將為您的網站和儀表板設置主題。所有顏色主題都支持深色模式。\"],\"0JkyS7\":[\"建立您的第一個頁面\"],\"0a6MpL\":[\"新重定向\"],\"1CU1Td\":[\"網址安全識別碼（小寫、數字、連字符）\"],\"1DBGsz\":[\"筆記\"],\"2N0qpv\":[\"文章標題...\"],\"2q/Q7x\":[\"可見性\"],\"2rJGtU\":[\"頁面標題...\"],\"3Yvsaz\":[\"302（臨時）\"],\"4/SFQS\":[\"查看網站\"],\"40TVQj\":[\"自訂路徑（選填）\"],\"4KzVT6\":[\"刪除頁面\"],\"4b3oEV\":[\"內容\"],\"4mDPGp\":[\"此頁面的 URL 路徑。使用小寫字母、數字和連字符。\"],\"6WdDG7\":[\"頁面\"],\"6YtxFj\":[\"名稱\"],\"7G4SBz\":[\"頁面內容（支持Markdown）...\"],\"7Mk+/h\":[\"更新收藏集\"],\"7Q1KKN\":[\"來源路徑\"],\"7aECQB\":[\"無效或已過期的連結\"],\"7nGhhM\":[\"你在想什麼？\"],\"7p5kLi\":[\"儀表板\"],\"7vhWI8\":[\"新密碼\"],\"8ZsakT\":[\"密碼\"],\"90Luob\":[[\"count\"],\" 條回覆\"],\"A1taO8\":[\"搜尋\"],\"AeXO77\":[\"帳戶\"],\"AyHO4m\":[\"這個收藏是關於什麼的？\"],\"B373X+\":[\"編輯文章\"],\"B495Gs\":[\"檔案館\"],\"BjF0Jv\":[\"僅限小寫字母、數字和連字符\"],\"D9Oea+\":[\"永久鏈接\"],\"DCKkhU\":[\"當前密碼\"],\"DHhJ7s\":[\"上一頁\"],\"DoJzLz\":[\"收藏夾\"],\"E80cJw\":[\"刪除此媒體將永久從存儲中移除它。\"],\"EEYbdt\":[\"發佈\"],\"EGwzOK\":[\"完成設置\"],\"EkH9pt\":[\"更新\"],\"FGrimz\":[\"新帖子\"],\"FkMol5\":[\"精選\"],\"Fxf4jq\":[\"描述（可選）\"],\"GA5A5H\":[\"刪除收藏夾\"],\"GX2VMa\":[\"建立您的管理員帳戶。\"],\"GbVAnd\":[\"此密碼重設連結無效或已過期。請生成一個新的連結。\"],\"GorKul\":[\"歡迎來到 Jant\"],\"GrZ6fH\":[\"新頁面\"],\"GxkJXS\":[\"上傳中...\"],\"HfyyXl\":[\"My Blog\"],\"HiETwV\":[\"安靜（正常）\"],\"Hzi9AA\":[\"未找到任何帖子。\"],\"I6gXOa\":[\"路徑\"],\"IagCbF\":[\"網址\"],\"J4FNfC\":[\"此集合中沒有帖子。\"],\"JIBC/T\":[\"Supported formats: JPEG, PNG, GIF, WebP, SVG. Max size: 10MB.\"],\"Jed1wB\":[\"需要幫助嗎？請訪問<0>文檔</0>。\"],\"JiP4aa\":[\"已發佈的頁面可以通過其路徑訪問。草稿不可見。\"],\"K9NcLu\":[\"使用此 URL 將媒體嵌入到您的帖子中。\"],\"KbS2K9\":[\"重設密碼\"],\"KiJn9B\":[\"備註\"],\"L85WcV\":[\"縮略名\"],\"LkvLQe\":[\"尚未有頁面。\"],\"M1RvTd\":[\"點擊圖片以查看完整大小\"],\"M8kJqa\":[\"草稿\"],\"M9xgHy\":[\"重定向\"],\"MHrjPM\":[\"標題\"],\"MZbQHL\":[\"未找到結果。\"],\"Mhf/H/\":[\"建立重定向\"],\"MqghUt\":[\"搜尋帖子...\"],\"N40H+G\":[\"所有\"],\"O3oNi5\":[\"電子郵件\"],\"OCNZaU\":[\"重定向來源的路徑\"],\"ODiSoW\":[\"尚未有帖子。\"],\"ONWvwQ\":[\"上傳\"],\"Pbm2/N\":[\"創建收藏夾\"],\"RDjuBN\":[\"Setup\"],\"Rj01Fz\":[\"連結\"],\"RwGhWy\":[\"包含 \",[\"count\"],\" 則帖子的主題\"],\"SJmfuf\":[\"網站名稱\"],\"ST+lN2\":[\"尚未上傳任何媒體。\"],\"Tt5T6+\":[\"文章\"],\"TxE+Mj\":[\"1 條回覆\"],\"Tz0i8g\":[\"設定\"],\"U5v6Gh\":[\"編輯頁面\"],\"UDMjsP\":[\"快速操作\"],\"UGT5vp\":[\"保存設定\"],\"VUSy8D\":[\"Search failed. Please try again.\"],\"VhMDMg\":[\"更改密碼\"],\"WDcQq9\":[\"不公開\"],\"Weq9zb\":[\"一般設定\"],\"WmZ/rP\":[\"到路徑\"],\"Y+7JGK\":[\"創建頁面\"],\"ZQKLI1\":[\"危險區域\"],\"ZhhOwV\":[\"引用\"],\"aAIQg2\":[\"外觀\"],\"an5hVd\":[\"圖片\"],\"b+/jO6\":[\"301（永久）\"],\"bHYIks\":[\"登出\"],\"biOepV\":[\"← 返回首頁\"],\"cnGeoo\":[\"刪除\"],\"dEgA5A\":[\"取消\"],\"e6Jr7Q\":[\"← 返回收藏夾\"],\"ePK91l\":[\"編輯\"],\"eWLklq\":[\"引用\"],\"eneWvv\":[\"草稿\"],\"er8+x7\":[\"示範帳戶已預填。只需點擊登入。\"],\"f6e0Ry\":[\"文章\"],\"fG7BxZ\":[\"Upload images via the API: POST /api/upload with a file form field.\"],\"fttd2R\":[\"我的收藏\"],\"hG89Ed\":[\"圖片\"],\"hWOZIv\":[\"請輸入您的新密碼。\"],\"hXzOVo\":[\"下一頁\"],\"he3ygx\":[\"複製\"],\"iH8pgl\":[\"返回\"],\"ig4hg2\":[\"Let's set up your site.\"],\"jpctdh\":[\"查看\"],\"k1ifdL\":[\"處理中...\"],\"mTOYla\":[\"查看所有文章 →\"],\"n1ekoW\":[\"登入\"],\"oYPBa0\":[\"更新頁面\"],\"p2/GCq\":[\"確認密碼\"],\"pRhYH2\":[\"收藏中的帖子 (\",[\"count\"],\")\"],\"pZq3aX\":[\"上傳失敗。請再試一次。\"],\"qMyM2u\":[\"來源網址（選填）\"],\"r1MpXi\":[\"安靜\"],\"rFmBG3\":[\"顏色主題\"],\"rdUucN\":[\"預覽\"],\"rzNUSl\":[\"包含 1 則貼文的主題\"],\"sGajR7\":[\"線程開始\"],\"ssqvZi\":[\"保存個人資料\"],\"t/YqKh\":[\"移除\"],\"tfrt7B\":[\"未配置任何重定向。\"],\"tiq7kl\":[\"頁面 \",[\"page\"]],\"u2f7vd\":[\"網站描述\"],\"u3wRF+\":[\"已發佈\"],\"u6Hp4N\":[\"Markdown\"],\"uAQUqI\":[\"狀態\"],\"vERlcd\":[\"個人資料\"],\"vXIe7J\":[\"語言\"],\"vzU4k9\":[\"新收藏集\"],\"wEF6Ix\":[\"目的地路徑或 URL\"],\"wK4OTM\":[\"標題（選填）\"],\"wM5UXj\":[\"刪除媒體\"],\"wRR604\":[\"頁面\"],\"wja8aL\":[\"無標題\"],\"x+doid\":[\"圖片會自動優化：調整大小至最大 1920 像素，轉換為 WebP 格式，並去除元數據。\"],\"x0mzE0\":[\"創建你的第一篇帖子\"],\"x4RuFo\":[\"回到首頁\"],\"xYilR2\":[\"媒體\"],\"y28hnO\":[\"文章\"],\"yQ2kGp\":[\"載入更多\"],\"yjkELF\":[\"確認新密碼\"],\"yzF66j\":[\"連結\"],\"z8ajIE\":[\"找到 1 個結果\"],\"zH6KqE\":[\"找到 \",[\"count\"],\" 個結果\"]}")as Messages;
+/*eslint-disable*/import type{Messages}from"@lingui/core";export const messages=JSON.parse("{\"+7Wr2a\":[\"Edit: \",[\"title\"]],\"+MACwa\":[\"尚未有任何收藏。\"],\"+bHzpy\":[\"顯示連結的文字\"],\"+owNNn\":[\"文章\"],\"+zy2Nq\":[\"類型\"],\"/0D1Xp\":[\"編輯收藏集\"],\"/Rj5P4\":[\"您的姓名\"],\"07Epll\":[\"這將為您的網站和儀表板設置主題。所有顏色主題都支持深色模式。\"],\"0JkyS7\":[\"建立您的第一個頁面\"],\"0a6MpL\":[\"新重定向\"],\"1CU1Td\":[\"網址安全識別碼（小寫、數字、連字符）\"],\"1DBGsz\":[\"筆記\"],\"1o+wgo\":[\"例如：The Verge，約翰·多伊\"],\"2N0qpv\":[\"文章標題...\"],\"2fUwEY\":[\"選擇媒體\"],\"2q/Q7x\":[\"可見性\"],\"2rJGtU\":[\"頁面標題...\"],\"3Yvsaz\":[\"302（臨時）\"],\"4/SFQS\":[\"查看網站\"],\"40TVQj\":[\"自訂路徑（選填）\"],\"4KzVT6\":[\"刪除頁面\"],\"4b3oEV\":[\"內容\"],\"4mDPGp\":[\"此頁面的 URL 路徑。使用小寫字母、數字和連字符。\"],\"6WdDG7\":[\"頁面\"],\"6YtxFj\":[\"名稱\"],\"7G4SBz\":[\"頁面內容（支持Markdown）...\"],\"7Mk+/h\":[\"更新收藏集\"],\"7Q1KKN\":[\"來源路徑\"],\"7aECQB\":[\"無效或已過期的連結\"],\"7nGhhM\":[\"你在想什麼？\"],\"7p5kLi\":[\"儀表板\"],\"7vhWI8\":[\"新密碼\"],\"87a/t/\":[\"標籤\"],\"8ZsakT\":[\"密碼\"],\"90Luob\":[[\"count\"],\" 條回覆\"],\"A1taO8\":[\"搜尋\"],\"AeXO77\":[\"帳戶\"],\"AyHO4m\":[\"這個收藏是關於什麼的？\"],\"B373X+\":[\"編輯文章\"],\"B495Gs\":[\"檔案館\"],\"BjF0Jv\":[\"僅限小寫字母、數字和連字符\"],\"D9Oea+\":[\"永久鏈接\"],\"DCKkhU\":[\"當前密碼\"],\"DHhJ7s\":[\"上一頁\"],\"DPfwMq\":[\"完成\"],\"DoJzLz\":[\"收藏夾\"],\"E80cJw\":[\"刪除此媒體將永久從存儲中移除它。\"],\"EEYbdt\":[\"發佈\"],\"EGwzOK\":[\"完成設置\"],\"EkH9pt\":[\"更新\"],\"FGrimz\":[\"新帖子\"],\"FkMol5\":[\"精選\"],\"Fxf4jq\":[\"描述（可選）\"],\"GA5A5H\":[\"刪除收藏夾\"],\"GX2VMa\":[\"建立您的管理員帳戶。\"],\"GbVAnd\":[\"此密碼重設連結無效或已過期。請生成一個新的連結。\"],\"GorKul\":[\"歡迎來到 Jant\"],\"GrZ6fH\":[\"新頁面\"],\"GxkJXS\":[\"上傳中...\"],\"HfyyXl\":[\"My Blog\"],\"HiETwV\":[\"安靜（正常）\"],\"Hzi9AA\":[\"未找到任何帖子。\"],\"I6gXOa\":[\"路徑\"],\"I8hDlV\":[\"至少需要 1 張圖片才能發佈圖片帖子。\"],\"IUwGEM\":[\"保存更改\"],\"IagCbF\":[\"網址\"],\"J4FNfC\":[\"此集合中沒有帖子。\"],\"JIBC/T\":[\"Supported formats: JPEG, PNG, GIF, WebP, SVG. Max size: 10MB.\"],\"Jed1wB\":[\"需要幫助嗎？請訪問<0>文檔</0>。\"],\"JiP4aa\":[\"已發佈的頁面可以通過其路徑訪問。草稿不可見。\"],\"K9NcLu\":[\"使用此 URL 將媒體嵌入到您的帖子中。\"],\"KbS2K9\":[\"重設密碼\"],\"KiJn9B\":[\"備註\"],\"KmGXnO\":[\"Are you sure you want to delete this post? This cannot be undone.\"],\"L85WcV\":[\"縮略名\"],\"LkvLQe\":[\"尚未有頁面。\"],\"M1RvTd\":[\"點擊圖片以查看完整大小\"],\"M8kJqa\":[\"草稿\"],\"M9xgHy\":[\"重定向\"],\"MHrjPM\":[\"標題\"],\"MWBOxm\":[\"收藏（可選）\"],\"MZbQHL\":[\"未找到結果。\"],\"Mhf/H/\":[\"建立重定向\"],\"MqghUt\":[\"搜尋帖子...\"],\"N40H+G\":[\"所有\"],\"O3oNi5\":[\"電子郵件\"],\"OCNZaU\":[\"重定向來源的路徑\"],\"ODiSoW\":[\"尚未有帖子。\"],\"ONWvwQ\":[\"上傳\"],\"Pbm2/N\":[\"創建收藏夾\"],\"QEbNBb\":[\"路徑（例如 /archive）或完整網址（例如 https://example.com）\"],\"RDjuBN\":[\"Setup\"],\"Rj01Fz\":[\"連結\"],\"RwGhWy\":[\"包含 \",[\"count\"],\" 則帖子的主題\"],\"SJmfuf\":[\"網站名稱\"],\"ST+lN2\":[\"尚未上傳任何媒體。\"],\"Tt5T6+\":[\"文章\"],\"TxE+Mj\":[\"1 條回覆\"],\"Tz0i8g\":[\"設定\"],\"U5v6Gh\":[\"編輯頁面\"],\"UDMjsP\":[\"快速操作\"],\"UGT5vp\":[\"保存設定\"],\"UxKoFf\":[\"導航\"],\"VUSy8D\":[\"Search failed. Please try again.\"],\"VhMDMg\":[\"更改密碼\"],\"WDcQq9\":[\"不公開\"],\"Weq9zb\":[\"一般設定\"],\"WmZ/rP\":[\"到路徑\"],\"Y+7JGK\":[\"創建頁面\"],\"Z3FXyt\":[\"載入中...\"],\"ZQKLI1\":[\"危險區域\"],\"ZhhOwV\":[\"引用\"],\"aAIQg2\":[\"外觀\"],\"aaGV/9\":[\"新連結\"],\"an5hVd\":[\"圖片\"],\"b+/jO6\":[\"301（永久）\"],\"bHYIks\":[\"登出\"],\"biOepV\":[\"← Back to home\"],\"cnGeoo\":[\"刪除\"],\"dEgA5A\":[\"取消\"],\"e6Jr7Q\":[\"← 返回收藏夾\"],\"ePK91l\":[\"編輯\"],\"eWLklq\":[\"引用\"],\"eneWvv\":[\"草稿\"],\"er8+x7\":[\"示範帳戶已預填。只需點擊登入。\"],\"f6e0Ry\":[\"文章\"],\"fG7BxZ\":[\"Upload images via the API: POST /api/upload with a file form field.\"],\"fttd2R\":[\"我的收藏\"],\"gDx5MG\":[\"編輯連結\"],\"hG89Ed\":[\"圖片\"],\"hWOZIv\":[\"請輸入您的新密碼。\"],\"hXzOVo\":[\"下一頁\"],\"he3ygx\":[\"複製\"],\"iH8pgl\":[\"返回\"],\"ig4hg2\":[\"Let's set up your site.\"],\"jpctdh\":[\"查看\"],\"k1ifdL\":[\"處理中...\"],\"kd7eBB\":[\"建立連結\"],\"mTOYla\":[\"View all posts →\"],\"n1ekoW\":[\"登入\"],\"oJFOZk\":[\"來源名稱（選填）\"],\"oYPBa0\":[\"更新頁面\"],\"p2/GCq\":[\"確認密碼\"],\"pRhYH2\":[\"收藏中的帖子 (\",[\"count\"],\")\"],\"pZq3aX\":[\"上傳失敗。請再試一次。\"],\"qMyM2u\":[\"來源網址（選填）\"],\"qiXmlF\":[\"添加媒體\"],\"r1MpXi\":[\"安靜\"],\"rFmBG3\":[\"顏色主題\"],\"rdUucN\":[\"預覽\"],\"rzNUSl\":[\"包含 1 則貼文的主題\"],\"sGajR7\":[\"線程開始\"],\"smzF8S\":[\"顯示 \",[\"remainingCount\"],\" 個更多 \",[\"0\"]],\"ssqvZi\":[\"保存個人資料\"],\"t/YqKh\":[\"移除\"],\"tfrt7B\":[\"未配置任何重定向。\"],\"tiq7kl\":[\"頁面 \",[\"page\"]],\"u2f7vd\":[\"網站描述\"],\"u3wRF+\":[\"已發佈\"],\"u6Hp4N\":[\"Markdown\"],\"uAQUqI\":[\"狀態\"],\"vERlcd\":[\"個人資料\"],\"vXIe7J\":[\"語言\"],\"vzU4k9\":[\"新收藏集\"],\"wEF6Ix\":[\"目的地路徑或 URL\"],\"wK4OTM\":[\"標題（選填）\"],\"wM5UXj\":[\"刪除媒體\"],\"wRR604\":[\"頁面\"],\"wdGjkd\":[\"未配置導航連結。\"],\"wja8aL\":[\"無標題\"],\"x+doid\":[\"圖片會自動優化：調整大小至最大 1920 像素，轉換為 WebP 格式，並去除元數據。\"],\"x0mzE0\":[\"創建你的第一篇帖子\"],\"x4RuFo\":[\"Back to home\"],\"xYilR2\":[\"媒體\"],\"y28hnO\":[\"文章\"],\"yQ2kGp\":[\"載入更多\"],\"yjkELF\":[\"確認新密碼\"],\"yzF66j\":[\"連結\"],\"z8ajIE\":[\"找到 1 個結果\"],\"zH6KqE\":[\"找到 \",[\"count\"],\" 個結果\"]}")as Messages;

package/src/index.ts

@@ -17,18 +17,30 @@ export type {
   Bindings,
   Post,
   Media,
+  MediaAttachment,
+  PostWithMedia,
   Collection,
   PostCollection,
   Redirect,
   Setting,
+  NavigationLink,
   CreatePost,
   UpdatePost,
   JantConfig,
   JantTheme,
   ThemeComponents,
+  TimelineCardProps,
+  ThreadPreviewProps,
+  TimelineItemData,
+  TimelineFeedProps,
 } from "./types.js";
 
-export { POST_TYPES, VISIBILITY_LEVELS } from "./types.js";
+export {
+  POST_TYPES,
+  VISIBILITY_LEVELS,
+  MAX_MEDIA_ATTACHMENTS,
+  POST_TYPE_MEDIA_RULES,
+} from "./types.js";
 
 // Utilities (for theme authors)
 export * as time from "./lib/time.js";

package/src/lib/__tests__/schemas.test.ts

@@ -7,9 +7,14 @@ import {
   UpdatePostSchema,
   parseFormData,
   parseFormDataOptional,
+  validateMediaForPostType,
 } from "../schemas.js";
 import { z } from "zod";
-import { POST_TYPES, VISIBILITY_LEVELS } from "../../types.js";
+import {
+  POST_TYPES,
+  VISIBILITY_LEVELS,
+  MAX_MEDIA_ATTACHMENTS,
+} from "../../types.js";
 
 describe("PostTypeSchema", () => {
   it("accepts all valid post types", () => {
@@ -145,6 +150,37 @@ describe("CreatePostSchema", () => {
     ).toThrow();
   });
 
+  it("accepts valid mediaIds", () => {
+    const result = CreatePostSchema.parse({
+      ...validPost,
+      mediaIds: ["id-1", "id-2"],
+    });
+    expect(result.mediaIds).toEqual(["id-1", "id-2"]);
+  });
+
+  it("accepts empty mediaIds array", () => {
+    const result = CreatePostSchema.parse({
+      ...validPost,
+      mediaIds: [],
+    });
+    expect(result.mediaIds).toEqual([]);
+  });
+
+  it("accepts omitted mediaIds", () => {
+    const result = CreatePostSchema.parse(validPost);
+    expect(result.mediaIds).toBeUndefined();
+  });
+
+  it("rejects mediaIds over MAX_MEDIA_ATTACHMENTS", () => {
+    const tooMany = Array.from(
+      { length: MAX_MEDIA_ATTACHMENTS + 1 },
+      (_, i) => `id-${i}`,
+    );
+    expect(() =>
+      CreatePostSchema.parse({ ...validPost, mediaIds: tooMany }),
+    ).toThrow();
+  });
+
   it("rejects missing required fields", () => {
     expect(() => CreatePostSchema.parse({})).toThrow();
     expect(() => CreatePostSchema.parse({ type: "note" })).toThrow();
@@ -218,3 +254,55 @@ describe("parseFormDataOptional", () => {
     expect(() => parseFormDataOptional(form, "type", PostTypeSchema)).toThrow();
   });
 });
+
+describe("validateMediaForPostType", () => {
+  it("returns null for note with no media", () => {
+    expect(validateMediaForPostType("note", [])).toBeNull();
+  });
+
+  it("returns null for note with media", () => {
+    expect(validateMediaForPostType("note", ["id-1", "id-2"])).toBeNull();
+  });
+
+  it("returns null for article with media", () => {
+    expect(validateMediaForPostType("article", ["id-1"])).toBeNull();
+  });
+
+  it("returns null for image with at least 1 media", () => {
+    expect(validateMediaForPostType("image", ["id-1"])).toBeNull();
+  });
+
+  it("returns error for image with no media", () => {
+    const error = validateMediaForPostType("image", []);
+    expect(error).toBe("image posts require at least 1 media attachment");
+  });
+
+  it("returns null for link with 0 or 1 media", () => {
+    expect(validateMediaForPostType("link", [])).toBeNull();
+    expect(validateMediaForPostType("link", ["id-1"])).toBeNull();
+  });
+
+  it("returns error for link with more than 1 media", () => {
+    const error = validateMediaForPostType("link", ["id-1", "id-2"]);
+    expect(error).toBe("link posts allow at most 1 media attachment");
+  });
+
+  it("returns error for page with any media", () => {
+    const error = validateMediaForPostType("page", ["id-1"]);
+    expect(error).toBe("page posts do not allow media attachments");
+  });
+
+  it("returns null for page with no media", () => {
+    expect(validateMediaForPostType("page", [])).toBeNull();
+  });
+
+  it("returns null for quote with media", () => {
+    expect(validateMediaForPostType("quote", ["id-1", "id-2"])).toBeNull();
+  });
+
+  it("returns error when exceeding max for note", () => {
+    const tooMany = Array.from({ length: 21 }, (_, i) => `id-${i}`);
+    const error = validateMediaForPostType("note", tooMany);
+    expect(error).toBe("note posts allow at most 20 media attachments");
+  });
+});

package/src/lib/__tests__/sse.test.ts

@@ -25,13 +25,25 @@ describe("dsRedirect", () => {
     expect(body).toContain("\\'");
   });
 
-  it("merges additional headers", () => {
+  it("merges additional headers from plain object", () => {
     const res = dsRedirect("/dash", {
       headers: { "Set-Cookie": "session=abc" },
     });
     expect(res.headers.get("Set-Cookie")).toBe("session=abc");
     expect(res.headers.get("Content-Type")).toBe("text/html");
   });
+
+  it("merges additional headers from Headers instance", () => {
+    const headers = new Headers();
+    headers.append("set-cookie", "session=abc; Path=/; HttpOnly");
+    headers.append("set-cookie", "data=xyz; Path=/; Max-Age=300");
+    const res = dsRedirect("/dash", { headers });
+    const cookies = res.headers.getSetCookie();
+    expect(cookies).toHaveLength(2);
+    expect(cookies[0]).toBe("session=abc; Path=/; HttpOnly");
+    expect(cookies[1]).toBe("data=xyz; Path=/; Max-Age=300");
+    expect(res.headers.get("Content-Type")).toBe("text/html");
+  });
 });
 
 describe("dsToast", () => {

package/src/lib/__tests__/theme-components.test.ts

@@ -0,0 +1,107 @@
+import { describe, it, expect } from "vitest";
+import {
+  resolveCardComponent,
+  resolveThreadPreview,
+  resolveTimelineFeed,
+} from "../theme-components.js";
+import type {
+  ThemeComponents,
+  TimelineCardProps,
+  ThreadPreviewProps,
+  TimelineFeedProps,
+  PostType,
+} from "../../types.js";
+import type { FC } from "hono/jsx";
+
+// Create simple mock components for testing (avoids importing .tsx files with i18n)
+const MockNoteCard: FC<TimelineCardProps> = () => null;
+const MockArticleCard: FC<TimelineCardProps> = () => null;
+const MockLinkCard: FC<TimelineCardProps> = () => null;
+const MockQuoteCard: FC<TimelineCardProps> = () => null;
+const MockImageCard: FC<TimelineCardProps> = () => null;
+const MockThreadPreview: FC<ThreadPreviewProps> = () => null;
+const MockTimelineFeed: FC<TimelineFeedProps> = () => null;
+
+const DEFAULT_CARD_MAP: Record<PostType, FC<TimelineCardProps>> = {
+  note: MockNoteCard,
+  article: MockArticleCard,
+  link: MockLinkCard,
+  quote: MockQuoteCard,
+  image: MockImageCard,
+  page: MockNoteCard,
+};
+
+describe("theme-components", () => {
+  describe("resolveCardComponent", () => {
+    it("returns default NoteCard for note type", () => {
+      expect(resolveCardComponent("note", DEFAULT_CARD_MAP)).toBe(MockNoteCard);
+    });
+
+    it("returns default ArticleCard for article type", () => {
+      expect(resolveCardComponent("article", DEFAULT_CARD_MAP)).toBe(
+        MockArticleCard,
+      );
+    });
+
+    it("returns default LinkCard for link type", () => {
+      expect(resolveCardComponent("link", DEFAULT_CARD_MAP)).toBe(MockLinkCard);
+    });
+
+    it("returns default QuoteCard for quote type", () => {
+      expect(resolveCardComponent("quote", DEFAULT_CARD_MAP)).toBe(
+        MockQuoteCard,
+      );
+    });
+
+    it("returns default ImageCard for image type", () => {
+      expect(resolveCardComponent("image", DEFAULT_CARD_MAP)).toBe(
+        MockImageCard,
+      );
+    });
+
+    it("returns NoteCard as fallback for page type", () => {
+      expect(resolveCardComponent("page", DEFAULT_CARD_MAP)).toBe(MockNoteCard);
+    });
+
+    it("returns theme override when provided", () => {
+      const CustomNote: FC<TimelineCardProps> = () => null;
+      const overrides: ThemeComponents = { NoteCard: CustomNote };
+      expect(resolveCardComponent("note", DEFAULT_CARD_MAP, overrides)).toBe(
+        CustomNote,
+      );
+    });
+
+    it("returns default when theme has no override for type", () => {
+      const overrides: ThemeComponents = {};
+      expect(resolveCardComponent("article", DEFAULT_CARD_MAP, overrides)).toBe(
+        MockArticleCard,
+      );
+    });
+  });
+
+  describe("resolveThreadPreview", () => {
+    it("returns default ThreadPreview when no override", () => {
+      expect(resolveThreadPreview(MockThreadPreview)).toBe(MockThreadPreview);
+    });
+
+    it("returns theme override when provided", () => {
+      const Custom: FC<ThreadPreviewProps> = () => null;
+      expect(
+        resolveThreadPreview(MockThreadPreview, { ThreadPreview: Custom }),
+      ).toBe(Custom);
+    });
+  });
+
+  describe("resolveTimelineFeed", () => {
+    it("returns default TimelineFeed when no override", () => {
+      expect(resolveTimelineFeed(MockTimelineFeed)).toBe(MockTimelineFeed);
+    });
+
+    it("returns theme override when provided", () => {
+      const Custom: FC<TimelineFeedProps> = () => null;
+      expect(
+        resolveTimelineFeed(MockTimelineFeed, { TimelineFeed: Custom }),
+      ).toBe(Custom);
+    });
+  });
+});

package/src/lib/image.ts

@@ -85,12 +85,12 @@ export function getImageUrl(
  * @example
  * ```ts
  * // Without R2 public URL - uses UUID with extension
- * getMediaUrl("01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f", "uploads/file.webp");
+ * getMediaUrl("01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f", "media/2025/01/01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f.webp");
  * // Returns: "/media/01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f.webp"
  *
  * // With R2 public URL - uses direct CDN
- * getMediaUrl("01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f", "uploads/file.webp", "https://cdn.example.com");
- * // Returns: "https://cdn.example.com/uploads/file.webp"
+ * getMediaUrl("01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f", "media/2025/01/01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f.webp", "https://cdn.example.com");
+ * // Returns: "https://cdn.example.com/media/2025/01/01902a9f-1a2b-7c3d-8e4f-5a6b7c8d9e0f.webp"
  * ```
  */
 export function getMediaUrl(

package/src/lib/media-helpers.ts

@@ -0,0 +1,54 @@
+/**
+ * Media Helper Utilities
+ *
+ * Shared logic for building MediaAttachment maps from raw media data.
+ */
+
+import type { Media, MediaAttachment } from "../types.js";
+import { getMediaUrl, getImageUrl } from "./image.js";
+
+/**
+ * Builds a map of post IDs to MediaAttachment arrays from raw media data.
+ *
+ * Transforms raw Media objects (with R2 keys) into MediaAttachment objects
+ * (with public URLs and preview URLs) suitable for rendering.
+ *
+ * @param rawMediaMap - Map of post IDs to raw Media arrays from the media service
+ * @param r2PublicUrl - Optional R2 public URL for direct CDN access
+ * @param imageTransformUrl - Optional image transformation service URL
+ * @returns Map of post IDs to MediaAttachment arrays
+ *
+ * @example
+ * ```ts
+ * const rawMediaMap = await services.media.getByPostIds(postIds);
+ * const mediaMap = buildMediaMap(rawMediaMap, c.env.R2_PUBLIC_URL, c.env.IMAGE_TRANSFORM_URL);
+ * ```
+ */
+export function buildMediaMap(
+  rawMediaMap: Map<number, Media[]>,
+  r2PublicUrl?: string,
+  imageTransformUrl?: string,
+): Map<number, MediaAttachment[]> {
+  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 mediaMap;
+}

package/src/lib/nav-reorder.ts

@@ -0,0 +1,26 @@
+/**
+ * Navigation Link Reorder
+ *
+ * Initializes SortableJS on the navigation links list in the dashboard.
+ * Auto-detects the list element and only activates when present.
+ */
+
+import Sortable from "sortablejs";
+
+const list = document.getElementById("nav-links-list");
+if (list) {
+  Sortable.create(list, {
+    animation: 150,
+    handle: "[data-id]",
+    onEnd() {
+      const ids = [...list.querySelectorAll<HTMLElement>("[data-id]")].map(
+        (el) => Number(el.dataset.id),
+      );
+      fetch("/dash/navigation/reorder", {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ ids }),
+      });
+    },
+  });
+}

package/src/lib/navigation.ts

@@ -0,0 +1,46 @@
+/**
+ * Navigation Helper
+ *
+ * Provides shared data fetching for public page navigation.
+ */
+
+import type { Context } from "hono";
+import { getSiteName } from "./config.js";
+import type { NavigationLink } from "../types.js";
+
+/**
+ * Navigation data needed by SiteLayout
+ */
+export interface NavigationData {
+  navigationLinks: NavigationLink[];
+  currentPath: string;
+  siteName: string;
+}
+
+/**
+ * Fetch navigation data for public pages.
+ *
+ * Ensures default links exist (Home, Archive, RSS) and returns
+ * the current path and site name alongside the links.
+ *
+ * @param c - Hono context
+ * @returns Navigation data for SiteLayout
+ *
+ * @example
+ * ```typescript
+ * const navData = await getNavigationData(c);
+ * return c.html(
+ *   <BaseLayout c={c}>
+ *     <SiteLayout {...navData}>
+ *       <MyContent />
+ *     </SiteLayout>
+ *   </BaseLayout>
+ * );
+ * ```
+ */
+export async function getNavigationData(c: Context): Promise<NavigationData> {
+  const navigationLinks = await c.var.services.navigationLinks.ensureDefaults();
+  const currentPath = new URL(c.req.url).pathname;
+  const siteName = await getSiteName(c);
+  return { navigationLinks, currentPath, siteName };
+}

package/src/lib/schemas.ts

@@ -9,7 +9,13 @@
  */
 
 import { z } from "zod";
-import { POST_TYPES, VISIBILITY_LEVELS } from "../types.js";
+import {
+  POST_TYPES,
+  VISIBILITY_LEVELS,
+  MAX_MEDIA_ATTACHMENTS,
+  POST_TYPE_MEDIA_RULES,
+} from "../types.js";
+import type { PostType } from "../types.js";
 
 /**
  * Post type enum schema
@@ -46,6 +52,7 @@ export const CreatePostSchema = z.object({
     .or(z.literal("")),
   replyToId: z.string().optional(), // Sqid format
   publishedAt: z.number().int().positive().optional(),
+  mediaIds: z.array(z.string()).max(MAX_MEDIA_ATTACHMENTS).optional(),
 });
 
 /**
@@ -94,3 +101,42 @@ export function parseFormDataOptional<T>(
   }
   return schema.parse(value);
 }
+
+/**
+ * Validates media attachment count against post type rules.
+ *
+ * @param type - The post type to validate against
+ * @param mediaIds - Array of media IDs to attach
+ * @returns null if valid, error string if invalid
+ *
+ * @example
+ * ```ts
+ * const error = validateMediaForPostType("image", []);
+ * // Returns: "image posts require at least 1 media attachment"
+ * ```
+ */
+export function validateMediaForPostType(
+  type: PostType,
+  mediaIds: string[],
+): string | null {
+  const rules = POST_TYPE_MEDIA_RULES[type];
+
+  if (rules === null) {
+    if (mediaIds.length > 0) {
+      return `${type} posts do not allow media attachments`;
+    }
+    return null;
+  }
+
+  const [min, max] = rules;
+
+  if (mediaIds.length < min) {
+    return `${type} posts require at least ${min} media attachment${min !== 1 ? "s" : ""}`;
+  }
+
+  if (mediaIds.length > max) {
+    return `${type} posts allow at most ${max} media attachment${max !== 1 ? "s" : ""}`;
+  }
+
+  return null;
+}

package/src/lib/sse.ts

@@ -299,7 +299,7 @@ export function sse(
  * Use instead of `sse()` when the only action is a redirect.
  *
  * @param url - The URL to redirect to
- * @param options - Optional extra headers (e.g. Set-Cookie for auth)
+ * @param options - Optional extra headers (accepts any `HeadersInit`)
  * @returns Response with text/html content-type
  *
  * @example
@@ -307,21 +307,20 @@ export function sse(
  * return dsRedirect("/dash/posts");
  *
  * // With cookie forwarding (for auth)
- * return dsRedirect("/dash", { headers: { "Set-Cookie": cookie } });
+ * return dsRedirect("/dash", { headers: authResponse.headers });
  * ```
  */
 export function dsRedirect(
   url: string,
-  options?: { headers?: Record<string, string> },
+  options?: { headers?: Headers | Record<string, string> | string[][] },
 ): Response {
-  return new Response(buildRedirectScript(url), {
-    headers: {
-      "Content-Type": "text/html",
-      "Datastar-Mode": "append",
-      "Datastar-Selector": "body",
-      ...options?.headers,
-    },
-  });
+  const headers = options?.headers
+    ? new Headers(options.headers)
+    : new Headers();
+  headers.set("Content-Type", "text/html");
+  headers.set("Datastar-Mode", "append");
+  headers.set("Datastar-Selector", "body");
+  return new Response(buildRedirectScript(url), { headers });
 }
 
 /**

package/src/lib/theme-components.ts

@@ -0,0 +1,76 @@
+/**
+ * Theme Component Resolution
+ *
+ * Resolves theme-overridable components, falling back to defaults.
+ */
+
+import type { FC } from "hono/jsx";
+import type {
+  PostType,
+  ThemeComponents,
+  TimelineCardProps,
+  ThreadPreviewProps,
+  TimelineFeedProps,
+} from "../types.js";
+
+const THEME_KEY_MAP: Record<PostType, keyof ThemeComponents> = {
+  note: "NoteCard",
+  article: "ArticleCard",
+  link: "LinkCard",
+  quote: "QuoteCard",
+  image: "ImageCard",
+  page: "NoteCard",
+};
+
+/**
+ * Resolves the card component for a given post type.
+ *
+ * Checks theme overrides first, then falls back to the provided default card component.
+ *
+ * @param type - The post type to resolve a card for
+ * @param defaults - Map of post type to default card component
+ * @param themeComponents - Optional theme component overrides
+ * @returns The resolved card component
+ *
+ * @example
+ * ```ts
+ * const Card = resolveCardComponent("article", DEFAULT_CARD_MAP, c.var.config.theme?.components);
+ * ```
+ */
+export function resolveCardComponent(
+  type: PostType,
+  defaults: Record<PostType, FC<TimelineCardProps>>,
+  themeComponents?: ThemeComponents,
+): FC<TimelineCardProps> {
+  const key = THEME_KEY_MAP[type];
+  const override = themeComponents?.[key] as FC<TimelineCardProps> | undefined;
+  return override ?? defaults[type];
+}
+
+/**
+ * Resolves the ThreadPreview component.
+ *
+ * @param defaultComponent - The default ThreadPreview component
+ * @param themeComponents - Optional theme component overrides
+ * @returns The resolved ThreadPreview component
+ */
+export function resolveThreadPreview(
+  defaultComponent: FC<ThreadPreviewProps>,
+  themeComponents?: ThemeComponents,
+): FC<ThreadPreviewProps> {
+  return themeComponents?.ThreadPreview ?? defaultComponent;
+}
+
+/**
+ * Resolves the TimelineFeed component.
+ *
+ * @param defaultComponent - The default TimelineFeed component
+ * @param themeComponents - Optional theme component overrides
+ * @returns The resolved TimelineFeed component
+ */
+export function resolveTimelineFeed(
+  defaultComponent: FC<TimelineFeedProps>,
+  themeComponents?: ThemeComponents,
+): FC<TimelineFeedProps> {
+  return themeComponents?.TimelineFeed ?? defaultComponent;
+}