@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/lib/env.ts
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { STORAGE_DRIVERS } from "../types/constants.js";
|
|
1
2
|
import { normalizeDisplayText } from "./display-text.js";
|
|
2
3
|
import { buildSiteUrl, normalizeSitePathPrefix } from "./url.js";
|
|
3
4
|
|
|
@@ -62,6 +63,192 @@ export function getEnvString(
|
|
|
62
63
|
return undefined;
|
|
63
64
|
}
|
|
64
65
|
|
|
66
|
+
/** What an environment-only variable may hold. */
|
|
67
|
+
type EnvRule =
|
|
68
|
+
| { kind: "boolean" }
|
|
69
|
+
| { kind: "integer"; min: number; max?: number }
|
|
70
|
+
| { kind: "enum"; options: readonly string[] }
|
|
71
|
+
| { kind: "origin" };
|
|
72
|
+
|
|
73
|
+
/**
|
|
74
|
+
* The typed environment-only variables and what each may hold.
|
|
75
|
+
*
|
|
76
|
+
* A variable the dashboard can also set is checked by its Config Editor
|
|
77
|
+
* definition instead, so the two can't disagree; see `env-values.ts`. A value
|
|
78
|
+
* outside its rule is reported by the startup check, which stops the site
|
|
79
|
+
* from serving until it is fixed; the readers below treat it as unset.
|
|
80
|
+
*/
|
|
81
|
+
export const ENV_RULES = {
|
|
82
|
+
PORT: { kind: "integer", min: 1, max: 65535 },
|
|
83
|
+
TRUST_PROXY: { kind: "boolean" },
|
|
84
|
+
DEMO_MODE: { kind: "boolean" },
|
|
85
|
+
RATE_LIMIT_ENABLED: { kind: "boolean" },
|
|
86
|
+
RATE_LIMIT_SEARCH_PER_MIN: { kind: "integer", min: 0 },
|
|
87
|
+
UPLOAD_MAX_FILE_SIZE_MB: { kind: "integer", min: 1 },
|
|
88
|
+
SLUG_ID_LENGTH: { kind: "integer", min: 3, max: 32 },
|
|
89
|
+
STORAGE_DRIVER: { kind: "enum", options: STORAGE_DRIVERS },
|
|
90
|
+
SITE_RESOLUTION_MODE: {
|
|
91
|
+
kind: "enum",
|
|
92
|
+
options: ["single-site", "host-based"],
|
|
93
|
+
},
|
|
94
|
+
DISCOVER: { kind: "enum", options: ["latest", "off"] },
|
|
95
|
+
SITE_ORIGIN: { kind: "origin" },
|
|
96
|
+
} as const satisfies Record<string, EnvRule>;
|
|
97
|
+
|
|
98
|
+
type EnvRuleVariable = keyof typeof ENV_RULES;
|
|
99
|
+
type EnvVariableOfKind<K extends EnvRule["kind"]> = {
|
|
100
|
+
[V in EnvRuleVariable]: (typeof ENV_RULES)[V]["kind"] extends K ? V : never;
|
|
101
|
+
}[EnvRuleVariable];
|
|
102
|
+
|
|
103
|
+
/** An environment variable that holds `true` or `false`. */
|
|
104
|
+
export type EnvBooleanVariable = EnvVariableOfKind<"boolean">;
|
|
105
|
+
/** An environment variable that holds a whole number. */
|
|
106
|
+
export type EnvIntegerVariable = EnvVariableOfKind<"integer">;
|
|
107
|
+
/** An environment variable that holds one of a fixed set of values. */
|
|
108
|
+
export type EnvEnumVariable = EnvVariableOfKind<"enum">;
|
|
109
|
+
type EnvEnumValue<V extends EnvEnumVariable> = (typeof ENV_RULES)[V] extends {
|
|
110
|
+
options: readonly (infer O)[];
|
|
111
|
+
}
|
|
112
|
+
? O
|
|
113
|
+
: never;
|
|
114
|
+
|
|
115
|
+
/** A value checked against its rule: normalized, or why it can't be used. */
|
|
116
|
+
export type EnvValueCheck =
|
|
117
|
+
{ ok: true; value: string } | { ok: false; message: string };
|
|
118
|
+
|
|
119
|
+
function describeIntegerRange(rule: { min: number; max?: number }): string {
|
|
120
|
+
return rule.max === undefined
|
|
121
|
+
? `a whole number of at least ${rule.min}`
|
|
122
|
+
: `a whole number from ${rule.min} to ${rule.max}`;
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
function checkEnvRule(rule: EnvRule, raw: string): EnvValueCheck {
|
|
126
|
+
switch (rule.kind) {
|
|
127
|
+
case "boolean": {
|
|
128
|
+
const value = raw.toLowerCase();
|
|
129
|
+
return value === "true" || value === "false"
|
|
130
|
+
? { ok: true, value }
|
|
131
|
+
: { ok: false, message: "Use true or false." };
|
|
132
|
+
}
|
|
133
|
+
case "integer": {
|
|
134
|
+
const value = Number(raw);
|
|
135
|
+
return /^-?\d+$/.test(raw) &&
|
|
136
|
+
value >= rule.min &&
|
|
137
|
+
(rule.max === undefined || value <= rule.max)
|
|
138
|
+
? { ok: true, value: String(value) }
|
|
139
|
+
: { ok: false, message: `Use ${describeIntegerRange(rule)}.` };
|
|
140
|
+
}
|
|
141
|
+
case "enum":
|
|
142
|
+
return rule.options.includes(raw)
|
|
143
|
+
? { ok: true, value: raw }
|
|
144
|
+
: { ok: false, message: `Use one of: ${rule.options.join(", ")}.` };
|
|
145
|
+
case "origin": {
|
|
146
|
+
const url = URL.canParse(raw) ? new URL(raw) : null;
|
|
147
|
+
return url &&
|
|
148
|
+
(url.protocol === "http:" || url.protocol === "https:") &&
|
|
149
|
+
url.pathname === "/" &&
|
|
150
|
+
!url.search &&
|
|
151
|
+
!url.hash
|
|
152
|
+
? { ok: true, value: url.origin }
|
|
153
|
+
: {
|
|
154
|
+
ok: false,
|
|
155
|
+
message:
|
|
156
|
+
"Use an http:// or https:// origin such as https://example.com, and put any path in SITE_PATH_PREFIX.",
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|
|
162
|
+
/**
|
|
163
|
+
* Check a value against the rule for an environment-only variable.
|
|
164
|
+
*
|
|
165
|
+
* @param variable - The variable, which must have a rule
|
|
166
|
+
* @param raw - Its trimmed, non-empty value
|
|
167
|
+
* @returns The normalized value, or what to change it to
|
|
168
|
+
* @example
|
|
169
|
+
* ```ts
|
|
170
|
+
* checkEnvValue("TRUST_PROXY", "TRUE"); // { ok: true, value: "true" }
|
|
171
|
+
* checkEnvValue("STORAGE_DRIVER", "S3").ok; // false
|
|
172
|
+
* ```
|
|
173
|
+
*/
|
|
174
|
+
export function checkEnvValue(
|
|
175
|
+
variable: EnvRuleVariable,
|
|
176
|
+
raw: string,
|
|
177
|
+
): EnvValueCheck {
|
|
178
|
+
return checkEnvRule(ENV_RULES[variable], raw);
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
/** Whether a variable has an environment-only rule. */
|
|
182
|
+
export function hasEnvRule(variable: string): variable is EnvRuleVariable {
|
|
183
|
+
return Object.hasOwn(ENV_RULES, variable);
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
function readRuledEnvValue(
|
|
187
|
+
env: EnvSource,
|
|
188
|
+
variable: EnvRuleVariable,
|
|
189
|
+
): string | undefined {
|
|
190
|
+
const raw = getEnvString(env, variable)?.trim();
|
|
191
|
+
if (!raw) return undefined;
|
|
192
|
+
const checked = checkEnvValue(variable, raw);
|
|
193
|
+
return checked.ok ? checked.value : undefined;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
/**
|
|
197
|
+
* A boolean environment variable, `true` and `false` in any case.
|
|
198
|
+
*
|
|
199
|
+
* @param env - Runtime environment bindings
|
|
200
|
+
* @param variable - The variable
|
|
201
|
+
* @returns Its value, or `undefined` when unset or not a boolean
|
|
202
|
+
* @example
|
|
203
|
+
* ```ts
|
|
204
|
+
* readEnvBoolean({ TRUST_PROXY: "TRUE" }, "TRUST_PROXY"); // true
|
|
205
|
+
* ```
|
|
206
|
+
*/
|
|
207
|
+
export function readEnvBoolean(
|
|
208
|
+
env: EnvSource,
|
|
209
|
+
variable: EnvBooleanVariable,
|
|
210
|
+
): boolean | undefined {
|
|
211
|
+
const value = readRuledEnvValue(env, variable);
|
|
212
|
+
return value === undefined ? undefined : value === "true";
|
|
213
|
+
}
|
|
214
|
+
|
|
215
|
+
/**
|
|
216
|
+
* A whole-number environment variable, within its range.
|
|
217
|
+
*
|
|
218
|
+
* @param env - Runtime environment bindings
|
|
219
|
+
* @param variable - The variable
|
|
220
|
+
* @returns Its value, or `undefined` when unset or out of range
|
|
221
|
+
* @example
|
|
222
|
+
* ```ts
|
|
223
|
+
* readEnvInteger({ SLUG_ID_LENGTH: "8" }, "SLUG_ID_LENGTH"); // 8
|
|
224
|
+
* ```
|
|
225
|
+
*/
|
|
226
|
+
export function readEnvInteger(
|
|
227
|
+
env: EnvSource,
|
|
228
|
+
variable: EnvIntegerVariable,
|
|
229
|
+
): number | undefined {
|
|
230
|
+
const value = readRuledEnvValue(env, variable);
|
|
231
|
+
return value === undefined ? undefined : Number(value);
|
|
232
|
+
}
|
|
233
|
+
|
|
234
|
+
/**
|
|
235
|
+
* An environment variable that names one of a fixed set of values.
|
|
236
|
+
*
|
|
237
|
+
* @param env - Runtime environment bindings
|
|
238
|
+
* @param variable - The variable
|
|
239
|
+
* @returns Its value, or `undefined` when unset or not one of the set
|
|
240
|
+
* @example
|
|
241
|
+
* ```ts
|
|
242
|
+
* readEnvEnum({ STORAGE_DRIVER: "s3" }, "STORAGE_DRIVER"); // "s3"
|
|
243
|
+
* ```
|
|
244
|
+
*/
|
|
245
|
+
export function readEnvEnum<V extends EnvEnumVariable>(
|
|
246
|
+
env: EnvSource,
|
|
247
|
+
variable: V,
|
|
248
|
+
): EnvEnumValue<V> | undefined {
|
|
249
|
+
return readRuledEnvValue(env, variable) as EnvEnumValue<V> | undefined;
|
|
250
|
+
}
|
|
251
|
+
|
|
65
252
|
/**
|
|
66
253
|
* Parse a TCP port from an environment value.
|
|
67
254
|
*
|
|
@@ -101,8 +288,7 @@ export function getPort(env: EnvSource, fallback = DEFAULT_APP_PORT): number {
|
|
|
101
288
|
}
|
|
102
289
|
|
|
103
290
|
export function getSiteOrigin(env: EnvSource): string {
|
|
104
|
-
|
|
105
|
-
return configuredOrigin ? new URL(configuredOrigin).origin : "";
|
|
291
|
+
return readRuledEnvValue(env, "SITE_ORIGIN") ?? "";
|
|
106
292
|
}
|
|
107
293
|
|
|
108
294
|
export function getSitePathPrefix(env: EnvSource): string {
|
|
@@ -141,9 +327,7 @@ export function getConfiguredSingleSiteUrl(env: EnvSource): string {
|
|
|
141
327
|
export function getSiteResolutionMode(
|
|
142
328
|
env: EnvSource,
|
|
143
329
|
): "single-site" | "host-based" {
|
|
144
|
-
return
|
|
145
|
-
? "host-based"
|
|
146
|
-
: "single-site";
|
|
330
|
+
return readEnvEnum(env, "SITE_RESOLUTION_MODE") ?? "single-site";
|
|
147
331
|
}
|
|
148
332
|
|
|
149
333
|
export function getAuthSecret(env: EnvSource): string | undefined {
|
|
@@ -331,11 +515,13 @@ export function getDiscoverDirectoryBaseUrl(
|
|
|
331
515
|
* ```
|
|
332
516
|
*/
|
|
333
517
|
export function getDiscoverDefault(env: EnvSource): string | undefined {
|
|
334
|
-
return
|
|
518
|
+
return readEnvEnum(env, "DISCOVER");
|
|
335
519
|
}
|
|
336
520
|
|
|
337
|
-
export function getStorageDriverEnv(
|
|
338
|
-
|
|
521
|
+
export function getStorageDriverEnv(
|
|
522
|
+
env: EnvSource,
|
|
523
|
+
): (typeof STORAGE_DRIVERS)[number] | undefined {
|
|
524
|
+
return readEnvEnum(env, "STORAGE_DRIVER");
|
|
339
525
|
}
|
|
340
526
|
|
|
341
527
|
export function getDataDir(env: EnvSource): string | undefined {
|
|
@@ -361,7 +547,9 @@ export function getDefaultStorageDriver(env: EnvSource): "local" | "r2" {
|
|
|
361
547
|
return record["NODE_SQLITE"] || record["NODE_DATABASE"] ? "local" : "r2";
|
|
362
548
|
}
|
|
363
549
|
|
|
364
|
-
export function getConfiguredStorageDriver(
|
|
550
|
+
export function getConfiguredStorageDriver(
|
|
551
|
+
env: EnvSource,
|
|
552
|
+
): (typeof STORAGE_DRIVERS)[number] {
|
|
365
553
|
return getStorageDriverEnv(env) ?? getDefaultStorageDriver(env);
|
|
366
554
|
}
|
|
367
555
|
|
|
@@ -378,13 +566,16 @@ export function getConfiguredStorageDriver(env: EnvSource): string {
|
|
|
378
566
|
* getCorsOrigins({ CORS_ORIGINS: "https://a.com,chrome-extension://id" });
|
|
379
567
|
* // ["https://a.com", "chrome-extension://id"]
|
|
380
568
|
* getCorsOrigins({}); // "*"
|
|
569
|
+
* getCorsOrigins({ CORS_ORIGINS: "" }); // undefined
|
|
381
570
|
* ```
|
|
382
571
|
*/
|
|
383
572
|
export function getCorsOrigins(env: EnvSource): "*" | string[] | undefined {
|
|
384
|
-
|
|
385
|
-
|
|
573
|
+
// Set but empty is a choice, unlike unset: it turns cross-origin access off.
|
|
574
|
+
const configured = toEnvRecord(env)["CORS_ORIGINS"];
|
|
575
|
+
if (typeof configured === "string" && configured.trim() === "") {
|
|
386
576
|
return undefined;
|
|
387
577
|
}
|
|
578
|
+
const raw = getEnvString(env, "CORS_ORIGINS")?.trim() ?? "*";
|
|
388
579
|
|
|
389
580
|
if (raw === "*") {
|
|
390
581
|
return "*";
|
|
@@ -432,7 +623,7 @@ export function getGitHubAppConfig(env: EnvSource): GitHubAppEnvConfig | null {
|
|
|
432
623
|
}
|
|
433
624
|
|
|
434
625
|
export function shouldTrustProxy(env: EnvSource): boolean {
|
|
435
|
-
return
|
|
626
|
+
return readEnvBoolean(env, "TRUST_PROXY") ?? false;
|
|
436
627
|
}
|
|
437
628
|
|
|
438
629
|
/** A single platform-managed Telegram bot from `TELEGRAM_BOT_TOKENS`. */
|
package/src/lib/feed-path.ts
CHANGED
|
@@ -5,10 +5,16 @@ function hasPathPrefix(path: string, prefix: string): boolean {
|
|
|
5
5
|
}
|
|
6
6
|
|
|
7
7
|
/**
|
|
8
|
-
* Check whether an internal application path
|
|
8
|
+
* Check whether an internal application path has the shape of an Atom feed
|
|
9
|
+
* endpoint, without resolving it.
|
|
10
|
+
*
|
|
11
|
+
* The Worker response cache uses it to decide which requests may be served
|
|
12
|
+
* from cache; what the response itself allows still decides whether one is
|
|
13
|
+
* stored. It is not a routing decision: a custom URL can end in `/feed` and
|
|
14
|
+
* be a post, which is why feed routes check `feedsPublished` themselves.
|
|
9
15
|
*
|
|
10
16
|
* @param path - Request pathname after any configured site prefix is removed
|
|
11
|
-
* @returns Whether the path
|
|
17
|
+
* @returns Whether the path looks like a canonical or legacy feed URL
|
|
12
18
|
* @example
|
|
13
19
|
* ```ts
|
|
14
20
|
* isRssFeedPath("/reading/feed"); // true
|
package/src/lib/feed-policy.ts
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import type { Context } from "hono";
|
|
2
|
-
import
|
|
2
|
+
import { msg } from "@lingui/core/macro";
|
|
3
|
+
import { getI18n } from "../i18n/index.js";
|
|
4
|
+
import type { Bindings, FeedData, FeedLabels, Post } from "../types.js";
|
|
3
5
|
import type { AppVariables } from "../types/app-context.js";
|
|
4
6
|
import type { PostFilters, ThreadRootPageOptions } from "../services/post.js";
|
|
5
7
|
import { DISCOVER_STATUS_PATH, getDiscoverFeedPath } from "./discover.js";
|
|
@@ -20,6 +22,108 @@ const RSS_FEED_CACHE_CONTROL = "public, max-age=60";
|
|
|
20
22
|
/** Media type every Jant Atom feed is served as. */
|
|
21
23
|
const FEED_CONTENT_TYPE = "application/atom+xml; charset=utf-8";
|
|
22
24
|
|
|
25
|
+
/**
|
|
26
|
+
* The display text a feed writes, in the language the site's reader pages
|
|
27
|
+
* use, so a feed says "3 more posts" the way the page beside it does.
|
|
28
|
+
*
|
|
29
|
+
* @param c - The feed request, whose locale the reader pages use
|
|
30
|
+
* @returns The labels the renderer writes
|
|
31
|
+
* @example
|
|
32
|
+
* ```ts
|
|
33
|
+
* defaultFeedRenderer({ ...fields, labels: buildFeedLabels(c) });
|
|
34
|
+
* ```
|
|
35
|
+
*/
|
|
36
|
+
export function buildFeedLabels(c: FeedContext): FeedLabels {
|
|
37
|
+
const i18n = getI18n(c);
|
|
38
|
+
return {
|
|
39
|
+
watchVideo: i18n._(
|
|
40
|
+
msg({
|
|
41
|
+
message: "Watch video",
|
|
42
|
+
comment: "@context: Feed link under a video attachment or preview",
|
|
43
|
+
}),
|
|
44
|
+
),
|
|
45
|
+
watchOn: (provider) =>
|
|
46
|
+
i18n._(
|
|
47
|
+
msg({
|
|
48
|
+
message: "Watch on {provider}",
|
|
49
|
+
comment:
|
|
50
|
+
"@context: Feed link under a linked video's preview, naming the site that hosts it",
|
|
51
|
+
}),
|
|
52
|
+
{ provider },
|
|
53
|
+
),
|
|
54
|
+
morePosts: (count) =>
|
|
55
|
+
i18n._(
|
|
56
|
+
msg({
|
|
57
|
+
message: "{count, plural, one {# more post} other {# more posts}}",
|
|
58
|
+
comment:
|
|
59
|
+
"@context: Link showing count of hidden thread posts between root and latest",
|
|
60
|
+
}),
|
|
61
|
+
{ count },
|
|
62
|
+
),
|
|
63
|
+
linkPreview: i18n._(
|
|
64
|
+
msg({
|
|
65
|
+
message: "Link preview",
|
|
66
|
+
comment: "@context: Feed alt text for a link preview image",
|
|
67
|
+
}),
|
|
68
|
+
),
|
|
69
|
+
videoPreview: i18n._(
|
|
70
|
+
msg({
|
|
71
|
+
message: "Video preview",
|
|
72
|
+
comment: "@context: Feed alt text for a linked video's preview image",
|
|
73
|
+
}),
|
|
74
|
+
),
|
|
75
|
+
providerVideo: (provider) =>
|
|
76
|
+
i18n._(
|
|
77
|
+
msg({
|
|
78
|
+
message: "{provider} video",
|
|
79
|
+
comment:
|
|
80
|
+
"@context: Feed alt text for a linked video's preview image, naming the site that hosts it",
|
|
81
|
+
}),
|
|
82
|
+
{ provider },
|
|
83
|
+
),
|
|
84
|
+
audio: i18n._(
|
|
85
|
+
msg({
|
|
86
|
+
message: "Audio",
|
|
87
|
+
comment:
|
|
88
|
+
"@context: Feed name for an audio attachment with no file name",
|
|
89
|
+
}),
|
|
90
|
+
),
|
|
91
|
+
attachedText: i18n._(
|
|
92
|
+
msg({
|
|
93
|
+
message: "Attached text",
|
|
94
|
+
comment: "@context: Feed name for a text attachment with no file name",
|
|
95
|
+
}),
|
|
96
|
+
),
|
|
97
|
+
attachment: i18n._(
|
|
98
|
+
msg({
|
|
99
|
+
message: "Attachment",
|
|
100
|
+
comment: "@context: Feed name for an attachment with no file name",
|
|
101
|
+
}),
|
|
102
|
+
),
|
|
103
|
+
};
|
|
104
|
+
}
|
|
105
|
+
|
|
106
|
+
/**
|
|
107
|
+
* Whether the site publishes feeds.
|
|
108
|
+
*
|
|
109
|
+
* Every route that renders a feed, or redirects to one, checks this first and
|
|
110
|
+
* answers 404 when it is off. The check belongs to those routes rather than to
|
|
111
|
+
* a path pattern: a post or custom URL whose address ends in `/feed` is not a
|
|
112
|
+
* feed and stays reachable.
|
|
113
|
+
*
|
|
114
|
+
* @param c - Anything carrying the request's resolved config
|
|
115
|
+
* @returns Whether feed routes should answer
|
|
116
|
+
* @example
|
|
117
|
+
* ```ts
|
|
118
|
+
* if (!feedsPublished(c)) return c.notFound();
|
|
119
|
+
* ```
|
|
120
|
+
*/
|
|
121
|
+
export function feedsPublished(c: {
|
|
122
|
+
var: { appConfig: { rssFeedsEnabled: boolean } };
|
|
123
|
+
}): boolean {
|
|
124
|
+
return c.var.appConfig.rssFeedsEnabled;
|
|
125
|
+
}
|
|
126
|
+
|
|
23
127
|
/**
|
|
24
128
|
* Serve a rendered Atom document.
|
|
25
129
|
*
|
|
@@ -262,12 +366,11 @@ export function buildFeedDiscoveryFields(
|
|
|
262
366
|
);
|
|
263
367
|
const feedPath = getDiscoverFeedPath(appConfig.discover);
|
|
264
368
|
const discoverFeedUrl = feedPath ? absoluteFeedUrl(feedPath) : null;
|
|
265
|
-
//
|
|
266
|
-
//
|
|
267
|
-
const discoverFeaturedFeedUrl =
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
: null;
|
|
369
|
+
// Named beside `feed`, so a directory shows featured posts on one list and
|
|
370
|
+
// everything on another without guessing the address.
|
|
371
|
+
const discoverFeaturedFeedUrl = feedPath
|
|
372
|
+
? absoluteFeedUrl("/featured/feed")
|
|
373
|
+
: null;
|
|
271
374
|
// The API lives outside language views, so the view travels as `lang`: the
|
|
272
375
|
// answer must be about the feeds this declaration sits in.
|
|
273
376
|
const viewLang = getViewLang(c);
|
package/src/lib/feed.ts
CHANGED
|
@@ -6,6 +6,7 @@
|
|
|
6
6
|
|
|
7
7
|
import type {
|
|
8
8
|
FeedData,
|
|
9
|
+
FeedLabels,
|
|
9
10
|
FeedPostView,
|
|
10
11
|
LanguageAlternate,
|
|
11
12
|
MediaView,
|
|
@@ -275,7 +276,11 @@ function renderRatingHtml(rating: number): string {
|
|
|
275
276
|
* previews use a linked thumbnail plus a visible provider-aware action.
|
|
276
277
|
* Non-video Link previews keep the linked thumbnail without a video label.
|
|
277
278
|
*/
|
|
278
|
-
function renderLinkPreviewForFeed(
|
|
279
|
+
function renderLinkPreviewForFeed(
|
|
280
|
+
post: PostView,
|
|
281
|
+
siteUrl: string,
|
|
282
|
+
labels: FeedLabels,
|
|
283
|
+
): string {
|
|
279
284
|
if (post.format !== "link") return "";
|
|
280
285
|
|
|
281
286
|
const imageUrl = post.previewImageUrl?.trim();
|
|
@@ -286,12 +291,12 @@ function renderLinkPreviewForFeed(post: PostView, siteUrl: string): string {
|
|
|
286
291
|
const providerLabel = getLinkPreviewProviderLabel(post.previewProvider);
|
|
287
292
|
const fallbackAlt = isVideo
|
|
288
293
|
? providerLabel
|
|
289
|
-
?
|
|
290
|
-
:
|
|
291
|
-
:
|
|
294
|
+
? labels.providerVideo(providerLabel)
|
|
295
|
+
: labels.videoPreview
|
|
296
|
+
: labels.linkPreview;
|
|
292
297
|
const altText = post.title?.trim() || fallbackAlt;
|
|
293
298
|
const caption = isVideo
|
|
294
|
-
? `<figcaption><a href="${escapeXml(linkUrl)}">▶ ${providerLabel ?
|
|
299
|
+
? `<figcaption><a href="${escapeXml(linkUrl)}">▶ ${escapeXml(providerLabel ? labels.watchOn(providerLabel) : labels.watchVideo)}</a></figcaption>`
|
|
295
300
|
: "";
|
|
296
301
|
|
|
297
302
|
return `<figure><a href="${escapeXml(linkUrl)}"><img src="${escapeXml(toAbsoluteFeedUrl(imageUrl, siteUrl))}" alt="${escapeXml(altText)}"/></a>${caption}</figure>`;
|
|
@@ -359,6 +364,7 @@ function buildAttachmentLinkText(
|
|
|
359
364
|
function renderMediaItem(
|
|
360
365
|
item: MediaView,
|
|
361
366
|
siteUrl: string,
|
|
367
|
+
labels: FeedLabels,
|
|
362
368
|
postPermalinkUrl?: string,
|
|
363
369
|
): string {
|
|
364
370
|
const category = getMediaCategory(item.mimeType);
|
|
@@ -409,12 +415,12 @@ function renderMediaItem(
|
|
|
409
415
|
return (
|
|
410
416
|
`<figure><video controls preload="none"${posterAttr}${dims}>` +
|
|
411
417
|
`<source src="${url}" type="${escapeXml(cleanMimeType(item.mimeType))}"/>` +
|
|
412
|
-
`</video><figcaption><a href="${url}">▶
|
|
418
|
+
`</video><figcaption><a href="${url}">▶ ${escapeXml(labels.watchVideo)}</a>${metaSuffix}${altSuffix}</figcaption></figure>`
|
|
413
419
|
);
|
|
414
420
|
}
|
|
415
421
|
|
|
416
422
|
if (category === "audio") {
|
|
417
|
-
const linkText = buildAttachmentLinkText(item,
|
|
423
|
+
const linkText = buildAttachmentLinkText(item, labels.audio);
|
|
418
424
|
const suffix = meta ? ` (${escapeXml(meta)})` : "";
|
|
419
425
|
return `<p><a href="${url}">${linkText}</a>${suffix}</p>`;
|
|
420
426
|
}
|
|
@@ -423,7 +429,7 @@ function renderMediaItem(
|
|
|
423
429
|
const previewHref = escapeXml(
|
|
424
430
|
getMediaPageUrl(item, siteUrl, postPermalinkUrl),
|
|
425
431
|
);
|
|
426
|
-
const linkText = buildAttachmentLinkText(item,
|
|
432
|
+
const linkText = buildAttachmentLinkText(item, labels.attachedText);
|
|
427
433
|
// Prefer character count over byte size — more meaningful for text.
|
|
428
434
|
const textMeta =
|
|
429
435
|
typeof item.chars === "number" && item.chars > 0
|
|
@@ -436,7 +442,7 @@ function renderMediaItem(
|
|
|
436
442
|
}
|
|
437
443
|
|
|
438
444
|
// document, archive, office, font, 3d, code → plain link
|
|
439
|
-
const linkText = buildAttachmentLinkText(item,
|
|
445
|
+
const linkText = buildAttachmentLinkText(item, labels.attachment);
|
|
440
446
|
const suffix = meta ? ` (${escapeXml(meta)})` : "";
|
|
441
447
|
return `<p><a href="${url}">${linkText}</a>${suffix}</p>`;
|
|
442
448
|
}
|
|
@@ -448,11 +454,12 @@ function renderMediaItem(
|
|
|
448
454
|
function renderMediaForFeed(
|
|
449
455
|
media: MediaView[],
|
|
450
456
|
siteUrl: string,
|
|
457
|
+
labels: FeedLabels,
|
|
451
458
|
postPermalinkUrl?: string,
|
|
452
459
|
): string {
|
|
453
460
|
if (media.length === 0) return "";
|
|
454
461
|
const items = media
|
|
455
|
-
.map((item) => renderMediaItem(item, siteUrl, postPermalinkUrl))
|
|
462
|
+
.map((item) => renderMediaItem(item, siteUrl, labels, postPermalinkUrl))
|
|
456
463
|
.join("\n");
|
|
457
464
|
// The site lays a post's attachments out as one horizontally scrolling strip
|
|
458
465
|
// and marks that container `data-post-media`, which is part of the markup
|
|
@@ -521,6 +528,7 @@ function getTimelineSummary(post: PostView): TimelineSummary | null {
|
|
|
521
528
|
function buildSinglePostContent(
|
|
522
529
|
post: PostView,
|
|
523
530
|
siteUrl: string,
|
|
531
|
+
labels: FeedLabels,
|
|
524
532
|
permalinkUrl?: string,
|
|
525
533
|
options: SinglePostContentOptions = {},
|
|
526
534
|
): string {
|
|
@@ -560,7 +568,7 @@ function buildSinglePostContent(
|
|
|
560
568
|
// The preview image is media: `<media:thumbnail>` carries it for a consumer
|
|
561
569
|
// laying out its own card, so the summary has no reason to repeat the markup.
|
|
562
570
|
if (!options.summary) {
|
|
563
|
-
const linkPreviewHtml = renderLinkPreviewForFeed(post, siteUrl);
|
|
571
|
+
const linkPreviewHtml = renderLinkPreviewForFeed(post, siteUrl, labels);
|
|
564
572
|
if (linkPreviewHtml) {
|
|
565
573
|
parts.push(linkPreviewHtml);
|
|
566
574
|
}
|
|
@@ -586,7 +594,12 @@ function buildSinglePostContent(
|
|
|
586
594
|
// it from the dimensions on `<media:content>` — so a consumer that lays out
|
|
587
595
|
// its own card wants this field to be the text and nothing else.
|
|
588
596
|
if (!options.summary) {
|
|
589
|
-
const mediaHtml = renderMediaForFeed(
|
|
597
|
+
const mediaHtml = renderMediaForFeed(
|
|
598
|
+
post.media,
|
|
599
|
+
siteUrl,
|
|
600
|
+
labels,
|
|
601
|
+
permalinkUrl,
|
|
602
|
+
);
|
|
590
603
|
if (mediaHtml) {
|
|
591
604
|
parts.push(mediaHtml);
|
|
592
605
|
}
|
|
@@ -779,9 +792,15 @@ function renderPostTailMeta(post: PostView, permalinkUrl: string): string {
|
|
|
779
792
|
function buildFeedContent(
|
|
780
793
|
post: FeedPostView,
|
|
781
794
|
siteUrl: string,
|
|
795
|
+
labels: FeedLabels,
|
|
782
796
|
permalinkUrl?: string,
|
|
783
797
|
): string {
|
|
784
|
-
const rootContent = buildSinglePostContent(
|
|
798
|
+
const rootContent = buildSinglePostContent(
|
|
799
|
+
post,
|
|
800
|
+
siteUrl,
|
|
801
|
+
labels,
|
|
802
|
+
permalinkUrl,
|
|
803
|
+
);
|
|
785
804
|
const replies = post.threadReplies;
|
|
786
805
|
|
|
787
806
|
// A standalone post needs no marker: the entry's own `<published>` dates it,
|
|
@@ -800,7 +819,9 @@ function buildFeedContent(
|
|
|
800
819
|
// the structural one — the tail meta above is.
|
|
801
820
|
parts.push("<hr/>");
|
|
802
821
|
parts.push(
|
|
803
|
-
buildSinglePostContent(reply, siteUrl, replyPermalink, {
|
|
822
|
+
buildSinglePostContent(reply, siteUrl, labels, replyPermalink, {
|
|
823
|
+
inline: true,
|
|
824
|
+
}),
|
|
804
825
|
);
|
|
805
826
|
parts.push(renderPostTailMeta(reply, replyPermalink));
|
|
806
827
|
}
|
|
@@ -841,6 +862,7 @@ function buildFeedContent(
|
|
|
841
862
|
function buildFeedSummary(
|
|
842
863
|
entry: FeedEntry,
|
|
843
864
|
siteUrl: string,
|
|
865
|
+
labels: FeedLabels,
|
|
844
866
|
permalinkUrl?: string,
|
|
845
867
|
): string {
|
|
846
868
|
const { post, fold, summaryPosts } = entry;
|
|
@@ -854,11 +876,17 @@ function buildFeedSummary(
|
|
|
854
876
|
memberPermalink: string,
|
|
855
877
|
inline: boolean,
|
|
856
878
|
) => {
|
|
857
|
-
const markup = buildSinglePostContent(
|
|
858
|
-
|
|
859
|
-
|
|
860
|
-
|
|
861
|
-
|
|
879
|
+
const markup = buildSinglePostContent(
|
|
880
|
+
member,
|
|
881
|
+
siteUrl,
|
|
882
|
+
labels,
|
|
883
|
+
memberPermalink,
|
|
884
|
+
{
|
|
885
|
+
inline,
|
|
886
|
+
summary: true,
|
|
887
|
+
timelineSummary: summaryPosts.get(member),
|
|
888
|
+
},
|
|
889
|
+
);
|
|
862
890
|
if (!markup) return;
|
|
863
891
|
if (parts.length > 0) parts.push("<hr/>");
|
|
864
892
|
parts.push(markup);
|
|
@@ -886,8 +914,7 @@ function buildFeedSummary(
|
|
|
886
914
|
const gapHref = escapeXml(
|
|
887
915
|
toAbsoluteFeedUrl(fold.firstHiddenReply.permalink, siteUrl),
|
|
888
916
|
);
|
|
889
|
-
const label =
|
|
890
|
-
fold.hiddenCount === 1 ? "1 more post" : `${fold.hiddenCount} more posts`;
|
|
917
|
+
const label = escapeXml(labels.morePosts(fold.hiddenCount));
|
|
891
918
|
if (parts.length > 0) parts.push("<hr/>");
|
|
892
919
|
parts.push(`<p><small><a href="${gapHref}">${label}</a></small></p>`);
|
|
893
920
|
}
|
|
@@ -1152,6 +1179,8 @@ export function defaultFeedRenderer(data: FeedData): string {
|
|
|
1152
1179
|
discoverStatusUrl,
|
|
1153
1180
|
languageAlternates,
|
|
1154
1181
|
} = data;
|
|
1182
|
+
// Relative, so the site's path prefix stays in it: /blog/collections.
|
|
1183
|
+
const collectionScheme = escapeXml(toAbsoluteFeedUrl("collections", siteUrl));
|
|
1155
1184
|
const feedTitle = title ?? siteName;
|
|
1156
1185
|
|
|
1157
1186
|
const feedEntries = posts.map((post) => buildFeedEntry(post, siteUrl));
|
|
@@ -1167,7 +1196,9 @@ export function defaultFeedRenderer(data: FeedData): string {
|
|
|
1167
1196
|
? escapeXml(alternateUrl)
|
|
1168
1197
|
: escapedPermalink;
|
|
1169
1198
|
const title = getAtomTitle(post);
|
|
1170
|
-
|
|
1199
|
+
// Always the post's own date. A curated feed moves `<updated>` when it
|
|
1200
|
+
// takes a post in, never `<published>`.
|
|
1201
|
+
const publishedAt = post.publishedAt;
|
|
1171
1202
|
const updatedAt = post.feedUpdatedAt ?? post.updatedAt;
|
|
1172
1203
|
|
|
1173
1204
|
// For link posts, add a <link rel="related"> back to the blog permalink
|
|
@@ -1249,10 +1280,13 @@ export function defaultFeedRenderer(data: FeedData): string {
|
|
|
1249
1280
|
// prints them on the root alone, so they ride on the entry once.
|
|
1250
1281
|
// `jant:page` because a single collection lives in the root URL
|
|
1251
1282
|
// namespace and a site path prefix makes it unguessable from the term.
|
|
1283
|
+
// `scheme` says which taxonomy the term belongs to: collections, named
|
|
1284
|
+
// by the site's collections directory. Any other kind of category gets
|
|
1285
|
+
// a scheme of its own, so a consumer can tell them apart.
|
|
1252
1286
|
const categoryElements = post.collections
|
|
1253
1287
|
.map(
|
|
1254
1288
|
(collection) =>
|
|
1255
|
-
`\n <category term="${escapeXml(collection.slug)}" label="${escapeXml(collection.title)}" jant:page="${escapeXml(toAbsoluteFeedUrl(collection.url, siteUrl))}"/>`,
|
|
1289
|
+
`\n <category term="${escapeXml(collection.slug)}" scheme="${collectionScheme}" label="${escapeXml(collection.title)}" jant:page="${escapeXml(toAbsoluteFeedUrl(collection.url, siteUrl))}"/>`,
|
|
1256
1290
|
)
|
|
1257
1291
|
.join("");
|
|
1258
1292
|
|
|
@@ -1274,8 +1308,18 @@ export function defaultFeedRenderer(data: FeedData): string {
|
|
|
1274
1308
|
// which costs the words and nothing else, and buys a field that means one
|
|
1275
1309
|
// thing on its own rather than one defined by what content happens to
|
|
1276
1310
|
// hold. Missing therefore says exactly one thing: this post has no text.
|
|
1277
|
-
const contentMarkup = buildFeedContent(
|
|
1278
|
-
|
|
1311
|
+
const contentMarkup = buildFeedContent(
|
|
1312
|
+
post,
|
|
1313
|
+
siteUrl,
|
|
1314
|
+
data.labels,
|
|
1315
|
+
permalinkUrl,
|
|
1316
|
+
);
|
|
1317
|
+
const summaryMarkup = buildFeedSummary(
|
|
1318
|
+
entry,
|
|
1319
|
+
siteUrl,
|
|
1320
|
+
data.labels,
|
|
1321
|
+
permalinkUrl,
|
|
1322
|
+
);
|
|
1279
1323
|
const summaryElement = summaryMarkup
|
|
1280
1324
|
? `\n <summary type="html"><![CDATA[${escapeCdata(summaryMarkup)}]]></summary>`
|
|
1281
1325
|
: "";
|