@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
|
@@ -0,0 +1,207 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Where a folded Thread's gap leads, on the page and in the feed.
|
|
3
|
+
*
|
|
4
|
+
* Both surfaces fold through `lib/thread-fold.ts`, but they reach it by
|
|
5
|
+
* different paths: the feed slices the chain it holds, while the page ranks in
|
|
6
|
+
* SQL and hands the gap's address through `TimelineItemView` into
|
|
7
|
+
* `ThreadPreview`. A field dropped anywhere on that second path went unnoticed
|
|
8
|
+
* by the fold's own tests, so this compares what each surface actually serves.
|
|
9
|
+
*
|
|
10
|
+
* The Featured page folds differently — the root, the featured posts and the
|
|
11
|
+
* last post, with a gap wherever that leaves a run out — but by the same rule:
|
|
12
|
+
* each gap opens the first post of its run. That post is never loaded whole,
|
|
13
|
+
* so its address is read on its own and has to come out right.
|
|
14
|
+
*/
|
|
15
|
+
|
|
16
|
+
import { describe, expect, it } from "vitest";
|
|
17
|
+
import { createTestApp } from "../../../__tests__/helpers/app.js";
|
|
18
|
+
import type { Post } from "../../../types.js";
|
|
19
|
+
import { featuredRoutes } from "../featured.js";
|
|
20
|
+
import { homeRoutes } from "../home.js";
|
|
21
|
+
import { latestRoutes } from "../latest.js";
|
|
22
|
+
|
|
23
|
+
function createThreadGapTestApp(options: { sitePathPrefix?: string } = {}) {
|
|
24
|
+
const testApp = createTestApp(options);
|
|
25
|
+
const { app } = testApp;
|
|
26
|
+
|
|
27
|
+
app.use("*", async (c, next) => {
|
|
28
|
+
c.set("publicPath", c.req.path);
|
|
29
|
+
c.set("publicRequestUrl", c.req.url);
|
|
30
|
+
await next();
|
|
31
|
+
});
|
|
32
|
+
|
|
33
|
+
app.route("/featured", featuredRoutes);
|
|
34
|
+
app.route("/latest", latestRoutes);
|
|
35
|
+
app.route("/", homeRoutes);
|
|
36
|
+
|
|
37
|
+
return testApp;
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/**
|
|
41
|
+
* A root and nine replies. The fold shows two leading, two trailing and the
|
|
42
|
+
* newest, so replies 3–6 are hidden.
|
|
43
|
+
*/
|
|
44
|
+
async function createLongThread(
|
|
45
|
+
services: ReturnType<typeof createTestApp>["services"],
|
|
46
|
+
) {
|
|
47
|
+
const root = await services.posts.create({
|
|
48
|
+
format: "note",
|
|
49
|
+
bodyMarkdown: "Root",
|
|
50
|
+
publishedAt: 1000,
|
|
51
|
+
});
|
|
52
|
+
const replies = [];
|
|
53
|
+
let parentId = root.id;
|
|
54
|
+
for (let index = 1; index <= 9; index++) {
|
|
55
|
+
const reply = await services.posts.create({
|
|
56
|
+
format: "note",
|
|
57
|
+
bodyMarkdown: `Reply ${index}`,
|
|
58
|
+
replyToId: parentId,
|
|
59
|
+
publishedAt: 1000 + index,
|
|
60
|
+
});
|
|
61
|
+
replies.push(reply);
|
|
62
|
+
parentId = reply.id;
|
|
63
|
+
}
|
|
64
|
+
return replies;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
describe("Thread gap link", () => {
|
|
68
|
+
it("opens the first hidden reply on the homepage, as the Latest feed does", async () => {
|
|
69
|
+
const { app, services } = createThreadGapTestApp();
|
|
70
|
+
const replies = await createLongThread(services);
|
|
71
|
+
const firstHidden = replies[2];
|
|
72
|
+
const latest = replies[8];
|
|
73
|
+
if (!firstHidden || !latest) throw new Error("thread not created");
|
|
74
|
+
|
|
75
|
+
const html = await (await app.request("/")).text();
|
|
76
|
+
const gapLinks = [
|
|
77
|
+
...html.matchAll(/<a\b[^>]*\bclass="thread-gap-link"[^>]*>([^<]*)</g),
|
|
78
|
+
];
|
|
79
|
+
expect(gapLinks).toHaveLength(1);
|
|
80
|
+
const [gapTag, gapLabel] = gapLinks[0] ?? [];
|
|
81
|
+
expect(gapTag).toContain(`href="/${firstHidden.slug}"`);
|
|
82
|
+
expect(gapTag).not.toContain(`href="/${latest.slug}"`);
|
|
83
|
+
expect(gapLabel).toBe("4 more posts");
|
|
84
|
+
|
|
85
|
+
const atom = await (await app.request("/latest/feed")).text();
|
|
86
|
+
const thread = atom.match(/<jant:thread\b[^>]*>/)?.[0] ?? "";
|
|
87
|
+
expect(thread).toContain('hidden="4"');
|
|
88
|
+
expect(thread).toMatch(new RegExp(`\\bgap="[^"]*/${firstHidden.slug}"`));
|
|
89
|
+
});
|
|
90
|
+
|
|
91
|
+
it("opens the first hidden reply at its custom path", async () => {
|
|
92
|
+
const { app, services } = createThreadGapTestApp();
|
|
93
|
+
const replies = await createLongThread(services);
|
|
94
|
+
const firstHidden = replies[2];
|
|
95
|
+
if (!firstHidden) throw new Error("thread not created");
|
|
96
|
+
await services.paths.create({
|
|
97
|
+
path: "notes/the-gap",
|
|
98
|
+
kind: "alias",
|
|
99
|
+
postId: firstHidden.id,
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
const html = await (await app.request("/")).text();
|
|
103
|
+
const gapTag = html.match(/<a\b[^>]*\bclass="thread-gap-link"[^>]*>/)?.[0];
|
|
104
|
+
// A custom path already starts with "/"; another makes a protocol-relative
|
|
105
|
+
// URL that leaves the site.
|
|
106
|
+
expect(gapTag).toContain('href="/notes/the-gap"');
|
|
107
|
+
expect(gapTag).not.toContain("//notes/the-gap");
|
|
108
|
+
});
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
/**
|
|
112
|
+
* A root and a chain of replies, one post per entry of `featured`, each
|
|
113
|
+
* published a second after the one before it.
|
|
114
|
+
*/
|
|
115
|
+
async function createFeaturedThread(
|
|
116
|
+
services: ReturnType<typeof createTestApp>["services"],
|
|
117
|
+
featured: boolean[],
|
|
118
|
+
): Promise<Post[]> {
|
|
119
|
+
const thread: Post[] = [];
|
|
120
|
+
for (const [index, isFeatured] of featured.entries()) {
|
|
121
|
+
thread.push(
|
|
122
|
+
await services.posts.create({
|
|
123
|
+
format: "note",
|
|
124
|
+
bodyMarkdown: `Post ${index}`,
|
|
125
|
+
featured: isFeatured,
|
|
126
|
+
replyToId: thread.at(-1)?.id,
|
|
127
|
+
publishedAt: 1000 + index,
|
|
128
|
+
}),
|
|
129
|
+
);
|
|
130
|
+
}
|
|
131
|
+
return thread;
|
|
132
|
+
}
|
|
133
|
+
|
|
134
|
+
/** Every gap link on the page, with its label, in page order. */
|
|
135
|
+
async function featuredGapLinks(
|
|
136
|
+
app: ReturnType<typeof createTestApp>["app"],
|
|
137
|
+
): Promise<Array<{ href: string; label: string }>> {
|
|
138
|
+
const html = await (await app.request("/featured")).text();
|
|
139
|
+
return [
|
|
140
|
+
...html.matchAll(/<a\b[^>]*\bclass="thread-gap-link"[^>]*>([^<]*)</g),
|
|
141
|
+
].map(([tag, label]) => ({
|
|
142
|
+
href: tag.match(/\bhref="([^"]*)"/)?.[1] ?? "",
|
|
143
|
+
label: (label ?? "").trim(),
|
|
144
|
+
}));
|
|
145
|
+
}
|
|
146
|
+
|
|
147
|
+
describe("Featured gap link", () => {
|
|
148
|
+
it("opens the first post of each hidden run", async () => {
|
|
149
|
+
const { app, services } = createThreadGapTestApp();
|
|
150
|
+
// root · [1] · 2★ · [3 · 4] · 5
|
|
151
|
+
const thread = await createFeaturedThread(services, [
|
|
152
|
+
false,
|
|
153
|
+
false,
|
|
154
|
+
true,
|
|
155
|
+
false,
|
|
156
|
+
false,
|
|
157
|
+
false,
|
|
158
|
+
]);
|
|
159
|
+
|
|
160
|
+
expect(await featuredGapLinks(app)).toEqual([
|
|
161
|
+
{ href: `/${thread[1]?.slug}`, label: "1 hidden post" },
|
|
162
|
+
{ href: `/${thread[3]?.slug}`, label: "2 hidden posts" },
|
|
163
|
+
]);
|
|
164
|
+
});
|
|
165
|
+
|
|
166
|
+
it("leaves no gap between posts shown back to back", async () => {
|
|
167
|
+
const { app, services } = createThreadGapTestApp();
|
|
168
|
+
// root★ · 1★ · [2] · 3
|
|
169
|
+
const thread = await createFeaturedThread(services, [
|
|
170
|
+
true,
|
|
171
|
+
true,
|
|
172
|
+
false,
|
|
173
|
+
false,
|
|
174
|
+
]);
|
|
175
|
+
|
|
176
|
+
expect(await featuredGapLinks(app)).toEqual([
|
|
177
|
+
{ href: `/${thread[2]?.slug}`, label: "1 hidden post" },
|
|
178
|
+
]);
|
|
179
|
+
});
|
|
180
|
+
|
|
181
|
+
it("opens the first hidden post at its custom path", async () => {
|
|
182
|
+
const { app, services } = createThreadGapTestApp();
|
|
183
|
+
const thread = await createFeaturedThread(services, [true, false, false]);
|
|
184
|
+
const firstHidden = thread[1];
|
|
185
|
+
if (!firstHidden) throw new Error("thread not created");
|
|
186
|
+
await services.paths.create({
|
|
187
|
+
path: "notes/the-gap",
|
|
188
|
+
kind: "alias",
|
|
189
|
+
postId: firstHidden.id,
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
expect(await featuredGapLinks(app)).toEqual([
|
|
193
|
+
{ href: "/notes/the-gap", label: "1 hidden post" },
|
|
194
|
+
]);
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
it("carries the site path prefix", async () => {
|
|
198
|
+
const { app, services } = createThreadGapTestApp({
|
|
199
|
+
sitePathPrefix: "/blog",
|
|
200
|
+
});
|
|
201
|
+
const thread = await createFeaturedThread(services, [true, false, false]);
|
|
202
|
+
|
|
203
|
+
expect(await featuredGapLinks(app)).toEqual([
|
|
204
|
+
{ href: `/blog/${thread[1]?.slug}`, label: "1 hidden post" },
|
|
205
|
+
]);
|
|
206
|
+
});
|
|
207
|
+
});
|
|
@@ -10,6 +10,7 @@
|
|
|
10
10
|
|
|
11
11
|
import { msg } from "@lingui/core/macro";
|
|
12
12
|
import { Hono } from "hono";
|
|
13
|
+
import { buildFeedPostViews } from "../feed/feed.js";
|
|
13
14
|
import type { Context } from "hono";
|
|
14
15
|
import type {
|
|
15
16
|
Bindings,
|
|
@@ -47,9 +48,10 @@ import {
|
|
|
47
48
|
import { defaultFeedRenderer } from "../../lib/feed.js";
|
|
48
49
|
import {
|
|
49
50
|
buildFeedDiscoveryFields,
|
|
50
|
-
|
|
51
|
+
buildFeedLabels,
|
|
51
52
|
getFeedLimit,
|
|
52
53
|
getRssPublishedBefore,
|
|
54
|
+
feedsPublished,
|
|
53
55
|
renderFeed,
|
|
54
56
|
} from "../../lib/feed-policy.js";
|
|
55
57
|
import { getNavigationData } from "../../lib/navigation.js";
|
|
@@ -66,9 +68,9 @@ import {
|
|
|
66
68
|
import {
|
|
67
69
|
createMediaContext,
|
|
68
70
|
toArchiveGroupsWithMedia,
|
|
69
|
-
toPostViews,
|
|
70
71
|
} from "../../lib/view.js";
|
|
71
72
|
import { buildMediaMap } from "../../lib/media-helpers.js";
|
|
73
|
+
|
|
72
74
|
import { assembleTimelineItems } from "../../lib/timeline.js";
|
|
73
75
|
import { getI18n } from "../../i18n/index.js";
|
|
74
76
|
import type { PostFilters } from "../../services/post.js";
|
|
@@ -253,11 +255,13 @@ function buildArchivePostFilters(
|
|
|
253
255
|
opts: {
|
|
254
256
|
isAuthenticated: boolean;
|
|
255
257
|
lang?: string;
|
|
258
|
+
/** The site's time zone, whose calendar `year` reads. */
|
|
259
|
+
timeZone: string;
|
|
256
260
|
/** Overrides the request's own selection, for the unfiltered baseline. */
|
|
257
261
|
selection?: PostFilterSelection;
|
|
258
262
|
},
|
|
259
263
|
): PostFilters {
|
|
260
|
-
const { isAuthenticated, lang } = opts;
|
|
264
|
+
const { isAuthenticated, lang, timeZone } = opts;
|
|
261
265
|
const selection = opts.selection ?? params.selection;
|
|
262
266
|
const sortsByActivity = params.sort === "updated";
|
|
263
267
|
|
|
@@ -276,6 +280,7 @@ function buildArchivePostFilters(
|
|
|
276
280
|
// under `year=N` really belongs to that year.
|
|
277
281
|
...toPostFilters(selection, {
|
|
278
282
|
yearAxis: sortsByActivity ? "sort" : "published",
|
|
283
|
+
timeZone,
|
|
279
284
|
}),
|
|
280
285
|
// "thread_updated", not "activity": the archive is the canonical all-posts
|
|
281
286
|
// view, and the quiet-reply switch only promises not to move a Thread on
|
|
@@ -441,6 +446,7 @@ export async function renderArchivePage(
|
|
|
441
446
|
const filters = buildArchivePostFilters(params, {
|
|
442
447
|
isAuthenticated,
|
|
443
448
|
lang: getViewLang(c) ?? undefined,
|
|
449
|
+
timeZone: appConfig.timeZone,
|
|
444
450
|
});
|
|
445
451
|
|
|
446
452
|
// --- Parallel data fetches ------------------------------------------------
|
|
@@ -462,6 +468,7 @@ export async function renderArchivePage(
|
|
|
462
468
|
? buildArchivePostFilters(params, {
|
|
463
469
|
isAuthenticated,
|
|
464
470
|
lang: filters.lang,
|
|
471
|
+
timeZone: appConfig.timeZone,
|
|
465
472
|
selection: {},
|
|
466
473
|
})
|
|
467
474
|
: undefined;
|
|
@@ -482,18 +489,24 @@ export async function renderArchivePage(
|
|
|
482
489
|
: Promise.resolve(undefined),
|
|
483
490
|
isListView
|
|
484
491
|
? Promise.resolve([] as { yearMonth: string; count: number }[])
|
|
485
|
-
: services.posts.countByYearMonth(filters),
|
|
492
|
+
: services.posts.countByYearMonth(filters, appConfig.timeZone),
|
|
486
493
|
services.posts.list({
|
|
487
494
|
...filters,
|
|
488
495
|
limit: pageSize,
|
|
489
496
|
offset: (params.currentPage - 1) * pageSize,
|
|
490
497
|
}),
|
|
491
|
-
|
|
492
|
-
|
|
493
|
-
|
|
494
|
-
|
|
495
|
-
|
|
496
|
-
|
|
498
|
+
// The year picker is part of the page, so a signed-out reader mustn't
|
|
499
|
+
// learn from it that private posts exist in a given year.
|
|
500
|
+
services.posts.getDistinctYears(
|
|
501
|
+
{
|
|
502
|
+
status: "published",
|
|
503
|
+
excludeReplies: true,
|
|
504
|
+
excludePrivate: !isAuthenticated,
|
|
505
|
+
lang: filters.lang,
|
|
506
|
+
sortBy: filters.sortBy,
|
|
507
|
+
},
|
|
508
|
+
appConfig.timeZone,
|
|
509
|
+
),
|
|
497
510
|
// Already loaded when the query named a collection, because parsing needed
|
|
498
511
|
// it. Fetched here otherwise, so an unfiltered archive keeps paying for one
|
|
499
512
|
// round of queries rather than two.
|
|
@@ -630,6 +643,7 @@ export async function renderArchivePage(
|
|
|
630
643
|
: `${toAbsoluteSiteUrl(c.req.path, appConfig.siteUrl, appConfig.sitePathPrefix)}${canonicalQuery}`;
|
|
631
644
|
|
|
632
645
|
return renderPublicPage(c, {
|
|
646
|
+
page: "archive",
|
|
633
647
|
// A tab has no filter bar beside it, so unlike the page heading this has to
|
|
634
648
|
// name the selection itself — otherwise every bookmarked filtered view
|
|
635
649
|
// reads identically in the tab bar.
|
|
@@ -780,6 +794,7 @@ async function buildArchiveFeedData(
|
|
|
780
794
|
// bound the publication column, the tighter one wins.
|
|
781
795
|
const selectionFilters = toPostFilters(params.selection, {
|
|
782
796
|
yearAxis: sortsByActivity ? "sort" : "published",
|
|
797
|
+
timeZone: appConfig.timeZone,
|
|
783
798
|
});
|
|
784
799
|
const filters: PostFilters = {
|
|
785
800
|
lang: getViewLang(c) ?? undefined,
|
|
@@ -799,95 +814,15 @@ async function buildArchiveFeedData(
|
|
|
799
814
|
|
|
800
815
|
const posts = await services.posts.list(filters);
|
|
801
816
|
|
|
802
|
-
|
|
803
|
-
|
|
804
|
-
|
|
805
|
-
// Batch load media, aliases, and thread replies
|
|
806
|
-
const postIds = posts.map((p) => p.id);
|
|
807
|
-
const [threadMap, rawMediaMap, aliasesMap] = await Promise.all([
|
|
808
|
-
services.posts.getPublishedThreads(rootIds, {
|
|
809
|
-
publishedBefore: rssPublishedBefore,
|
|
810
|
-
}),
|
|
811
|
-
services.media.getByPostIds(postIds),
|
|
812
|
-
services.paths.getPostAliases(postIds),
|
|
813
|
-
]);
|
|
814
|
-
|
|
815
|
-
// Collect reply IDs for media loading
|
|
816
|
-
const replyIds: string[] = [];
|
|
817
|
-
for (const [rootId, thread] of threadMap) {
|
|
818
|
-
for (const reply of thread) {
|
|
819
|
-
if (reply.id !== rootId) {
|
|
820
|
-
replyIds.push(reply.id);
|
|
821
|
-
}
|
|
822
|
-
}
|
|
823
|
-
}
|
|
824
|
-
|
|
825
|
-
const replyMediaMap =
|
|
826
|
-
replyIds.length > 0
|
|
827
|
-
? await services.media.getByPostIds(replyIds)
|
|
828
|
-
: new Map<
|
|
829
|
-
string,
|
|
830
|
-
typeof rawMediaMap extends Map<string, infer V> ? V : never
|
|
831
|
-
>();
|
|
832
|
-
|
|
833
|
-
const mediaCtx = createMediaContext(appConfig);
|
|
834
|
-
|
|
835
|
-
// Merge all media
|
|
836
|
-
const allRawMedia = new Map(rawMediaMap);
|
|
837
|
-
for (const [id, media] of replyMediaMap) {
|
|
838
|
-
allRawMedia.set(id, media);
|
|
839
|
-
}
|
|
840
|
-
|
|
841
|
-
const mediaMap = buildMediaMap(
|
|
842
|
-
allRawMedia,
|
|
843
|
-
mediaCtx.r2PublicUrl,
|
|
844
|
-
mediaCtx.imageTransformUrl,
|
|
845
|
-
mediaCtx.s3PublicUrl,
|
|
846
|
-
mediaCtx.localPublicUrl,
|
|
847
|
-
mediaCtx.sitePathPrefix,
|
|
848
|
-
);
|
|
849
|
-
const aliasMap = new Map<string, string>();
|
|
850
|
-
for (const [id, aliases] of aliasesMap) {
|
|
851
|
-
if (aliases[0]) aliasMap.set(id, aliases[0]);
|
|
852
|
-
}
|
|
853
|
-
|
|
854
|
-
const postViews = toPostViews(
|
|
855
|
-
posts.map((p) => ({
|
|
856
|
-
...p,
|
|
857
|
-
mediaAttachments: mediaMap.get(p.id) ?? [],
|
|
858
|
-
})),
|
|
859
|
-
mediaCtx,
|
|
860
|
-
undefined,
|
|
861
|
-
aliasMap,
|
|
862
|
-
).map((postView, index) => {
|
|
863
|
-
const post = posts[index] as (typeof posts)[number];
|
|
864
|
-
const thread = threadMap.get(post.id);
|
|
865
|
-
|
|
866
|
-
// Build thread replies
|
|
867
|
-
const replies =
|
|
868
|
-
thread && thread.length > 1
|
|
869
|
-
? toPostViews(
|
|
870
|
-
thread
|
|
871
|
-
.filter((r) => r.id !== post.id)
|
|
872
|
-
.map((r) => ({
|
|
873
|
-
...r,
|
|
874
|
-
mediaAttachments: mediaMap.get(r.id) ?? [],
|
|
875
|
-
})),
|
|
876
|
-
mediaCtx,
|
|
877
|
-
)
|
|
878
|
-
: undefined;
|
|
879
|
-
|
|
880
|
-
return {
|
|
881
|
-
...postView,
|
|
882
|
-
feedUpdatedAt: getFeedEntryUpdatedAt(post, thread),
|
|
883
|
-
threadReplies: replies,
|
|
884
|
-
};
|
|
817
|
+
const postViews = await buildFeedPostViews(c, posts, {
|
|
818
|
+
publishedBefore: rssPublishedBefore,
|
|
885
819
|
});
|
|
886
820
|
|
|
887
821
|
const feedQuery = buildArchiveFeedQuery(params, dimensionCtx);
|
|
888
822
|
|
|
889
823
|
return {
|
|
890
824
|
...buildFeedDiscoveryFields(c, { query: feedQuery }),
|
|
825
|
+
labels: buildFeedLabels(c),
|
|
891
826
|
siteName: appConfig.siteName,
|
|
892
827
|
siteDescription: toPlainText(appConfig.siteDescription),
|
|
893
828
|
siteUrl: appConfig.siteUrl,
|
|
@@ -912,6 +847,7 @@ async function buildArchiveFeedData(
|
|
|
912
847
|
* @returns Atom feed response
|
|
913
848
|
*/
|
|
914
849
|
export async function renderArchiveFeed(c: Context<Env>): Promise<Response> {
|
|
850
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
915
851
|
// No session reaches a feed reader, so a selection only the author can see
|
|
916
852
|
// has no honest rendering here — not an empty feed, and certainly not the
|
|
917
853
|
// unfiltered one. The page already withholds the link; this is the backstop.
|
|
@@ -932,7 +868,10 @@ export async function renderArchiveFeed(c: Context<Env>): Promise<Response> {
|
|
|
932
868
|
archiveRoutes.get("/feed", renderArchiveFeed);
|
|
933
869
|
|
|
934
870
|
// Legacy atom.xml redirect
|
|
935
|
-
export function redirectLegacyArchiveFeed(
|
|
871
|
+
export function redirectLegacyArchiveFeed(
|
|
872
|
+
c: Context<Env>,
|
|
873
|
+
): Response | Promise<Response> {
|
|
874
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
936
875
|
const qs = c.req.url.includes("?")
|
|
937
876
|
? c.req.url.slice(c.req.url.indexOf("?"))
|
|
938
877
|
: "";
|
|
@@ -67,6 +67,7 @@ async function renderBrandSpecPage(
|
|
|
67
67
|
const appleTouchHref = getJantIconHref("appleTouch", navData.sitePathPrefix);
|
|
68
68
|
|
|
69
69
|
return renderPublicPage(c, {
|
|
70
|
+
page: "brand",
|
|
70
71
|
title: buildPageTitle(options.pageTitle, navData.siteName),
|
|
71
72
|
description: options.description,
|
|
72
73
|
socialImageUrl,
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
|
|
5
5
|
import { Hono, type Context } from "hono";
|
|
6
|
+
import { buildFeedPostViews } from "../feed/feed.js";
|
|
6
7
|
import type { Bindings } from "../../types.js";
|
|
7
8
|
import type { AppVariables } from "../../types/app-context.js";
|
|
8
9
|
import { CollectionPage } from "../../ui/pages/CollectionPage.js";
|
|
@@ -21,14 +22,13 @@ import { assembleCollectionTimeline } from "../../lib/timeline.js";
|
|
|
21
22
|
import { defaultFeedRenderer } from "../../lib/feed.js";
|
|
22
23
|
import {
|
|
23
24
|
buildFeedDiscoveryFields,
|
|
24
|
-
|
|
25
|
+
buildFeedLabels,
|
|
25
26
|
getFeedLimit,
|
|
26
27
|
getRssPublishedBefore,
|
|
28
|
+
feedsPublished,
|
|
27
29
|
renderFeed,
|
|
28
30
|
} from "../../lib/feed-policy.js";
|
|
29
31
|
import { toPlainText as markdownToPlainText } from "../../lib/markdown.js";
|
|
30
|
-
import { buildMediaMap } from "../../lib/media-helpers.js";
|
|
31
|
-
import { createMediaContext, toPostViews } from "../../lib/view.js";
|
|
32
32
|
import { toAbsoluteSiteUrl } from "../../lib/url.js";
|
|
33
33
|
import {
|
|
34
34
|
buildLanguageSwitcher,
|
|
@@ -178,6 +178,7 @@ export async function renderCollectionPage(
|
|
|
178
178
|
: undefined;
|
|
179
179
|
|
|
180
180
|
return renderPublicPage(c, {
|
|
181
|
+
page: "collection",
|
|
181
182
|
title:
|
|
182
183
|
page > 1
|
|
183
184
|
? buildPageTitle(selectionTitle, paginatedPageTitle, navData.siteName)
|
|
@@ -232,6 +233,9 @@ export async function renderCollectionFeed(
|
|
|
232
233
|
slugExpression: string,
|
|
233
234
|
feedPathOverride?: string,
|
|
234
235
|
): Promise<Response | null> {
|
|
236
|
+
// Null, which every caller answers with 404, as it does a selection that
|
|
237
|
+
// names nothing.
|
|
238
|
+
if (!feedsPublished(c)) return null;
|
|
235
239
|
const selection =
|
|
236
240
|
await c.var.services.collections.resolveSelection(slugExpression);
|
|
237
241
|
if (!selection) return null;
|
|
@@ -271,87 +275,10 @@ export async function renderCollectionFeed(
|
|
|
271
275
|
);
|
|
272
276
|
const posts = entries.map((entry) => entry.post);
|
|
273
277
|
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
const [threadMap, rawMediaMap, aliasesMap] = await Promise.all([
|
|
279
|
-
c.var.services.posts.getPublishedThreads(rootIds, { publishedBefore }),
|
|
280
|
-
c.var.services.media.getByPostIds(postIds),
|
|
281
|
-
c.var.services.paths.getPostAliases(postIds),
|
|
282
|
-
]);
|
|
283
|
-
|
|
284
|
-
// Collect reply IDs for media loading
|
|
285
|
-
const replyIds: string[] = [];
|
|
286
|
-
for (const [rootId, thread] of threadMap) {
|
|
287
|
-
for (const reply of thread) {
|
|
288
|
-
if (reply.id !== rootId) {
|
|
289
|
-
replyIds.push(reply.id);
|
|
290
|
-
}
|
|
291
|
-
}
|
|
292
|
-
}
|
|
293
|
-
|
|
294
|
-
const replyMediaMap =
|
|
295
|
-
replyIds.length > 0
|
|
296
|
-
? await c.var.services.media.getByPostIds(replyIds)
|
|
297
|
-
: new Map<
|
|
298
|
-
string,
|
|
299
|
-
typeof rawMediaMap extends Map<string, infer V> ? V : never
|
|
300
|
-
>();
|
|
301
|
-
|
|
302
|
-
const mediaCtx = createMediaContext(appConfig);
|
|
303
|
-
|
|
304
|
-
// Merge all media
|
|
305
|
-
const allRawMedia = new Map(rawMediaMap);
|
|
306
|
-
for (const [id, media] of replyMediaMap) {
|
|
307
|
-
allRawMedia.set(id, media);
|
|
308
|
-
}
|
|
309
|
-
|
|
310
|
-
const mediaMap = buildMediaMap(
|
|
311
|
-
allRawMedia,
|
|
312
|
-
mediaCtx.r2PublicUrl,
|
|
313
|
-
mediaCtx.imageTransformUrl,
|
|
314
|
-
mediaCtx.s3PublicUrl,
|
|
315
|
-
mediaCtx.localPublicUrl,
|
|
316
|
-
mediaCtx.sitePathPrefix,
|
|
317
|
-
);
|
|
318
|
-
const aliasMap = new Map<string, string>();
|
|
319
|
-
for (const [id, aliases] of aliasesMap) {
|
|
320
|
-
if (aliases[0]) aliasMap.set(id, aliases[0]);
|
|
321
|
-
}
|
|
322
|
-
|
|
323
|
-
const postViews = toPostViews(
|
|
324
|
-
posts.map((post) => ({
|
|
325
|
-
...post,
|
|
326
|
-
mediaAttachments: mediaMap.get(post.id) ?? [],
|
|
327
|
-
})),
|
|
328
|
-
mediaCtx,
|
|
329
|
-
undefined,
|
|
330
|
-
aliasMap,
|
|
331
|
-
).map((postView, index) => {
|
|
332
|
-
const post = posts[index] as (typeof posts)[number];
|
|
333
|
-
const collectedAt = entries[index]?.collectedAt;
|
|
334
|
-
|
|
335
|
-
// Build thread replies
|
|
336
|
-
const thread = threadMap.get(post.id);
|
|
337
|
-
const replies =
|
|
338
|
-
thread && thread.length > 1
|
|
339
|
-
? toPostViews(
|
|
340
|
-
thread
|
|
341
|
-
.filter((r) => r.id !== post.id)
|
|
342
|
-
.map((r) => ({
|
|
343
|
-
...r,
|
|
344
|
-
mediaAttachments: mediaMap.get(r.id) ?? [],
|
|
345
|
-
})),
|
|
346
|
-
mediaCtx,
|
|
347
|
-
)
|
|
348
|
-
: undefined;
|
|
349
|
-
|
|
350
|
-
return {
|
|
351
|
-
...postView,
|
|
352
|
-
feedUpdatedAt: getFeedEntryUpdatedAt(post, thread, [collectedAt]),
|
|
353
|
-
threadReplies: replies,
|
|
354
|
-
};
|
|
278
|
+
const postViews = await buildFeedPostViews(c, posts, {
|
|
279
|
+
publishedBefore,
|
|
280
|
+
// A post a collection took in recently changed as far as its feed goes.
|
|
281
|
+
alsoUpdatedAt: (index) => [entries[index]?.collectedAt],
|
|
355
282
|
});
|
|
356
283
|
const i18n = getI18n(c);
|
|
357
284
|
const selectionTitle = buildCollectionSelectionTitle(
|
|
@@ -361,6 +288,7 @@ export async function renderCollectionFeed(
|
|
|
361
288
|
|
|
362
289
|
const xml = defaultFeedRenderer({
|
|
363
290
|
...buildFeedDiscoveryFields(c),
|
|
291
|
+
labels: buildFeedLabels(c),
|
|
364
292
|
siteName,
|
|
365
293
|
// Site name first, like every other feed: a reader's sidebar sorts by
|
|
366
294
|
// feed title, so leading with the collection would scatter one site's
|
|
@@ -423,6 +351,7 @@ export async function renderCollectionSelectionRoute(
|
|
|
423
351
|
export async function renderCollectionSelectionFeedRoute(
|
|
424
352
|
c: Context<Env>,
|
|
425
353
|
): Promise<Response> {
|
|
354
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
426
355
|
const slugExpression = c.req.param("slug");
|
|
427
356
|
if (!slugExpression) return c.notFound();
|
|
428
357
|
|
|
@@ -46,11 +46,13 @@ export async function renderCollectionsDirectory(
|
|
|
46
46
|
c.var.services.collections.listDirectoryData({
|
|
47
47
|
isAuthenticated: c.var.isAuthenticated,
|
|
48
48
|
lang: getViewLang(c) ?? undefined,
|
|
49
|
+
timeZone: c.var.appConfig.timeZone,
|
|
49
50
|
}),
|
|
50
51
|
getNavigationData(c),
|
|
51
52
|
]);
|
|
52
53
|
|
|
53
54
|
return renderPublicPage(c, {
|
|
55
|
+
page: "collections",
|
|
54
56
|
title: buildPageTitle("Collections", navData.siteName),
|
|
55
57
|
alternateLanguages: buildSurfaceAlternates(c),
|
|
56
58
|
navData,
|
|
@@ -17,7 +17,7 @@ import { renderPublicPage } from "../../lib/render.js";
|
|
|
17
17
|
import { assembleFeaturedTimeline } from "../../lib/timeline.js";
|
|
18
18
|
import { buildSurfaceAlternates, toViewPath } from "../../lib/view-language.js";
|
|
19
19
|
import { defaultFeedRenderer } from "../../lib/feed.js";
|
|
20
|
-
import { renderFeed } from "../../lib/feed-policy.js";
|
|
20
|
+
import { feedsPublished, renderFeed } from "../../lib/feed-policy.js";
|
|
21
21
|
import { buildFeedData } from "../feed/feed.js";
|
|
22
22
|
import { FeaturedPage } from "../../ui/pages/FeaturedPage.js";
|
|
23
23
|
|
|
@@ -55,6 +55,7 @@ export async function renderFeaturedPage(c: Context<Env>): Promise<Response> {
|
|
|
55
55
|
]);
|
|
56
56
|
|
|
57
57
|
return renderPublicPage(c, {
|
|
58
|
+
page: "featured",
|
|
58
59
|
title:
|
|
59
60
|
page > 1
|
|
60
61
|
? buildPageTitle(featuredTitle, paginatedPageTitle, navData.siteName)
|
|
@@ -81,6 +82,7 @@ featuredRoutes.get("/", renderFeaturedPage);
|
|
|
81
82
|
* @returns Atom feed response
|
|
82
83
|
*/
|
|
83
84
|
export async function renderFeaturedFeed(c: Context<Env>): Promise<Response> {
|
|
85
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
84
86
|
const feedData = await buildFeedData(c, {
|
|
85
87
|
kind: "featured",
|
|
86
88
|
selfPath: "/featured/feed",
|
|
@@ -89,7 +91,10 @@ export async function renderFeaturedFeed(c: Context<Env>): Promise<Response> {
|
|
|
89
91
|
}
|
|
90
92
|
|
|
91
93
|
/** Legacy atom.xml suffix → canonical /featured/feed, inside the same view. */
|
|
92
|
-
export function redirectLegacyFeaturedFeed(
|
|
94
|
+
export function redirectLegacyFeaturedFeed(
|
|
95
|
+
c: Context<Env>,
|
|
96
|
+
): Response | Promise<Response> {
|
|
97
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
93
98
|
return c.redirect(toViewPath(c, "/featured/feed"), 308);
|
|
94
99
|
}
|
|
95
100
|
|
|
@@ -10,7 +10,7 @@ import type { Bindings } from "../../types.js";
|
|
|
10
10
|
import type { AppVariables } from "../../types/app-context.js";
|
|
11
11
|
import { toViewPath } from "../../lib/view-language.js";
|
|
12
12
|
import { defaultFeedRenderer } from "../../lib/feed.js";
|
|
13
|
-
import { renderFeed } from "../../lib/feed-policy.js";
|
|
13
|
+
import { feedsPublished, renderFeed } from "../../lib/feed-policy.js";
|
|
14
14
|
import { buildFeedData, parseFormatQuery } from "../feed/feed.js";
|
|
15
15
|
|
|
16
16
|
type Env = { Bindings: Bindings; Variables: AppVariables };
|
|
@@ -31,6 +31,7 @@ export function redirectLatestToHome(c: Context<Env>): Response {
|
|
|
31
31
|
* @returns Atom feed response
|
|
32
32
|
*/
|
|
33
33
|
export async function renderLatestFeed(c: Context<Env>): Promise<Response> {
|
|
34
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
34
35
|
const format = parseFormatQuery(c);
|
|
35
36
|
const feedData = await buildFeedData(c, {
|
|
36
37
|
kind: "latest",
|
|
@@ -41,7 +42,10 @@ export async function renderLatestFeed(c: Context<Env>): Promise<Response> {
|
|
|
41
42
|
}
|
|
42
43
|
|
|
43
44
|
/** Legacy atom.xml suffix → canonical /latest/feed, preserving `?format=`. */
|
|
44
|
-
export function redirectLegacyLatestFeed(
|
|
45
|
+
export function redirectLegacyLatestFeed(
|
|
46
|
+
c: Context<Env>,
|
|
47
|
+
): Response | Promise<Response> {
|
|
48
|
+
if (!feedsPublished(c)) return c.notFound();
|
|
45
49
|
const qs = c.req.url.includes("?")
|
|
46
50
|
? c.req.url.slice(c.req.url.indexOf("?"))
|
|
47
51
|
: "";
|