@jant/core 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/commands/db/execute-file.js +1 -1
- package/bin/commands/db/export.js +1 -1
- package/bin/commands/migrate.js +4 -4
- package/bin/commands/posts/rebuild-html.js +1 -1
- package/bin/commands/reset-password.js +1 -1
- package/bin/commands/search/reindex.js +1 -1
- package/bin/commands/setup.js +4 -2
- package/bin/commands/site/export.js +3 -0
- package/bin/commands/site/import.js +178 -91
- package/bin/commands/site/pull-media.js +3 -2
- package/bin/commands/site/snapshot/export.js +3 -1
- package/bin/commands/site/snapshot/import.js +3 -2
- package/bin/commands/start.js +44 -0
- package/bin/commands/telegram/register-webhooks.js +1 -1
- package/bin/commands/uploads/cleanup.js +48 -9
- package/bin/jant.js +39 -4
- package/bin/lib/import-sources.js +151 -0
- package/bin/lib/node-env.js +14 -9
- package/bin/lib/runtime-target.js +1 -1
- package/bin/lib/site-pull-media.js +56 -4
- package/bin/lib/site-snapshot.js +39 -2
- package/bin/lib/sql-export.js +66 -10
- package/dist/{app-DIVtyB4m.js → app-jQI4OPRe.js} +5055 -4448
- package/dist/client/.vite/manifest.json +38 -38
- package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
- package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
- package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
- package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
- package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
- package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
- package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
- package/dist/client/_assets/client-52vQhZAv.js +296 -0
- package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
- package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-BDcCR6u1.js} +2 -2
- package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
- package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
- package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
- package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
- package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
- package/dist/index.d.ts +44 -0
- package/dist/index.js +33 -1
- package/dist/node.js +57 -13
- package/package.json +13 -18
- package/src/__tests__/api-docs.test.ts +168 -1
- package/src/__tests__/bin/import-sources.test.ts +85 -0
- package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
- package/src/__tests__/cli-commands.test.ts +40 -0
- package/src/__tests__/config-docs.test.ts +119 -16
- package/src/__tests__/custom-url-redirects.test.ts +108 -0
- package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
- package/src/__tests__/export-docs.test.ts +113 -41
- package/src/__tests__/export-feed-ids.test.ts +1 -0
- package/src/__tests__/export-format-version.test.ts +88 -0
- package/src/__tests__/export-hugo-build.test.ts +139 -4
- package/src/__tests__/export-import-roundtrip.test.ts +2 -1
- package/src/__tests__/export-service.test.ts +42 -13
- package/src/__tests__/export-smart-collection.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +287 -21
- package/src/__tests__/feed-reply-addresses.test.ts +100 -0
- package/src/__tests__/feeds-disabled.test.ts +98 -0
- package/src/__tests__/fixtures/export-format/1.json +76 -0
- package/src/__tests__/fixtures/export-format/2.json +80 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +57 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/app.ts +6 -1
- package/src/__tests__/helpers/export-fixtures.ts +1 -0
- package/src/__tests__/import-refused-aliases.test.ts +98 -0
- package/src/__tests__/import-site-command.test.ts +73 -8
- package/src/__tests__/public-types.test.ts +64 -0
- package/src/__tests__/release-fixtures.test.ts +79 -24
- package/src/__tests__/release-version.test.ts +84 -0
- package/src/__tests__/site-pull-media.test.ts +48 -0
- package/src/__tests__/snapshot-tables.test.ts +37 -0
- package/src/__tests__/sql-export.test.ts +21 -1
- package/src/__tests__/stored-file-headers.test.ts +94 -0
- package/src/__tests__/template-deploy-workflow.test.ts +101 -0
- package/src/__tests__/theme-docs.test.ts +113 -24
- package/src/__tests__/toolchain-versions.test.ts +54 -0
- package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
- package/src/__tests__/vite-config-graph.test.ts +98 -0
- package/src/app.tsx +89 -66
- package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
- package/src/client/__tests__/compose-bridge.test.ts +87 -0
- package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
- package/src/client/__tests__/footnote-rail.test.ts +1 -1
- package/src/client/__tests__/lazy-entries.test.ts +1 -1
- package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
- package/src/client/avatar-upload.ts +10 -10
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
- package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
- package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
- package/src/client/components/compose-types.ts +14 -0
- package/src/client/components/jant-compose-dialog.ts +96 -41
- package/src/client/components/jant-compose-editor.ts +21 -4
- package/src/client/components/jant-config-editor.ts +4 -6
- package/src/client/components/jant-media-lightbox.ts +4 -4
- package/src/client/components/jant-settings-general.ts +0 -4
- package/src/client/components/nav-manager-types.ts +6 -5
- package/src/client/compose-bridge.ts +15 -4
- package/src/client/compose-launch.ts +4 -6
- package/src/client/compose-shortcuts.ts +1 -1
- package/src/client/footnote-rail.ts +1 -1
- package/src/client/lazy-entries.ts +1 -1
- package/src/client/media-scroll-hint.ts +2 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
- package/src/client/tiptap/markdown-clipboard.ts +50 -2
- package/src/client/upload-session.ts +7 -6
- package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
- package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
- package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
- package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
- package/src/i18n/locales/public/en.po +46 -48
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +45 -46
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +45 -46
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +15 -29
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +15 -29
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +15 -29
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +43 -2
- package/src/lib/__tests__/api-settings.test.ts +3 -3
- package/src/lib/__tests__/constants.test.ts +10 -0
- package/src/lib/__tests__/discover.test.ts +8 -9
- package/src/lib/__tests__/env-values.test.ts +125 -0
- package/src/lib/__tests__/feed-path.test.ts +29 -0
- package/src/lib/__tests__/feed.test.ts +50 -22
- package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
- package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
- package/src/lib/__tests__/rate-limit.test.ts +22 -7
- package/src/lib/__tests__/resolve-config.test.ts +5 -3
- package/src/lib/__tests__/schemas.test.ts +72 -23
- package/src/lib/__tests__/slugify.test.ts +9 -0
- package/src/lib/__tests__/startup-config.test.ts +12 -0
- package/src/lib/__tests__/storage-s3.test.ts +214 -0
- package/src/lib/__tests__/theme.test.ts +20 -1
- package/src/lib/__tests__/time.test.ts +56 -0
- package/src/lib/__tests__/timeline.test.ts +46 -0
- package/src/lib/__tests__/url-fetch.test.ts +65 -1
- package/src/lib/__tests__/url.test.ts +60 -1
- package/src/lib/api-nav-items.ts +16 -20
- package/src/lib/api-post-input.ts +34 -1
- package/src/lib/api-posts.ts +125 -23
- package/src/lib/api-public-posts.ts +28 -37
- package/src/lib/api-search.ts +49 -2
- package/src/lib/api-settings.ts +159 -54
- package/src/lib/api-threads.ts +34 -11
- package/src/lib/constants.ts +6 -0
- package/src/lib/discover.ts +7 -23
- package/src/lib/env-values.ts +140 -0
- package/src/lib/env.ts +203 -12
- package/src/lib/feed-path.ts +8 -2
- package/src/lib/feed-policy.ts +110 -7
- package/src/lib/feed.ts +69 -25
- package/src/lib/filter-dimensions.ts +17 -10
- package/src/lib/github-sync-site-config.ts +1 -0
- package/src/lib/hugo-markdown.ts +5 -6
- package/src/lib/navigation.ts +4 -1
- package/src/lib/post-list-cursor.ts +33 -29
- package/src/lib/public-storage.ts +43 -0
- package/src/lib/rate-limit.ts +31 -16
- package/src/lib/render.tsx +5 -0
- package/src/lib/resolve-config.ts +16 -19
- package/src/lib/schemas.ts +248 -180
- package/src/lib/slugify.ts +6 -1
- package/src/lib/sse.ts +1 -1
- package/src/lib/startup-config.ts +20 -1
- package/src/lib/theme.ts +8 -5
- package/src/lib/thread-fold.ts +6 -0
- package/src/lib/thread-query.ts +19 -24
- package/src/lib/time.ts +137 -17
- package/src/lib/timeline.ts +56 -13
- package/src/lib/url-fetch.ts +141 -40
- package/src/lib/url.ts +86 -1
- package/src/middleware/__tests__/auth.test.ts +27 -0
- package/src/middleware/__tests__/cors.test.ts +54 -0
- package/src/middleware/__tests__/cross-origin.test.ts +149 -0
- package/src/middleware/__tests__/public-content-access.test.ts +2 -42
- package/src/middleware/auth.ts +34 -3
- package/src/middleware/cors.ts +4 -4
- package/src/middleware/cross-origin.ts +124 -0
- package/src/middleware/error-handler.ts +7 -0
- package/src/middleware/public-content-access.ts +3 -26
- package/src/middleware/secure-headers.ts +8 -2
- package/src/node/__tests__/cli-migrate.test.ts +2 -2
- package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
- package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
- package/src/node/__tests__/cli-sql-export.test.ts +25 -1
- package/src/node/__tests__/cli-start.test.ts +66 -0
- package/src/node/__tests__/request-handler.test.ts +37 -0
- package/src/node/__tests__/runtime.test.ts +56 -1
- package/src/node/request-handler.ts +58 -5
- package/src/node/runtime.ts +37 -11
- package/src/preset.css +3 -3
- package/src/routes/__tests__/compose.test.ts +84 -0
- package/src/routes/api/__tests__/collections.test.ts +68 -0
- package/src/routes/api/__tests__/mcp.test.ts +164 -9
- package/src/routes/api/__tests__/media.test.ts +9 -1
- package/src/routes/api/__tests__/nav-items.test.ts +27 -1
- package/src/routes/api/__tests__/posts.test.ts +269 -78
- package/src/routes/api/__tests__/search.test.ts +17 -4
- package/src/routes/api/__tests__/settings.test.ts +119 -85
- package/src/routes/api/__tests__/telegram.test.ts +11 -6
- package/src/routes/api/__tests__/threads.test.ts +11 -0
- package/src/routes/api/__tests__/upload-response.test.ts +48 -0
- package/src/routes/api/__tests__/uploads.test.ts +35 -2
- package/src/routes/api/collections.ts +3 -3
- package/src/routes/api/custom-urls.ts +2 -1
- package/src/routes/api/export.ts +1 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
- package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
- package/src/routes/api/internal/sites.ts +16 -4
- package/src/routes/api/mcp.ts +1 -0
- package/src/routes/api/media.ts +7 -8
- package/src/routes/api/nav-items.ts +2 -1
- package/src/routes/api/posts.ts +18 -24
- package/src/routes/api/public/__tests__/posts.test.ts +15 -0
- package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
- package/src/routes/api/public/__tests__/threads.test.ts +41 -9
- package/src/routes/api/public/posts.ts +2 -2
- package/src/routes/api/public/threads.ts +16 -26
- package/src/routes/api/search.ts +7 -41
- package/src/routes/api/settings.ts +32 -28
- package/src/routes/api/smart-collections.ts +6 -1
- package/src/routes/api/threads.ts +25 -26
- package/src/routes/api/upload.ts +6 -21
- package/src/routes/api/uploads.ts +14 -20
- package/src/routes/auth/__tests__/dev.test.ts +16 -13
- package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
- package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
- package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
- package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
- package/src/routes/auth/__tests__/signin.test.ts +167 -2
- package/src/routes/auth/dev.ts +4 -6
- package/src/routes/auth/hosted-sso.ts +9 -6
- package/src/routes/auth/setup.tsx +35 -5
- package/src/routes/auth/signin.tsx +96 -1
- package/src/routes/compose.tsx +47 -47
- package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
- package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
- package/src/routes/dash/custom-urls.tsx +2 -0
- package/src/routes/dash/settings.tsx +79 -32
- package/src/routes/feed/__tests__/feed.test.ts +93 -3
- package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
- package/src/routes/feed/feed.ts +128 -175
- package/src/routes/feed/sitemap.ts +9 -7
- package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
- package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
- package/src/routes/pages/__tests__/collections.test.ts +3 -0
- package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +34 -2
- package/src/routes/pages/__tests__/search.test.ts +5 -2
- package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
- package/src/routes/pages/archive.tsx +33 -94
- package/src/routes/pages/brand.tsx +1 -0
- package/src/routes/pages/collection.tsx +13 -84
- package/src/routes/pages/collections.tsx +2 -0
- package/src/routes/pages/featured.tsx +7 -2
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/latest.tsx +6 -2
- package/src/routes/pages/new.tsx +1 -0
- package/src/routes/pages/page.tsx +73 -47
- package/src/routes/pages/search.tsx +5 -3
- package/src/routes/pages/smart-collection.tsx +11 -70
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/pages/theme-sample.tsx +1 -0
- package/src/runtime/__tests__/readiness.test.ts +16 -0
- package/src/runtime/cloudflare.ts +2 -3
- package/src/runtime/index.ts +3 -1
- package/src/runtime/node.ts +3 -5
- package/src/runtime/readiness.ts +5 -0
- package/src/services/__tests__/auth.test.ts +115 -0
- package/src/services/__tests__/collection.test.ts +9 -0
- package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
- package/src/services/__tests__/hosted-handoff.test.ts +208 -1
- package/src/services/__tests__/media.test.ts +47 -27
- package/src/services/__tests__/navigation.test.ts +67 -15
- package/src/services/__tests__/post.test.ts +103 -56
- package/src/services/__tests__/search.test.ts +38 -0
- package/src/services/__tests__/settings.test.ts +2 -14
- package/src/services/__tests__/smart-collection.test.ts +2 -2
- package/src/services/__tests__/telegram-ingest.test.ts +113 -0
- package/src/services/__tests__/thread.test.ts +26 -11
- package/src/services/auth.ts +36 -4
- package/src/services/collection.ts +46 -5
- package/src/services/custom-url.ts +11 -4
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +2 -2
- package/src/services/export-theme/layouts/_default/baseof.html +1 -1
- package/src/services/export-theme/layouts/collection/single.html +1 -1
- package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
- package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
- package/src/services/export-theme/styles/main.css +3 -3
- package/src/services/export.ts +68 -19
- package/src/services/github-sync.ts +10 -10
- package/src/services/hosted-handoff.ts +106 -6
- package/src/services/index.ts +3 -1
- package/src/services/language.ts +33 -0
- package/src/services/mcp.ts +176 -438
- package/src/services/media.ts +69 -21
- package/src/services/navigation.ts +19 -4
- package/src/services/path.ts +45 -3
- package/src/services/post.ts +329 -214
- package/src/services/search.ts +22 -3
- package/src/services/settings.ts +36 -3
- package/src/services/site-admin.ts +1 -0
- package/src/services/smart-collection.ts +10 -3
- package/src/services/telegram.ts +23 -6
- package/src/services/thread.ts +11 -3
- package/src/services/upload-session.ts +14 -15
- package/src/styles/components.css +2 -2
- package/src/styles/site-media.css +2 -2
- package/src/styles/tokens.css +19 -22
- package/src/styles/ui-author.css +73 -94
- package/src/styles/ui.css +62 -62
- package/src/types/app-context.ts +5 -1
- package/src/types/bindings.ts +11 -0
- package/src/types/config.ts +4 -4
- package/src/types/constants.ts +20 -0
- package/src/types/props.ts +34 -8
- package/src/types/views.ts +28 -13
- package/src/ui/color-themes.ts +6 -5
- package/src/ui/dash/settings/GeneralContent.tsx +0 -22
- package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
- package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
- package/src/ui/feed/LinkCard.tsx +1 -2
- package/src/ui/feed/NoteCard.tsx +1 -2
- package/src/ui/feed/QuoteCard.tsx +2 -2
- package/src/ui/feed/ThreadPreview.tsx +6 -6
- package/src/ui/feed/TimelineFeed.tsx +1 -7
- package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
- package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
- package/src/ui/layouts/BaseLayout.tsx +5 -0
- package/src/ui/pages/ArchivePage.tsx +1 -1
- package/src/ui/pages/BrandPage.tsx +1 -1
- package/src/ui/pages/CollectionPage.tsx +0 -1
- package/src/ui/pages/CollectionsPage.tsx +2 -2
- package/src/ui/pages/ComposePage.tsx +1 -1
- package/src/ui/pages/FeaturedPage.tsx +1 -1
- package/src/ui/pages/HomePage.tsx +1 -1
- package/src/ui/pages/PostPage.tsx +1 -1
- package/src/ui/pages/SearchPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -3
- package/src/ui/pages/SubscribePage.tsx +1 -1
- package/src/ui/pages/ThemeSamplePage.tsx +1 -1
- package/src/ui/shared/MediaGallery.tsx +1 -1
- package/src/vendor/datastar.js +9 -1956
- package/src/vendor/datastar.js.map +4 -4
- package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
- package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
- package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
- package/dist/client/_assets/client-DRuw7XCt.css +0 -2
- package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
package/src/services/media.ts
CHANGED
|
@@ -16,7 +16,11 @@ import {
|
|
|
16
16
|
sqliteSchemaBundle,
|
|
17
17
|
type DatabaseSchema,
|
|
18
18
|
} from "../db/schema-bundle.js";
|
|
19
|
-
import { createEntityId } from "../lib/ids.js";
|
|
19
|
+
import { createEntityId, ID_PREFIX } from "../lib/ids.js";
|
|
20
|
+
import {
|
|
21
|
+
decodePostListCursor,
|
|
22
|
+
encodePostListCursor,
|
|
23
|
+
} from "../lib/post-list-cursor.js";
|
|
20
24
|
import { markdownToTiptapJson } from "../lib/markdown-to-tiptap.js";
|
|
21
25
|
import { extractBodyText } from "../lib/summary.js";
|
|
22
26
|
import { now } from "../lib/time.js";
|
|
@@ -48,6 +52,7 @@ import {
|
|
|
48
52
|
} from "../types.js";
|
|
49
53
|
import {
|
|
50
54
|
ConfigurationError,
|
|
55
|
+
ConflictError,
|
|
51
56
|
ExternalServiceError,
|
|
52
57
|
MediaQuotaExceededError,
|
|
53
58
|
ValidationError,
|
|
@@ -169,14 +174,23 @@ function ensureMediaKind(
|
|
|
169
174
|
);
|
|
170
175
|
}
|
|
171
176
|
|
|
172
|
-
export interface
|
|
173
|
-
limit
|
|
177
|
+
export interface MediaListPageOptions {
|
|
178
|
+
limit: number;
|
|
174
179
|
/** Filter by MIME type prefix, e.g. "image/" */
|
|
175
180
|
mimePrefix?: string;
|
|
176
|
-
/**
|
|
181
|
+
/** The previous page's `nextCursor`. */
|
|
177
182
|
cursor?: string;
|
|
178
183
|
}
|
|
179
184
|
|
|
185
|
+
/** One page of media, newest first. */
|
|
186
|
+
export interface MediaListPage {
|
|
187
|
+
media: Media[];
|
|
188
|
+
/** Where the next page starts; `null` on the last page. */
|
|
189
|
+
nextCursor: string | null;
|
|
190
|
+
}
|
|
191
|
+
|
|
192
|
+
const MEDIA_CURSOR_MODE = "media:newest";
|
|
193
|
+
|
|
180
194
|
export interface CreateTextAttachmentData {
|
|
181
195
|
contentFormat: TextAttachmentContentFormat;
|
|
182
196
|
content: string;
|
|
@@ -201,7 +215,16 @@ export interface MediaService {
|
|
|
201
215
|
getByIds(ids: string[]): Promise<Media[]>;
|
|
202
216
|
getByPostId(postId: string): Promise<Media[]>;
|
|
203
217
|
getByPostIds(postIds: string[]): Promise<Map<string, Media[]>>;
|
|
204
|
-
|
|
218
|
+
/**
|
|
219
|
+
* One page of the site's media, newest first. The cursor is opaque; one
|
|
220
|
+
* row past the page says whether another exists, so the last page carries
|
|
221
|
+
* `null` rather than a cursor that leads nowhere.
|
|
222
|
+
*
|
|
223
|
+
* @param options - Page size, MIME prefix, and the previous page's cursor
|
|
224
|
+
* @returns The page and the cursor after it
|
|
225
|
+
* @throws {ValidationError} When the cursor can't be read
|
|
226
|
+
*/
|
|
227
|
+
listPage(options: MediaListPageOptions): Promise<MediaListPage>;
|
|
205
228
|
create(data: CreateMediaData): Promise<Media>;
|
|
206
229
|
/**
|
|
207
230
|
* Fetch a remote image URL server-side and store it as the site's own media.
|
|
@@ -222,13 +245,17 @@ export interface MediaService {
|
|
|
222
245
|
deps: IngestFromUrlDeps,
|
|
223
246
|
): Promise<Media>;
|
|
224
247
|
/**
|
|
225
|
-
* Validate media IDs
|
|
226
|
-
*
|
|
248
|
+
* Validate media IDs a post is about to attach: checks the count limit,
|
|
249
|
+
* that every ID exists, and that none is attached to another post.
|
|
250
|
+
* Attaching one would move it off that post, and deleting this one would
|
|
251
|
+
* then delete the file. No-op when the array is empty.
|
|
227
252
|
*
|
|
228
253
|
* @param ids - Media IDs to validate
|
|
254
|
+
* @param postId - The post being updated, whose own media it may keep
|
|
229
255
|
* @throws {ValidationError} When count exceeds MAX_MEDIA_ATTACHMENTS or any ID is missing
|
|
256
|
+
* @throws {ConflictError} When a media item is attached to another post
|
|
230
257
|
*/
|
|
231
|
-
validateIds(ids: string[]): Promise<void>;
|
|
258
|
+
validateIds(ids: string[], postId?: string): Promise<void>;
|
|
232
259
|
/**
|
|
233
260
|
* Delete a media record. The DB row is removed immediately. When `storage` is
|
|
234
261
|
* provided and supports server-side copy, the object is moved to a `trash/`
|
|
@@ -595,29 +622,39 @@ export function createMediaService(
|
|
|
595
622
|
return result[0] ? toMedia(result[0]) : null;
|
|
596
623
|
},
|
|
597
624
|
|
|
598
|
-
async
|
|
599
|
-
const limit = filters?.limit ?? 100;
|
|
625
|
+
async listPage({ limit, mimePrefix, cursor }) {
|
|
600
626
|
const conditions = [eq(media.siteId, siteId)];
|
|
601
|
-
if (
|
|
602
|
-
conditions.push(
|
|
603
|
-
sql`${media.mimeType} LIKE ${filters.mimePrefix + "%"}`,
|
|
604
|
-
);
|
|
627
|
+
if (mimePrefix) {
|
|
628
|
+
conditions.push(sql`${media.mimeType} LIKE ${mimePrefix + "%"}`);
|
|
605
629
|
}
|
|
606
|
-
if (
|
|
607
|
-
|
|
630
|
+
if (cursor) {
|
|
631
|
+
const [afterId] = decodePostListCursor(cursor, {
|
|
632
|
+
mode: MEDIA_CURSOR_MODE,
|
|
633
|
+
kinds: ["id"],
|
|
634
|
+
idPrefix: ID_PREFIX.media,
|
|
635
|
+
});
|
|
636
|
+
conditions.push(lt(media.id, afterId as string));
|
|
608
637
|
}
|
|
609
638
|
// Newest first. A TypeID sorts by the time it was minted, so the ID
|
|
610
639
|
// orders like `created_at` and never ties, which a cursor needs.
|
|
611
640
|
const rows = await db
|
|
612
641
|
.select()
|
|
613
642
|
.from(media)
|
|
614
|
-
.where(
|
|
643
|
+
.where(and(...conditions))
|
|
615
644
|
.orderBy(desc(media.id))
|
|
616
|
-
.limit(limit);
|
|
617
|
-
|
|
645
|
+
.limit(limit + 1);
|
|
646
|
+
const page = rows.slice(0, limit);
|
|
647
|
+
const last = page.at(-1);
|
|
648
|
+
return {
|
|
649
|
+
media: page.map(toMedia),
|
|
650
|
+
nextCursor:
|
|
651
|
+
rows.length > limit && last
|
|
652
|
+
? encodePostListCursor(MEDIA_CURSOR_MODE, [last.id])
|
|
653
|
+
: null,
|
|
654
|
+
};
|
|
618
655
|
},
|
|
619
656
|
|
|
620
|
-
async validateIds(ids) {
|
|
657
|
+
async validateIds(ids, postId) {
|
|
621
658
|
if (ids.length === 0) return;
|
|
622
659
|
|
|
623
660
|
if (ids.length > MAX_MEDIA_ATTACHMENTS) {
|
|
@@ -632,6 +669,15 @@ export function createMediaService(
|
|
|
632
669
|
"One or more attachments reference invalid media IDs",
|
|
633
670
|
);
|
|
634
671
|
}
|
|
672
|
+
|
|
673
|
+
const attachedElsewhere = existing.find(
|
|
674
|
+
(item) => item.postId !== null && item.postId !== postId,
|
|
675
|
+
);
|
|
676
|
+
if (attachedElsewhere) {
|
|
677
|
+
throw new ConflictError(
|
|
678
|
+
`Media ${attachedElsewhere.id} is attached to another post. Upload the file again to attach it here.`,
|
|
679
|
+
);
|
|
680
|
+
}
|
|
635
681
|
},
|
|
636
682
|
|
|
637
683
|
async create(data) {
|
|
@@ -900,9 +946,11 @@ export function createMediaService(
|
|
|
900
946
|
},
|
|
901
947
|
|
|
902
948
|
async updateAlt(id, alt) {
|
|
949
|
+
// Cleared alt text is stored as none, the same as a file uploaded
|
|
950
|
+
// without any, so the API answers `null` for both.
|
|
903
951
|
await db
|
|
904
952
|
.update(media)
|
|
905
|
-
.set({ alt, updatedAt: now() })
|
|
953
|
+
.set({ alt: alt || null, updatedAt: now() })
|
|
906
954
|
.where(and(eq(media.siteId, siteId), eq(media.id, id)));
|
|
907
955
|
},
|
|
908
956
|
|
|
@@ -46,6 +46,10 @@ export interface ListSuggestedLinksOptions {
|
|
|
46
46
|
|
|
47
47
|
// Re-export shared constraint detection — see db/dialect.ts
|
|
48
48
|
import { isUniqueConstraintError } from "../db/dialect.js";
|
|
49
|
+
import {
|
|
50
|
+
buildReaderVisibilityConditions,
|
|
51
|
+
type ReaderVisibilityOptions,
|
|
52
|
+
} from "../db/post-visibility.js";
|
|
49
53
|
import { createPathService, type PathService } from "./path.js";
|
|
50
54
|
|
|
51
55
|
export interface ListNavItemsOptions {
|
|
@@ -127,7 +131,18 @@ export interface NavItemService {
|
|
|
127
131
|
listSuggestedLinks(
|
|
128
132
|
options?: ListSuggestedLinksOptions,
|
|
129
133
|
): Promise<SuggestedNavLink[]>;
|
|
130
|
-
|
|
134
|
+
/**
|
|
135
|
+
* The latest recent activity in each Collection, counting only Threads the
|
|
136
|
+
* reader may see. Feeds the header's "new" marker, which every visitor
|
|
137
|
+
* reads, so a draft or private Thread must not move it.
|
|
138
|
+
*
|
|
139
|
+
* @param collectionIds - Collections in the navigation
|
|
140
|
+
* @param reader - What this reader may see
|
|
141
|
+
*/
|
|
142
|
+
getCollectionFreshness(
|
|
143
|
+
collectionIds: string[],
|
|
144
|
+
reader: ReaderVisibilityOptions,
|
|
145
|
+
): Promise<Map<string, number>>;
|
|
131
146
|
}
|
|
132
147
|
|
|
133
148
|
export function createNavItemService(
|
|
@@ -1102,7 +1117,7 @@ export function createNavItemService(
|
|
|
1102
1117
|
return suggestions;
|
|
1103
1118
|
},
|
|
1104
1119
|
|
|
1105
|
-
async getCollectionFreshness(collectionIds) {
|
|
1120
|
+
async getCollectionFreshness(collectionIds, reader) {
|
|
1106
1121
|
if (collectionIds.length === 0) return new Map<string, number>();
|
|
1107
1122
|
|
|
1108
1123
|
const threshold = now() - COLLECTION_FRESHNESS_WINDOW_SECONDS;
|
|
@@ -1137,10 +1152,10 @@ export function createNavItemService(
|
|
|
1137
1152
|
and(
|
|
1138
1153
|
eq(threadCollections.siteId, siteId),
|
|
1139
1154
|
inArray(threadCollections.collectionId, collectionIds),
|
|
1155
|
+
...buildReaderVisibilityConditions(posts, siteId, reader),
|
|
1140
1156
|
sql`(
|
|
1141
1157
|
${threadCollections.createdAt} > ${threshold}
|
|
1142
|
-
OR
|
|
1143
|
-
AND ${posts.status} = 'published')
|
|
1158
|
+
OR ${threadActivityAt} > ${threshold}
|
|
1144
1159
|
)`,
|
|
1145
1160
|
),
|
|
1146
1161
|
)
|
package/src/services/path.ts
CHANGED
|
@@ -25,7 +25,11 @@ import {
|
|
|
25
25
|
import { createEntityId } from "../lib/ids.js";
|
|
26
26
|
import { now } from "../lib/time.js";
|
|
27
27
|
import { ConflictError } from "../lib/errors.js";
|
|
28
|
-
import {
|
|
28
|
+
import {
|
|
29
|
+
normalizePath,
|
|
30
|
+
normalizeRedirectTarget,
|
|
31
|
+
redirectTargetPath,
|
|
32
|
+
} from "../lib/url.js";
|
|
29
33
|
import type { PathKind, PathRecord, Status } from "../types.js";
|
|
30
34
|
|
|
31
35
|
export interface ResolvedPath extends PathRecord {
|
|
@@ -93,6 +97,11 @@ export interface PathService {
|
|
|
93
97
|
* not have its feed identity reassigned to the newer one.
|
|
94
98
|
*/
|
|
95
99
|
getPostAliases(postIds: string[]): Promise<Map<string, string[]>>;
|
|
100
|
+
/**
|
|
101
|
+
* Custom paths registered for each Collection, oldest first, each with a
|
|
102
|
+
* leading slash, as {@link getPostAliases} gives them for Posts.
|
|
103
|
+
*/
|
|
104
|
+
getCollectionAliases(collectionIds: string[]): Promise<Map<string, string[]>>;
|
|
96
105
|
/**
|
|
97
106
|
* Custom URLs that stand on their own rather than naming a post or a
|
|
98
107
|
* collection: redirects to another path, and legacy archive views. Oldest
|
|
@@ -179,7 +188,7 @@ export function createPathService(
|
|
|
179
188
|
collectionId: input.collectionId ?? null,
|
|
180
189
|
smartCollectionId: input.smartCollectionId ?? null,
|
|
181
190
|
redirectToPath: input.redirectToPath
|
|
182
|
-
?
|
|
191
|
+
? normalizeRedirectTarget(input.redirectToPath)
|
|
183
192
|
: null,
|
|
184
193
|
redirectType: input.redirectType ?? null,
|
|
185
194
|
archiveQuery: input.archiveQuery ?? null,
|
|
@@ -242,7 +251,10 @@ export function createPathService(
|
|
|
242
251
|
!seen.has(current.path)
|
|
243
252
|
) {
|
|
244
253
|
seen.add(current.path);
|
|
245
|
-
|
|
254
|
+
// A redirect off the site names nothing here.
|
|
255
|
+
const next = redirectTargetPath(current.redirectToPath);
|
|
256
|
+
if (next === null) return null;
|
|
257
|
+
current = await this.resolve(next);
|
|
246
258
|
}
|
|
247
259
|
|
|
248
260
|
// A redirect chain that loops, or ends on another redirect with nothing
|
|
@@ -524,6 +536,36 @@ export function createPathService(
|
|
|
524
536
|
return rows.map(toPathRecord);
|
|
525
537
|
},
|
|
526
538
|
|
|
539
|
+
async getCollectionAliases(collectionIds) {
|
|
540
|
+
if (collectionIds.length === 0) return new Map<string, string[]>();
|
|
541
|
+
|
|
542
|
+
return batchQuery(collectionIds, async (chunk) => {
|
|
543
|
+
const result = new Map<string, string[]>();
|
|
544
|
+
const rows = await db
|
|
545
|
+
.select({
|
|
546
|
+
collectionId: pathRegistry.collectionId,
|
|
547
|
+
path: pathRegistry.path,
|
|
548
|
+
})
|
|
549
|
+
.from(pathRegistry)
|
|
550
|
+
.where(
|
|
551
|
+
and(
|
|
552
|
+
eq(pathRegistry.siteId, siteId),
|
|
553
|
+
inArray(pathRegistry.collectionId, chunk),
|
|
554
|
+
eq(pathRegistry.kind, "alias"),
|
|
555
|
+
),
|
|
556
|
+
)
|
|
557
|
+
.orderBy(asc(pathRegistry.createdAt), asc(pathRegistry.id));
|
|
558
|
+
|
|
559
|
+
for (const row of rows) {
|
|
560
|
+
if (!row.collectionId) continue;
|
|
561
|
+
const existing = result.get(row.collectionId) ?? [];
|
|
562
|
+
existing.push(`/${row.path}`);
|
|
563
|
+
result.set(row.collectionId, existing);
|
|
564
|
+
}
|
|
565
|
+
return result;
|
|
566
|
+
});
|
|
567
|
+
},
|
|
568
|
+
|
|
527
569
|
async getPostAliases(postIds) {
|
|
528
570
|
if (postIds.length === 0) return new Map<string, string[]>();
|
|
529
571
|
|