@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/routes/feed/feed.ts
CHANGED
|
@@ -19,6 +19,7 @@ import { Hono } from "hono";
|
|
|
19
19
|
import type { Context } from "hono";
|
|
20
20
|
import type {
|
|
21
21
|
Bindings,
|
|
22
|
+
CollectionTagView,
|
|
22
23
|
FeedData,
|
|
23
24
|
FeedKind,
|
|
24
25
|
FeedPostView,
|
|
@@ -29,11 +30,13 @@ import type { AppVariables } from "../../types/app-context.js";
|
|
|
29
30
|
import { defaultFeedRenderer } from "../../lib/feed.js";
|
|
30
31
|
import {
|
|
31
32
|
buildFeedDiscoveryFields,
|
|
33
|
+
buildFeedLabels,
|
|
32
34
|
featuredFeedSelection,
|
|
33
35
|
getFeedEntryUpdatedAt,
|
|
34
36
|
getFeedLimit,
|
|
35
37
|
getRssPublishedBefore,
|
|
36
38
|
latestFeedSelection,
|
|
39
|
+
feedsPublished,
|
|
37
40
|
renderFeed,
|
|
38
41
|
} from "../../lib/feed-policy.js";
|
|
39
42
|
import { buildMediaMap } from "../../lib/media-helpers.js";
|
|
@@ -42,6 +45,7 @@ import { FORMATS } from "../../types/constants.js";
|
|
|
42
45
|
|
|
43
46
|
import { createMediaContext, toPostViews } from "../../lib/view.js";
|
|
44
47
|
import { toAbsoluteSiteUrl, toPublicPath } from "../../lib/url.js";
|
|
48
|
+
import { getCollectionPagePath } from "../../lib/collection-paths.js";
|
|
45
49
|
import { getViewLang, viewBasePath } from "../../lib/view-language.js";
|
|
46
50
|
import { toPlainText } from "../../lib/markdown.js";
|
|
47
51
|
|
|
@@ -86,56 +90,101 @@ async function loadMediaMap(
|
|
|
86
90
|
}
|
|
87
91
|
|
|
88
92
|
/**
|
|
89
|
-
*
|
|
93
|
+
* The entries of a feed, with each root's replies, from the root posts it
|
|
94
|
+
* lists.
|
|
90
95
|
*
|
|
91
|
-
*
|
|
92
|
-
*
|
|
93
|
-
*
|
|
94
|
-
*
|
|
96
|
+
* Every feed builds its entries here, so an entry and its replies are named
|
|
97
|
+
* the same way in all of them. A post's permalink is what `<jant:post>` rows,
|
|
98
|
+
* the fold's `gap` and `latest`, and every `media:content` name it by, and a
|
|
99
|
+
* consumer keys on that address; it has to be the one the site itself uses,
|
|
100
|
+
* which is the post's first alias when it has one, for replies as for roots.
|
|
101
|
+
*
|
|
102
|
+
* @param c - The feed request
|
|
103
|
+
* @param posts - The entries, in feed order
|
|
104
|
+
* @param options.publishedBefore - The feed's publication cutoff, which the
|
|
105
|
+
* replies follow too
|
|
106
|
+
* @param options.threadMap - Threads the caller already read, keyed by root
|
|
107
|
+
* @param options.alsoUpdatedAt - More moments an entry changed, such as when
|
|
108
|
+
* a collection took it
|
|
109
|
+
* @returns One view per post, in the same order
|
|
110
|
+
* @example
|
|
111
|
+
* const postViews = await buildFeedPostViews(c, posts, { publishedBefore });
|
|
95
112
|
*/
|
|
96
|
-
function
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
)
|
|
103
|
-
|
|
104
|
-
|
|
113
|
+
export async function buildFeedPostViews(
|
|
114
|
+
c: Context<Env>,
|
|
115
|
+
posts: Post[],
|
|
116
|
+
options: {
|
|
117
|
+
publishedBefore: number;
|
|
118
|
+
threadMap?: Map<string, Post[]>;
|
|
119
|
+
alsoUpdatedAt?: (index: number) => readonly (number | undefined)[];
|
|
120
|
+
},
|
|
121
|
+
): Promise<FeedPostView[]> {
|
|
122
|
+
const rootIds = posts.filter((p) => p.threadId === p.id).map((p) => p.id);
|
|
123
|
+
const threadMap =
|
|
124
|
+
options.threadMap ??
|
|
125
|
+
(await c.var.services.posts.getPublishedThreads(rootIds, {
|
|
126
|
+
publishedBefore: options.publishedBefore,
|
|
127
|
+
}));
|
|
105
128
|
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
...r,
|
|
111
|
-
mediaAttachments: mediaMap.get(r.id) ?? [],
|
|
112
|
-
})),
|
|
113
|
-
mediaCtx,
|
|
114
|
-
undefined,
|
|
115
|
-
aliasMap,
|
|
116
|
-
);
|
|
117
|
-
}
|
|
129
|
+
const ids = new Set(posts.map((p) => p.id));
|
|
130
|
+
for (const thread of threadMap.values()) {
|
|
131
|
+
for (const post of thread) ids.add(post.id);
|
|
132
|
+
}
|
|
118
133
|
|
|
119
|
-
|
|
120
|
-
|
|
134
|
+
const mediaCtx = createMediaContext(c.var.appConfig);
|
|
135
|
+
const [mediaMap, aliasesMap, collectionsMap] = await Promise.all([
|
|
136
|
+
loadMediaMap(c, [...ids], mediaCtx),
|
|
137
|
+
c.var.services.paths.getPostAliases([...ids]),
|
|
138
|
+
c.var.services.collections.getCollectionsByPostIds(posts.map((p) => p.id)),
|
|
139
|
+
]);
|
|
121
140
|
const aliasMap = new Map<string, string>();
|
|
122
141
|
for (const [id, aliases] of aliasesMap) {
|
|
123
142
|
if (aliases[0]) aliasMap.set(id, aliases[0]);
|
|
124
143
|
}
|
|
125
|
-
|
|
126
|
-
|
|
144
|
+
const withMedia = (post: Post) => ({
|
|
145
|
+
...post,
|
|
146
|
+
mediaAttachments: mediaMap.get(post.id) ?? [],
|
|
147
|
+
});
|
|
127
148
|
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
149
|
+
// An entry's `<category>` names each Collection its Thread is in, and its
|
|
150
|
+
// `jant:page` is where that Collection's page answers: its first custom URL
|
|
151
|
+
// when it has one, which its slug redirects to, as a post's permalink is.
|
|
152
|
+
const collectionAliases = await c.var.services.paths.getCollectionAliases([
|
|
153
|
+
...new Set(
|
|
154
|
+
[...collectionsMap.values()].flat().map((collection) => collection.id),
|
|
155
|
+
),
|
|
156
|
+
]);
|
|
157
|
+
const collectionTags = (post: Post): CollectionTagView[] =>
|
|
158
|
+
(collectionsMap.get(post.id) ?? []).map((collection) => ({
|
|
159
|
+
slug: collection.slug,
|
|
160
|
+
title: collection.title,
|
|
161
|
+
url: toPublicPath(
|
|
162
|
+
collectionAliases.get(collection.id)?.[0] ??
|
|
163
|
+
getCollectionPagePath(collection.slug),
|
|
164
|
+
mediaCtx.sitePathPrefix,
|
|
165
|
+
),
|
|
166
|
+
}));
|
|
167
|
+
|
|
168
|
+
return toPostViews(posts.map(withMedia), mediaCtx, undefined, aliasMap).map(
|
|
169
|
+
(postView, index) => {
|
|
170
|
+
const post = posts[index] as Post;
|
|
171
|
+
const thread = threadMap.get(post.id);
|
|
172
|
+
const replies = thread?.filter((reply) => reply.id !== post.id) ?? [];
|
|
173
|
+
return {
|
|
174
|
+
...postView,
|
|
175
|
+
collections: collectionTags(post),
|
|
176
|
+
feedUpdatedAt: getFeedEntryUpdatedAt(
|
|
177
|
+
post,
|
|
178
|
+
thread,
|
|
179
|
+
options.alsoUpdatedAt?.(index) ?? [],
|
|
180
|
+
),
|
|
181
|
+
threadReplies:
|
|
182
|
+
replies.length > 0
|
|
183
|
+
? toPostViews(replies.map(withMedia), mediaCtx, undefined, aliasMap)
|
|
184
|
+
: undefined,
|
|
185
|
+
};
|
|
186
|
+
},
|
|
187
|
+
);
|
|
139
188
|
}
|
|
140
189
|
|
|
141
190
|
/**
|
|
@@ -157,53 +206,7 @@ async function buildLatestFeedData(
|
|
|
157
206
|
limit: feedLimit,
|
|
158
207
|
});
|
|
159
208
|
|
|
160
|
-
const
|
|
161
|
-
const postIds = posts.map((p) => p.id);
|
|
162
|
-
|
|
163
|
-
const mediaCtx = createMediaContext(c.var.appConfig);
|
|
164
|
-
const [threadMap, mediaMap, aliasesMap] = await Promise.all([
|
|
165
|
-
c.var.services.posts.getPublishedThreads(rootIds, { publishedBefore }),
|
|
166
|
-
loadMediaMap(c, postIds, mediaCtx),
|
|
167
|
-
c.var.services.paths.getPostAliases(postIds),
|
|
168
|
-
]);
|
|
169
|
-
|
|
170
|
-
// Replies are only known once the threads are, so their media and aliases
|
|
171
|
-
// come in a second round.
|
|
172
|
-
const replyIds = collectReplyIds(threadMap);
|
|
173
|
-
const [replyMediaMap, replyAliasesMap] =
|
|
174
|
-
replyIds.length > 0
|
|
175
|
-
? await Promise.all([
|
|
176
|
-
loadMediaMap(c, replyIds, mediaCtx),
|
|
177
|
-
c.var.services.paths.getPostAliases(replyIds),
|
|
178
|
-
])
|
|
179
|
-
: [mediaMap, new Map<string, string[]>()];
|
|
180
|
-
// Merge reply media into main map
|
|
181
|
-
const mergedMediaMap = new Map([...mediaMap, ...replyMediaMap]);
|
|
182
|
-
const aliasMap = toAliasMap(new Map([...aliasesMap, ...replyAliasesMap]));
|
|
183
|
-
|
|
184
|
-
const postViews = toPostViews(
|
|
185
|
-
posts.map((p) => ({
|
|
186
|
-
...p,
|
|
187
|
-
mediaAttachments: mergedMediaMap.get(p.id) ?? [],
|
|
188
|
-
})),
|
|
189
|
-
mediaCtx,
|
|
190
|
-
undefined,
|
|
191
|
-
aliasMap,
|
|
192
|
-
).map((postView, index) => {
|
|
193
|
-
const post = posts[index] as (typeof posts)[number];
|
|
194
|
-
const thread = threadMap.get(post.id);
|
|
195
|
-
return {
|
|
196
|
-
...postView,
|
|
197
|
-
feedUpdatedAt: getFeedEntryUpdatedAt(post, thread),
|
|
198
|
-
threadReplies: buildThreadReplies(
|
|
199
|
-
post.id,
|
|
200
|
-
threadMap,
|
|
201
|
-
mergedMediaMap,
|
|
202
|
-
mediaCtx,
|
|
203
|
-
aliasMap,
|
|
204
|
-
),
|
|
205
|
-
};
|
|
206
|
-
});
|
|
209
|
+
const postViews = await buildFeedPostViews(c, posts, { publishedBefore });
|
|
207
210
|
|
|
208
211
|
return { posts, postViews };
|
|
209
212
|
}
|
|
@@ -246,46 +249,9 @@ async function buildFeaturedFeedData(
|
|
|
246
249
|
}
|
|
247
250
|
}
|
|
248
251
|
|
|
249
|
-
const
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
// Collect all post IDs (roots + replies) for media and alias loading
|
|
253
|
-
const allPostIds = new Set(postIds);
|
|
254
|
-
for (const thread of threadMap.values()) {
|
|
255
|
-
for (const post of thread) {
|
|
256
|
-
allPostIds.add(post.id);
|
|
257
|
-
}
|
|
258
|
-
}
|
|
259
|
-
|
|
260
|
-
const [mediaMap, aliasesMap] = await Promise.all([
|
|
261
|
-
loadMediaMap(c, [...allPostIds], mediaCtx),
|
|
262
|
-
c.var.services.paths.getPostAliases([...allPostIds]),
|
|
263
|
-
]);
|
|
264
|
-
const aliasMap = toAliasMap(aliasesMap);
|
|
265
|
-
|
|
266
|
-
const postViews = toPostViews(
|
|
267
|
-
posts.map((p) => ({
|
|
268
|
-
...p,
|
|
269
|
-
mediaAttachments: mediaMap.get(p.id) ?? [],
|
|
270
|
-
})),
|
|
271
|
-
mediaCtx,
|
|
272
|
-
undefined,
|
|
273
|
-
aliasMap,
|
|
274
|
-
).map((postView, index) => {
|
|
275
|
-
const post = posts[index] as (typeof posts)[number];
|
|
276
|
-
const thread = threadMap.get(post.id);
|
|
277
|
-
|
|
278
|
-
return {
|
|
279
|
-
...postView,
|
|
280
|
-
feedUpdatedAt: getFeedEntryUpdatedAt(post, thread),
|
|
281
|
-
threadReplies: buildThreadReplies(
|
|
282
|
-
post.id,
|
|
283
|
-
threadMap,
|
|
284
|
-
mediaMap,
|
|
285
|
-
mediaCtx,
|
|
286
|
-
aliasMap,
|
|
287
|
-
),
|
|
288
|
-
};
|
|
252
|
+
const postViews = await buildFeedPostViews(c, posts, {
|
|
253
|
+
publishedBefore,
|
|
254
|
+
threadMap,
|
|
289
255
|
});
|
|
290
256
|
|
|
291
257
|
return { posts, postViews };
|
|
@@ -323,9 +289,14 @@ export async function buildFeedData(
|
|
|
323
289
|
kind === "featured"
|
|
324
290
|
? await buildFeaturedFeedData(c, feedLimit, publishedBefore)
|
|
325
291
|
: await buildLatestFeedData(c, feedLimit, publishedBefore, opts.format);
|
|
292
|
+
// A filtered feed is its own feed: its self link, its `<id>`, and its
|
|
293
|
+
// language alternates keep the filter, as the archive feed's do.
|
|
294
|
+
const query =
|
|
295
|
+
kind === "latest" && opts.format ? `?format=${opts.format}` : "";
|
|
326
296
|
|
|
327
297
|
return {
|
|
328
|
-
...buildFeedDiscoveryFields(c),
|
|
298
|
+
...buildFeedDiscoveryFields(c, { query }),
|
|
299
|
+
labels: buildFeedLabels(c),
|
|
329
300
|
siteName,
|
|
330
301
|
siteDescription,
|
|
331
302
|
siteUrl,
|
|
@@ -347,7 +318,7 @@ export async function buildFeedData(
|
|
|
347
318
|
}),
|
|
348
319
|
)}`,
|
|
349
320
|
selfUrl: toAbsoluteSiteUrl(
|
|
350
|
-
`${viewBasePath(c)}${opts.selfPath}`,
|
|
321
|
+
`${viewBasePath(c)}${opts.selfPath}${query}`,
|
|
351
322
|
siteUrl,
|
|
352
323
|
appConfig.sitePathPrefix,
|
|
353
324
|
),
|
|
@@ -375,60 +346,42 @@ export function parseFormatQuery(c: Context<Env>): Format | undefined {
|
|
|
375
346
|
* @returns Atom feed response
|
|
376
347
|
*/
|
|
377
348
|
export async function renderMainFeed(c: Context<Env>): Promise<Response> {
|
|
349
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
378
350
|
const kind = c.var.appConfig.mainRssFeed === "latest" ? "latest" : "featured";
|
|
379
351
|
const feedData = await buildFeedData(c, { kind, selfPath: "/feed" });
|
|
380
352
|
return renderFeed(defaultFeedRenderer(feedData));
|
|
381
353
|
}
|
|
382
354
|
|
|
383
|
-
//
|
|
384
|
-
feedRoutes.
|
|
385
|
-
|
|
386
|
-
|
|
387
|
-
// indefinitely as a 308 so old subscribers don't break; preserves the
|
|
388
|
-
// ?format= query string.
|
|
389
|
-
feedRoutes.get("/latest", (c) => {
|
|
390
|
-
const sitePathPrefix = c.var.appConfig.sitePathPrefix;
|
|
391
|
-
const qs = c.req.url.includes("?")
|
|
392
|
-
? c.req.url.slice(c.req.url.indexOf("?"))
|
|
393
|
-
: "";
|
|
394
|
-
return c.redirect(
|
|
395
|
-
`${toPublicPath("/latest/feed", sitePathPrefix)}${qs}`,
|
|
396
|
-
308,
|
|
397
|
-
);
|
|
355
|
+
// Every route under /feed is a feed or a redirect to one.
|
|
356
|
+
feedRoutes.use("*", async (c, next) => {
|
|
357
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
358
|
+
await next();
|
|
398
359
|
});
|
|
399
360
|
|
|
400
|
-
//
|
|
401
|
-
feedRoutes.get("/
|
|
402
|
-
const sitePathPrefix = c.var.appConfig.sitePathPrefix;
|
|
403
|
-
return c.redirect(toPublicPath("/featured/feed", sitePathPrefix), 308);
|
|
404
|
-
});
|
|
361
|
+
// Atom — /feed
|
|
362
|
+
feedRoutes.get("/", renderMainFeed);
|
|
405
363
|
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
364
|
+
/**
|
|
365
|
+
* A 308 from a feed address that moved to where it lives now, kept
|
|
366
|
+
* indefinitely so old subscriptions don't break. The query string goes along:
|
|
367
|
+
* a subscriber's `?format=` is what they subscribed to.
|
|
368
|
+
*/
|
|
369
|
+
function redirectLegacyFeed(c: Context<Env>, to: string): Response {
|
|
370
|
+
const url = new URL(c.req.url);
|
|
412
371
|
return c.redirect(
|
|
413
|
-
`${toPublicPath(
|
|
372
|
+
`${toPublicPath(to, c.var.appConfig.sitePathPrefix)}${url.search}`,
|
|
414
373
|
308,
|
|
415
374
|
);
|
|
416
|
-
}
|
|
375
|
+
}
|
|
417
376
|
|
|
418
|
-
|
|
419
|
-
feedRoutes.get("/
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
|
|
426
|
-
|
|
427
|
-
|
|
428
|
-
|
|
429
|
-
return c.redirect(toPublicPath("/featured/feed", sitePathPrefix), 308);
|
|
430
|
-
});
|
|
431
|
-
feedRoutes.get("/all/atom.xml", (c) => {
|
|
432
|
-
const sitePathPrefix = c.var.appConfig.sitePathPrefix;
|
|
433
|
-
return c.redirect(toPublicPath("/latest/feed", sitePathPrefix), 308);
|
|
434
|
-
});
|
|
377
|
+
feedRoutes.get("/latest", (c) => redirectLegacyFeed(c, "/latest/feed"));
|
|
378
|
+
feedRoutes.get("/featured", (c) => redirectLegacyFeed(c, "/featured/feed"));
|
|
379
|
+
feedRoutes.get("/all", (c) => redirectLegacyFeed(c, "/latest/feed"));
|
|
380
|
+
feedRoutes.get("/atom.xml", (c) => redirectLegacyFeed(c, "/feed"));
|
|
381
|
+
feedRoutes.get("/latest/atom.xml", (c) =>
|
|
382
|
+
redirectLegacyFeed(c, "/latest/feed"),
|
|
383
|
+
);
|
|
384
|
+
feedRoutes.get("/featured/atom.xml", (c) =>
|
|
385
|
+
redirectLegacyFeed(c, "/featured/feed"),
|
|
386
|
+
);
|
|
387
|
+
feedRoutes.get("/all/atom.xml", (c) => redirectLegacyFeed(c, "/latest/feed"));
|
|
@@ -24,7 +24,7 @@ import {
|
|
|
24
24
|
type SitemapIndexEntry,
|
|
25
25
|
type SitemapUrlEntry,
|
|
26
26
|
} from "../../lib/feed.js";
|
|
27
|
-
import { toAbsoluteSiteUrl } from "../../lib/url.js";
|
|
27
|
+
import { getPostPath, toAbsoluteSiteUrl } from "../../lib/url.js";
|
|
28
28
|
|
|
29
29
|
type Env = { Bindings: Bindings; Variables: AppVariables };
|
|
30
30
|
|
|
@@ -129,11 +129,8 @@ sitemapRoutes.get("/:file{sitemap-posts-[0-9]+\\.xml}", async (c) => {
|
|
|
129
129
|
limit: SITEMAP_SHARD_SIZE,
|
|
130
130
|
});
|
|
131
131
|
|
|
132
|
-
// `entry.alias` already includes a leading "/" (see `paths.getPostAliases`);
|
|
133
|
-
// slugs are stored raw. Prepending "/" to an alias would create "//path",
|
|
134
|
-
// which `new URL()` reads as protocol-relative and hijacks the hostname.
|
|
135
132
|
const pathOf = (entry: (typeof shardEntries)[number]) =>
|
|
136
|
-
entry.
|
|
133
|
+
getPostPath(entry.slug, entry.alias);
|
|
137
134
|
|
|
138
135
|
// A post's URL is language-neutral and listed once. Translations are
|
|
139
136
|
// announced with `xhtml:link` alternates instead, which is what the sitemap
|
|
@@ -146,6 +143,9 @@ sitemapRoutes.get("/:file{sitemap-posts-[0-9]+\\.xml}", async (c) => {
|
|
|
146
143
|
translated.length > 0
|
|
147
144
|
? await c.var.services.posts.getTranslationsMap(
|
|
148
145
|
translated.map((entry) => entry.id),
|
|
146
|
+
// A sitemap is public: a draft or private translation must not
|
|
147
|
+
// show up here, not even as an address.
|
|
148
|
+
{ status: "published", excludePrivate: true },
|
|
149
149
|
)
|
|
150
150
|
: new Map<string, Post[]>();
|
|
151
151
|
const siblingIds = [...translationsMap.values()]
|
|
@@ -172,8 +172,10 @@ sitemapRoutes.get("/:file{sitemap-posts-[0-9]+\\.xml}", async (c) => {
|
|
|
172
172
|
{
|
|
173
173
|
hreflang: sibling.language,
|
|
174
174
|
href: absoluteUrl(
|
|
175
|
-
|
|
176
|
-
|
|
175
|
+
getPostPath(
|
|
176
|
+
sibling.slug,
|
|
177
|
+
siblingAliases.get(sibling.id)?.[0],
|
|
178
|
+
),
|
|
177
179
|
siteUrl,
|
|
178
180
|
sitePathPrefix,
|
|
179
181
|
),
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The archive's year picker is part of the page, so it offers only the years
|
|
3
|
+
* the reader has posts in.
|
|
4
|
+
*/
|
|
5
|
+
|
|
6
|
+
import { describe, expect, it } from "vitest";
|
|
7
|
+
import { createTestApp } from "../../../__tests__/helpers/app.js";
|
|
8
|
+
import { archiveRoutes } from "../archive.js";
|
|
9
|
+
|
|
10
|
+
const YEAR_2019 = Math.floor(Date.UTC(2019, 5, 1) / 1000);
|
|
11
|
+
const YEAR_2024 = Math.floor(Date.UTC(2024, 5, 1) / 1000);
|
|
12
|
+
|
|
13
|
+
async function archiveHtml(authenticated: boolean) {
|
|
14
|
+
const { app, services } = createTestApp({ authenticated });
|
|
15
|
+
app.route("/archive", archiveRoutes);
|
|
16
|
+
await services.posts.create({
|
|
17
|
+
format: "note",
|
|
18
|
+
bodyMarkdown: "public",
|
|
19
|
+
status: "published",
|
|
20
|
+
publishedAt: YEAR_2024,
|
|
21
|
+
});
|
|
22
|
+
await services.posts.create({
|
|
23
|
+
format: "note",
|
|
24
|
+
bodyMarkdown: "private",
|
|
25
|
+
status: "published",
|
|
26
|
+
visibility: "private",
|
|
27
|
+
publishedAt: YEAR_2019,
|
|
28
|
+
});
|
|
29
|
+
return (await app.request("/archive")).text();
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
describe("archive year picker", () => {
|
|
33
|
+
it("leaves out a year that has only private posts for a signed-out reader", async () => {
|
|
34
|
+
const html = await archiveHtml(false);
|
|
35
|
+
|
|
36
|
+
expect(html).toContain("year=2024");
|
|
37
|
+
expect(html).not.toContain("year=2019");
|
|
38
|
+
});
|
|
39
|
+
|
|
40
|
+
it("offers it to the signed-in author", async () => {
|
|
41
|
+
const html = await archiveHtml(true);
|
|
42
|
+
|
|
43
|
+
expect(html).toContain("year=2019");
|
|
44
|
+
});
|
|
45
|
+
});
|
|
@@ -288,4 +288,44 @@ describe("Collection Routing", () => {
|
|
|
288
288
|
expect(aliasFeedRes.status).toBe(200);
|
|
289
289
|
expect(await aliasFeedRes.text()).toContain("Book log");
|
|
290
290
|
});
|
|
291
|
+
|
|
292
|
+
it("redirects every other form of a collection's address to its one address", async () => {
|
|
293
|
+
const { app, services } = createCollectionRoutingTestApp();
|
|
294
|
+
|
|
295
|
+
const { collection } = await createCollectionWithPost(services, {
|
|
296
|
+
slug: "reading",
|
|
297
|
+
title: "Reading",
|
|
298
|
+
postTitle: "Book log",
|
|
299
|
+
});
|
|
300
|
+
const redirectOf = async (path: string) => {
|
|
301
|
+
const res = await app.request(path, { redirect: "manual" });
|
|
302
|
+
return [res.status, res.headers.get("Location")];
|
|
303
|
+
};
|
|
304
|
+
|
|
305
|
+
expect(await redirectOf("/Reading")).toEqual([301, "/reading"]);
|
|
306
|
+
|
|
307
|
+
await services.customUrls.create({
|
|
308
|
+
path: "notes",
|
|
309
|
+
targetType: "collection",
|
|
310
|
+
targetId: collection.id,
|
|
311
|
+
});
|
|
312
|
+
await services.customUrls.create({
|
|
313
|
+
path: "more-notes",
|
|
314
|
+
targetType: "collection",
|
|
315
|
+
targetId: collection.id,
|
|
316
|
+
});
|
|
317
|
+
// The first custom URL is the address, as the sitemap names it.
|
|
318
|
+
expect(await redirectOf("/more-notes")).toEqual([301, "/notes"]);
|
|
319
|
+
expect(await redirectOf("/NOTES")).toEqual([301, "/notes"]);
|
|
320
|
+
expect((await app.request("/notes")).status).toBe(200);
|
|
321
|
+
// A saved address keeps the page and sort a reader saved with it.
|
|
322
|
+
expect(await redirectOf("/more-notes?sort=oldest&page=2")).toEqual([
|
|
323
|
+
301,
|
|
324
|
+
"/notes?sort=oldest&page=2",
|
|
325
|
+
]);
|
|
326
|
+
expect(await redirectOf("/Reading?sort=oldest")).toEqual([
|
|
327
|
+
301,
|
|
328
|
+
"/notes?sort=oldest",
|
|
329
|
+
]);
|
|
330
|
+
});
|
|
291
331
|
});
|
|
@@ -53,6 +53,7 @@ describe("Collections Listing Page - Data Logic", () => {
|
|
|
53
53
|
await collectionService.addThread(recipes.id, p2.id);
|
|
54
54
|
|
|
55
55
|
const directory = await collectionService.listDirectoryData({
|
|
56
|
+
timeZone: "UTC",
|
|
56
57
|
isAuthenticated: false,
|
|
57
58
|
});
|
|
58
59
|
|
|
@@ -69,6 +70,7 @@ describe("Collections Listing Page - Data Logic", () => {
|
|
|
69
70
|
|
|
70
71
|
it("returns empty list when no collections exist", async () => {
|
|
71
72
|
const directory = await collectionService.listDirectoryData({
|
|
73
|
+
timeZone: "UTC",
|
|
72
74
|
isAuthenticated: false,
|
|
73
75
|
});
|
|
74
76
|
expect(directory.collections).toHaveLength(0);
|
|
@@ -96,6 +98,7 @@ describe("Collections Listing Page - Data Logic", () => {
|
|
|
96
98
|
await postService.delete(post.id);
|
|
97
99
|
|
|
98
100
|
const directory = await collectionService.listDirectoryData({
|
|
101
|
+
timeZone: "UTC",
|
|
99
102
|
isAuthenticated: false,
|
|
100
103
|
});
|
|
101
104
|
expect(directory.collections[0]?.threadCount).toBe(1);
|
|
@@ -400,6 +400,37 @@ describe("language views filter content", () => {
|
|
|
400
400
|
);
|
|
401
401
|
});
|
|
402
402
|
|
|
403
|
+
it("links each version by its custom path when it has one", async () => {
|
|
404
|
+
const { app, services, zh, en } = await seedTwoLanguages();
|
|
405
|
+
await services.posts.linkTranslation(zh.id, en.id);
|
|
406
|
+
await services.paths.create({
|
|
407
|
+
path: "notes/kafei",
|
|
408
|
+
kind: "alias",
|
|
409
|
+
postId: zh.id,
|
|
410
|
+
});
|
|
411
|
+
await services.paths.create({
|
|
412
|
+
path: "notes/coffee",
|
|
413
|
+
kind: "alias",
|
|
414
|
+
postId: en.id,
|
|
415
|
+
});
|
|
416
|
+
|
|
417
|
+
const html = await (await app.request("/notes/kafei")).text();
|
|
418
|
+
|
|
419
|
+
// A custom path already starts with "/". One more makes "//notes/coffee",
|
|
420
|
+
// a protocol-relative URL that `new URL()` resolves to the host "notes".
|
|
421
|
+
expect(html).not.toContain("//notes/");
|
|
422
|
+
expect(html).toContain('href="/notes/coffee" hreflang="en"');
|
|
423
|
+
expect(html).toContain(
|
|
424
|
+
'<link rel="alternate" hreflang="zh-Hans" href="http://localhost:3000/notes/kafei"/>',
|
|
425
|
+
);
|
|
426
|
+
expect(html).toContain(
|
|
427
|
+
'<link rel="alternate" hreflang="en" href="http://localhost:3000/notes/coffee"/>',
|
|
428
|
+
);
|
|
429
|
+
const start = html.indexOf("data-post-translations");
|
|
430
|
+
const line = html.slice(start, html.indexOf("</p>", start));
|
|
431
|
+
expect(line).toContain('href="/notes/coffee"');
|
|
432
|
+
});
|
|
433
|
+
|
|
403
434
|
it("offers the translation to a reader who cannot read this one", async () => {
|
|
404
435
|
const { app, services, zh, en } = await seedTwoLanguages();
|
|
405
436
|
await services.posts.linkTranslation(zh.id, en.id);
|
|
@@ -135,7 +135,24 @@ describe("post page round trips", () => {
|
|
|
135
135
|
expect(countPostReads(statements)).toBe(1);
|
|
136
136
|
});
|
|
137
137
|
|
|
138
|
-
it("
|
|
138
|
+
it("redirects a slug in another letter case to the slug", async () => {
|
|
139
|
+
const { app, services } = createPostPageApp();
|
|
140
|
+
const post = await services.posts.create({
|
|
141
|
+
format: "note",
|
|
142
|
+
title: "Mixed case",
|
|
143
|
+
bodyMarkdown: "Body",
|
|
144
|
+
status: "published",
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
const res = await app.request(`/${post.slug.toUpperCase()}`);
|
|
148
|
+
expect(res.status).toBe(301);
|
|
149
|
+
expect(res.headers.get("location")).toBe(`/${post.slug}`);
|
|
150
|
+
});
|
|
151
|
+
|
|
152
|
+
// The oldest custom URL is the post's address everywhere: feeds, the
|
|
153
|
+
// sitemap, and the export name it by that, so the page redirects there too.
|
|
154
|
+
// A later custom URL is another way in, not a new identity.
|
|
155
|
+
it("takes the oldest alias as the canonical address", async () => {
|
|
139
156
|
const { app, services } = createPostPageApp();
|
|
140
157
|
const post = await services.posts.create({
|
|
141
158
|
format: "note",
|
|
@@ -156,7 +173,22 @@ describe("post page round trips", () => {
|
|
|
156
173
|
|
|
157
174
|
const res = await app.request(`/${post.slug}`);
|
|
158
175
|
expect(res.status).toBe(301);
|
|
159
|
-
expect(res.headers.get("location")).toBe("/
|
|
176
|
+
expect(res.headers.get("location")).toBe("/first-name");
|
|
177
|
+
|
|
178
|
+
const second = await app.request("/second-name");
|
|
179
|
+
expect(second.status).toBe(301);
|
|
180
|
+
expect(second.headers.get("location")).toBe("/first-name");
|
|
181
|
+
|
|
182
|
+
const recased = await app.request("/First-Name");
|
|
183
|
+
expect(recased.status).toBe(301);
|
|
184
|
+
expect(recased.headers.get("location")).toBe("/first-name");
|
|
185
|
+
|
|
186
|
+
const withQuery = await app.request("/second-name?utm_source=feed");
|
|
187
|
+
expect(withQuery.headers.get("location")).toBe(
|
|
188
|
+
"/first-name?utm_source=feed",
|
|
189
|
+
);
|
|
190
|
+
|
|
191
|
+
expect((await app.request("/first-name")).status).toBe(200);
|
|
160
192
|
});
|
|
161
193
|
});
|
|
162
194
|
|
|
@@ -168,12 +168,15 @@ describe("Search Page Routes", () => {
|
|
|
168
168
|
}
|
|
169
169
|
});
|
|
170
170
|
|
|
171
|
-
it(
|
|
171
|
+
it.each([
|
|
172
|
+
["rate limiting is off", { enabled: false }],
|
|
173
|
+
["the search limit is 0", { searchPerMinute: 0 }],
|
|
174
|
+
])("doesn't limit anyone when %s", async (_label, rateLimit) => {
|
|
172
175
|
const { app } = createTestApp({ authenticated: false, fts: true });
|
|
173
176
|
app.use("/search", async (c, next) => {
|
|
174
177
|
c.set("appConfig", {
|
|
175
178
|
...c.var.appConfig,
|
|
176
|
-
rateLimit: { ...c.var.appConfig.rateLimit,
|
|
179
|
+
rateLimit: { ...c.var.appConfig.rateLimit, ...rateLimit },
|
|
177
180
|
});
|
|
178
181
|
await next();
|
|
179
182
|
});
|