@jant/core 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/commands/db/execute-file.js +1 -1
- package/bin/commands/db/export.js +1 -1
- package/bin/commands/migrate.js +4 -4
- package/bin/commands/posts/rebuild-html.js +1 -1
- package/bin/commands/reset-password.js +1 -1
- package/bin/commands/search/reindex.js +1 -1
- package/bin/commands/setup.js +4 -2
- package/bin/commands/site/export.js +3 -0
- package/bin/commands/site/import.js +178 -91
- package/bin/commands/site/pull-media.js +3 -2
- package/bin/commands/site/snapshot/export.js +3 -1
- package/bin/commands/site/snapshot/import.js +3 -2
- package/bin/commands/start.js +44 -0
- package/bin/commands/telegram/register-webhooks.js +1 -1
- package/bin/commands/uploads/cleanup.js +48 -9
- package/bin/jant.js +39 -4
- package/bin/lib/import-sources.js +151 -0
- package/bin/lib/node-env.js +14 -9
- package/bin/lib/runtime-target.js +1 -1
- package/bin/lib/site-pull-media.js +56 -4
- package/bin/lib/site-snapshot.js +39 -2
- package/bin/lib/sql-export.js +66 -10
- package/dist/{app-DIVtyB4m.js → app-jQI4OPRe.js} +5055 -4448
- package/dist/client/.vite/manifest.json +38 -38
- package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
- package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
- package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
- package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
- package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
- package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
- package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
- package/dist/client/_assets/client-52vQhZAv.js +296 -0
- package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
- package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-BDcCR6u1.js} +2 -2
- package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
- package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
- package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
- package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
- package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
- package/dist/index.d.ts +44 -0
- package/dist/index.js +33 -1
- package/dist/node.js +57 -13
- package/package.json +13 -18
- package/src/__tests__/api-docs.test.ts +168 -1
- package/src/__tests__/bin/import-sources.test.ts +85 -0
- package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
- package/src/__tests__/cli-commands.test.ts +40 -0
- package/src/__tests__/config-docs.test.ts +119 -16
- package/src/__tests__/custom-url-redirects.test.ts +108 -0
- package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
- package/src/__tests__/export-docs.test.ts +113 -41
- package/src/__tests__/export-feed-ids.test.ts +1 -0
- package/src/__tests__/export-format-version.test.ts +88 -0
- package/src/__tests__/export-hugo-build.test.ts +139 -4
- package/src/__tests__/export-import-roundtrip.test.ts +2 -1
- package/src/__tests__/export-service.test.ts +42 -13
- package/src/__tests__/export-smart-collection.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +287 -21
- package/src/__tests__/feed-reply-addresses.test.ts +100 -0
- package/src/__tests__/feeds-disabled.test.ts +98 -0
- package/src/__tests__/fixtures/export-format/1.json +76 -0
- package/src/__tests__/fixtures/export-format/2.json +80 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +57 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/app.ts +6 -1
- package/src/__tests__/helpers/export-fixtures.ts +1 -0
- package/src/__tests__/import-refused-aliases.test.ts +98 -0
- package/src/__tests__/import-site-command.test.ts +73 -8
- package/src/__tests__/public-types.test.ts +64 -0
- package/src/__tests__/release-fixtures.test.ts +79 -24
- package/src/__tests__/release-version.test.ts +84 -0
- package/src/__tests__/site-pull-media.test.ts +48 -0
- package/src/__tests__/snapshot-tables.test.ts +37 -0
- package/src/__tests__/sql-export.test.ts +21 -1
- package/src/__tests__/stored-file-headers.test.ts +94 -0
- package/src/__tests__/template-deploy-workflow.test.ts +101 -0
- package/src/__tests__/theme-docs.test.ts +113 -24
- package/src/__tests__/toolchain-versions.test.ts +54 -0
- package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
- package/src/__tests__/vite-config-graph.test.ts +98 -0
- package/src/app.tsx +89 -66
- package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
- package/src/client/__tests__/compose-bridge.test.ts +87 -0
- package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
- package/src/client/__tests__/footnote-rail.test.ts +1 -1
- package/src/client/__tests__/lazy-entries.test.ts +1 -1
- package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
- package/src/client/avatar-upload.ts +10 -10
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
- package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
- package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
- package/src/client/components/compose-types.ts +14 -0
- package/src/client/components/jant-compose-dialog.ts +96 -41
- package/src/client/components/jant-compose-editor.ts +21 -4
- package/src/client/components/jant-config-editor.ts +4 -6
- package/src/client/components/jant-media-lightbox.ts +4 -4
- package/src/client/components/jant-settings-general.ts +0 -4
- package/src/client/components/nav-manager-types.ts +6 -5
- package/src/client/compose-bridge.ts +15 -4
- package/src/client/compose-launch.ts +4 -6
- package/src/client/compose-shortcuts.ts +1 -1
- package/src/client/footnote-rail.ts +1 -1
- package/src/client/lazy-entries.ts +1 -1
- package/src/client/media-scroll-hint.ts +2 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
- package/src/client/tiptap/markdown-clipboard.ts +50 -2
- package/src/client/upload-session.ts +7 -6
- package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
- package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
- package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
- package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
- package/src/i18n/locales/public/en.po +46 -48
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +45 -46
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +45 -46
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +15 -29
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +15 -29
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +15 -29
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +43 -2
- package/src/lib/__tests__/api-settings.test.ts +3 -3
- package/src/lib/__tests__/constants.test.ts +10 -0
- package/src/lib/__tests__/discover.test.ts +8 -9
- package/src/lib/__tests__/env-values.test.ts +125 -0
- package/src/lib/__tests__/feed-path.test.ts +29 -0
- package/src/lib/__tests__/feed.test.ts +50 -22
- package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
- package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
- package/src/lib/__tests__/rate-limit.test.ts +22 -7
- package/src/lib/__tests__/resolve-config.test.ts +5 -3
- package/src/lib/__tests__/schemas.test.ts +72 -23
- package/src/lib/__tests__/slugify.test.ts +9 -0
- package/src/lib/__tests__/startup-config.test.ts +12 -0
- package/src/lib/__tests__/storage-s3.test.ts +214 -0
- package/src/lib/__tests__/theme.test.ts +20 -1
- package/src/lib/__tests__/time.test.ts +56 -0
- package/src/lib/__tests__/timeline.test.ts +46 -0
- package/src/lib/__tests__/url-fetch.test.ts +65 -1
- package/src/lib/__tests__/url.test.ts +60 -1
- package/src/lib/api-nav-items.ts +16 -20
- package/src/lib/api-post-input.ts +34 -1
- package/src/lib/api-posts.ts +125 -23
- package/src/lib/api-public-posts.ts +28 -37
- package/src/lib/api-search.ts +49 -2
- package/src/lib/api-settings.ts +159 -54
- package/src/lib/api-threads.ts +34 -11
- package/src/lib/constants.ts +6 -0
- package/src/lib/discover.ts +7 -23
- package/src/lib/env-values.ts +140 -0
- package/src/lib/env.ts +203 -12
- package/src/lib/feed-path.ts +8 -2
- package/src/lib/feed-policy.ts +110 -7
- package/src/lib/feed.ts +69 -25
- package/src/lib/filter-dimensions.ts +17 -10
- package/src/lib/github-sync-site-config.ts +1 -0
- package/src/lib/hugo-markdown.ts +5 -6
- package/src/lib/navigation.ts +4 -1
- package/src/lib/post-list-cursor.ts +33 -29
- package/src/lib/public-storage.ts +43 -0
- package/src/lib/rate-limit.ts +31 -16
- package/src/lib/render.tsx +5 -0
- package/src/lib/resolve-config.ts +16 -19
- package/src/lib/schemas.ts +248 -180
- package/src/lib/slugify.ts +6 -1
- package/src/lib/sse.ts +1 -1
- package/src/lib/startup-config.ts +20 -1
- package/src/lib/theme.ts +8 -5
- package/src/lib/thread-fold.ts +6 -0
- package/src/lib/thread-query.ts +19 -24
- package/src/lib/time.ts +137 -17
- package/src/lib/timeline.ts +56 -13
- package/src/lib/url-fetch.ts +141 -40
- package/src/lib/url.ts +86 -1
- package/src/middleware/__tests__/auth.test.ts +27 -0
- package/src/middleware/__tests__/cors.test.ts +54 -0
- package/src/middleware/__tests__/cross-origin.test.ts +149 -0
- package/src/middleware/__tests__/public-content-access.test.ts +2 -42
- package/src/middleware/auth.ts +34 -3
- package/src/middleware/cors.ts +4 -4
- package/src/middleware/cross-origin.ts +124 -0
- package/src/middleware/error-handler.ts +7 -0
- package/src/middleware/public-content-access.ts +3 -26
- package/src/middleware/secure-headers.ts +8 -2
- package/src/node/__tests__/cli-migrate.test.ts +2 -2
- package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
- package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
- package/src/node/__tests__/cli-sql-export.test.ts +25 -1
- package/src/node/__tests__/cli-start.test.ts +66 -0
- package/src/node/__tests__/request-handler.test.ts +37 -0
- package/src/node/__tests__/runtime.test.ts +56 -1
- package/src/node/request-handler.ts +58 -5
- package/src/node/runtime.ts +37 -11
- package/src/preset.css +3 -3
- package/src/routes/__tests__/compose.test.ts +84 -0
- package/src/routes/api/__tests__/collections.test.ts +68 -0
- package/src/routes/api/__tests__/mcp.test.ts +164 -9
- package/src/routes/api/__tests__/media.test.ts +9 -1
- package/src/routes/api/__tests__/nav-items.test.ts +27 -1
- package/src/routes/api/__tests__/posts.test.ts +269 -78
- package/src/routes/api/__tests__/search.test.ts +17 -4
- package/src/routes/api/__tests__/settings.test.ts +119 -85
- package/src/routes/api/__tests__/telegram.test.ts +11 -6
- package/src/routes/api/__tests__/threads.test.ts +11 -0
- package/src/routes/api/__tests__/upload-response.test.ts +48 -0
- package/src/routes/api/__tests__/uploads.test.ts +35 -2
- package/src/routes/api/collections.ts +3 -3
- package/src/routes/api/custom-urls.ts +2 -1
- package/src/routes/api/export.ts +1 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
- package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
- package/src/routes/api/internal/sites.ts +16 -4
- package/src/routes/api/mcp.ts +1 -0
- package/src/routes/api/media.ts +7 -8
- package/src/routes/api/nav-items.ts +2 -1
- package/src/routes/api/posts.ts +18 -24
- package/src/routes/api/public/__tests__/posts.test.ts +15 -0
- package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
- package/src/routes/api/public/__tests__/threads.test.ts +41 -9
- package/src/routes/api/public/posts.ts +2 -2
- package/src/routes/api/public/threads.ts +16 -26
- package/src/routes/api/search.ts +7 -41
- package/src/routes/api/settings.ts +32 -28
- package/src/routes/api/smart-collections.ts +6 -1
- package/src/routes/api/threads.ts +25 -26
- package/src/routes/api/upload.ts +6 -21
- package/src/routes/api/uploads.ts +14 -20
- package/src/routes/auth/__tests__/dev.test.ts +16 -13
- package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
- package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
- package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
- package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
- package/src/routes/auth/__tests__/signin.test.ts +167 -2
- package/src/routes/auth/dev.ts +4 -6
- package/src/routes/auth/hosted-sso.ts +9 -6
- package/src/routes/auth/setup.tsx +35 -5
- package/src/routes/auth/signin.tsx +96 -1
- package/src/routes/compose.tsx +47 -47
- package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
- package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
- package/src/routes/dash/custom-urls.tsx +2 -0
- package/src/routes/dash/settings.tsx +79 -32
- package/src/routes/feed/__tests__/feed.test.ts +93 -3
- package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
- package/src/routes/feed/feed.ts +128 -175
- package/src/routes/feed/sitemap.ts +9 -7
- package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
- package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
- package/src/routes/pages/__tests__/collections.test.ts +3 -0
- package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +34 -2
- package/src/routes/pages/__tests__/search.test.ts +5 -2
- package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
- package/src/routes/pages/archive.tsx +33 -94
- package/src/routes/pages/brand.tsx +1 -0
- package/src/routes/pages/collection.tsx +13 -84
- package/src/routes/pages/collections.tsx +2 -0
- package/src/routes/pages/featured.tsx +7 -2
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/latest.tsx +6 -2
- package/src/routes/pages/new.tsx +1 -0
- package/src/routes/pages/page.tsx +73 -47
- package/src/routes/pages/search.tsx +5 -3
- package/src/routes/pages/smart-collection.tsx +11 -70
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/pages/theme-sample.tsx +1 -0
- package/src/runtime/__tests__/readiness.test.ts +16 -0
- package/src/runtime/cloudflare.ts +2 -3
- package/src/runtime/index.ts +3 -1
- package/src/runtime/node.ts +3 -5
- package/src/runtime/readiness.ts +5 -0
- package/src/services/__tests__/auth.test.ts +115 -0
- package/src/services/__tests__/collection.test.ts +9 -0
- package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
- package/src/services/__tests__/hosted-handoff.test.ts +208 -1
- package/src/services/__tests__/media.test.ts +47 -27
- package/src/services/__tests__/navigation.test.ts +67 -15
- package/src/services/__tests__/post.test.ts +103 -56
- package/src/services/__tests__/search.test.ts +38 -0
- package/src/services/__tests__/settings.test.ts +2 -14
- package/src/services/__tests__/smart-collection.test.ts +2 -2
- package/src/services/__tests__/telegram-ingest.test.ts +113 -0
- package/src/services/__tests__/thread.test.ts +26 -11
- package/src/services/auth.ts +36 -4
- package/src/services/collection.ts +46 -5
- package/src/services/custom-url.ts +11 -4
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +2 -2
- package/src/services/export-theme/layouts/_default/baseof.html +1 -1
- package/src/services/export-theme/layouts/collection/single.html +1 -1
- package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
- package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
- package/src/services/export-theme/styles/main.css +3 -3
- package/src/services/export.ts +68 -19
- package/src/services/github-sync.ts +10 -10
- package/src/services/hosted-handoff.ts +106 -6
- package/src/services/index.ts +3 -1
- package/src/services/language.ts +33 -0
- package/src/services/mcp.ts +176 -438
- package/src/services/media.ts +69 -21
- package/src/services/navigation.ts +19 -4
- package/src/services/path.ts +45 -3
- package/src/services/post.ts +329 -214
- package/src/services/search.ts +22 -3
- package/src/services/settings.ts +36 -3
- package/src/services/site-admin.ts +1 -0
- package/src/services/smart-collection.ts +10 -3
- package/src/services/telegram.ts +23 -6
- package/src/services/thread.ts +11 -3
- package/src/services/upload-session.ts +14 -15
- package/src/styles/components.css +2 -2
- package/src/styles/site-media.css +2 -2
- package/src/styles/tokens.css +19 -22
- package/src/styles/ui-author.css +73 -94
- package/src/styles/ui.css +62 -62
- package/src/types/app-context.ts +5 -1
- package/src/types/bindings.ts +11 -0
- package/src/types/config.ts +4 -4
- package/src/types/constants.ts +20 -0
- package/src/types/props.ts +34 -8
- package/src/types/views.ts +28 -13
- package/src/ui/color-themes.ts +6 -5
- package/src/ui/dash/settings/GeneralContent.tsx +0 -22
- package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
- package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
- package/src/ui/feed/LinkCard.tsx +1 -2
- package/src/ui/feed/NoteCard.tsx +1 -2
- package/src/ui/feed/QuoteCard.tsx +2 -2
- package/src/ui/feed/ThreadPreview.tsx +6 -6
- package/src/ui/feed/TimelineFeed.tsx +1 -7
- package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
- package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
- package/src/ui/layouts/BaseLayout.tsx +5 -0
- package/src/ui/pages/ArchivePage.tsx +1 -1
- package/src/ui/pages/BrandPage.tsx +1 -1
- package/src/ui/pages/CollectionPage.tsx +0 -1
- package/src/ui/pages/CollectionsPage.tsx +2 -2
- package/src/ui/pages/ComposePage.tsx +1 -1
- package/src/ui/pages/FeaturedPage.tsx +1 -1
- package/src/ui/pages/HomePage.tsx +1 -1
- package/src/ui/pages/PostPage.tsx +1 -1
- package/src/ui/pages/SearchPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -3
- package/src/ui/pages/SubscribePage.tsx +1 -1
- package/src/ui/pages/ThemeSamplePage.tsx +1 -1
- package/src/ui/shared/MediaGallery.tsx +1 -1
- package/src/vendor/datastar.js +9 -1956
- package/src/vendor/datastar.js.map +4 -4
- package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
- package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
- package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
- package/dist/client/_assets/client-DRuw7XCt.css +0 -2
- package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
package/src/routes/pages/new.tsx
CHANGED
|
@@ -24,11 +24,14 @@ import {
|
|
|
24
24
|
} from "../../lib/post-display.js";
|
|
25
25
|
import { buildArticleJsonLd } from "../../lib/structured-data.js";
|
|
26
26
|
import {
|
|
27
|
+
getPostPath,
|
|
28
|
+
isFullUrl,
|
|
27
29
|
normalizePath,
|
|
30
|
+
redirectTargetHref,
|
|
28
31
|
toAbsoluteAssetUrl,
|
|
29
32
|
toAbsoluteSiteUrl,
|
|
30
|
-
toPublicHref,
|
|
31
33
|
toPublicPath,
|
|
34
|
+
withRequestQuery,
|
|
32
35
|
} from "../../lib/url.js";
|
|
33
36
|
import {
|
|
34
37
|
buildLanguageSwitcher,
|
|
@@ -151,6 +154,7 @@ async function renderPostWithTextPreview(
|
|
|
151
154
|
.replace(/>/g, "\\u003e");
|
|
152
155
|
|
|
153
156
|
return renderPublicPage(c, {
|
|
157
|
+
page: "post",
|
|
154
158
|
title: buildPageTitle(pageTitle, navData.siteName),
|
|
155
159
|
description: meta.description,
|
|
156
160
|
canonicalHref,
|
|
@@ -250,18 +254,18 @@ async function buildTranslationLinks(
|
|
|
250
254
|
const pathByLanguage = new Map<string, string>();
|
|
251
255
|
if (!post.language) return { alternates: [], pathByLanguage };
|
|
252
256
|
|
|
253
|
-
const translations = post.translationGroupId
|
|
254
|
-
? await c.var.services.posts.listTranslations(post.threadId)
|
|
255
|
-
: [];
|
|
256
257
|
// Only the versions a reader can actually open. A draft or private
|
|
257
258
|
// translation answers the same URL with a 404, and an `hreflang` pointing
|
|
258
259
|
// at a 404 is worse than no `hreflang` at all — the switcher then falls
|
|
259
260
|
// back to that language's home, which is always somewhere real (§5).
|
|
261
|
+
const translations = post.translationGroupId
|
|
262
|
+
? await c.var.services.posts.listTranslations(post.threadId, {
|
|
263
|
+
status: "published",
|
|
264
|
+
excludePrivate: true,
|
|
265
|
+
})
|
|
266
|
+
: [];
|
|
260
267
|
const siblings = translations.filter(
|
|
261
|
-
(other): other is Post & { language: string } =>
|
|
262
|
-
Boolean(other.language) &&
|
|
263
|
-
other.status === "published" &&
|
|
264
|
-
other.visibility !== "private",
|
|
268
|
+
(other): other is Post & { language: string } => Boolean(other.language),
|
|
265
269
|
);
|
|
266
270
|
|
|
267
271
|
// Prefer each post's custom URL when it has one, the same way permalinks do,
|
|
@@ -271,7 +275,7 @@ async function buildTranslationLinks(
|
|
|
271
275
|
...siblings.map((other) => other.id),
|
|
272
276
|
]);
|
|
273
277
|
const pathFor = (target: Post) =>
|
|
274
|
-
|
|
278
|
+
getPostPath(target.slug, aliasesMap.get(target.id)?.[0]);
|
|
275
279
|
|
|
276
280
|
const group = [post as Post & { language: string }, ...siblings];
|
|
277
281
|
for (const target of group) {
|
|
@@ -368,6 +372,7 @@ async function renderPost(
|
|
|
368
372
|
)}?edit=1`;
|
|
369
373
|
|
|
370
374
|
return renderPublicPage(c, {
|
|
375
|
+
page: "post",
|
|
371
376
|
title: previewTitle
|
|
372
377
|
? buildPageTitle(previewTitle, meta.title, navData.siteName)
|
|
373
378
|
: buildPageTitle(meta.title, navData.siteName),
|
|
@@ -485,13 +490,14 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
485
490
|
// but can never shadow an explicit or reserved application route.
|
|
486
491
|
const resolved = await resolveStoredPath(c, fullPath);
|
|
487
492
|
if (resolved?.kind === "redirect" && resolved.redirectToPath) {
|
|
488
|
-
const target =
|
|
489
|
-
// Follow the
|
|
490
|
-
// on a post then applies the canonical-address rule below.
|
|
493
|
+
const target = redirectTargetHref(resolved.redirectToPath);
|
|
494
|
+
// Follow a redirect on the site within the current view; the hop that
|
|
495
|
+
// lands on a post then applies the canonical-address rule below. One off
|
|
496
|
+
// the site goes where it says.
|
|
491
497
|
return c.redirect(
|
|
492
|
-
|
|
493
|
-
?
|
|
494
|
-
:
|
|
498
|
+
isFullUrl(target)
|
|
499
|
+
? target
|
|
500
|
+
: withRequestQuery(toViewPath(c, target), c.req.url),
|
|
495
501
|
resolved.redirectType ?? 301,
|
|
496
502
|
);
|
|
497
503
|
}
|
|
@@ -525,7 +531,10 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
525
531
|
collection.id,
|
|
526
532
|
);
|
|
527
533
|
if (alias) {
|
|
528
|
-
return c.redirect(
|
|
534
|
+
return c.redirect(
|
|
535
|
+
withRequestQuery(toViewPath(c, `/${alias.path}/feed`), c.req.url),
|
|
536
|
+
301,
|
|
537
|
+
);
|
|
529
538
|
}
|
|
530
539
|
|
|
531
540
|
const result = await renderCollectionFeed(c, collection.slug);
|
|
@@ -565,9 +574,12 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
565
574
|
// Redirect slug → alias if one exists (same pattern as post pages)
|
|
566
575
|
if (resolvedPost.kind === "slug" && loaded.canonicalAlias) {
|
|
567
576
|
return c.redirect(
|
|
568
|
-
|
|
569
|
-
|
|
570
|
-
|
|
577
|
+
withRequestQuery(
|
|
578
|
+
toPublicPath(
|
|
579
|
+
`${loaded.canonicalAlias}/text/${mediaId}`,
|
|
580
|
+
sitePathPrefix,
|
|
581
|
+
),
|
|
582
|
+
c.req.url,
|
|
571
583
|
),
|
|
572
584
|
301,
|
|
573
585
|
);
|
|
@@ -576,7 +588,13 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
576
588
|
// A text attachment belongs to a post, so it inherits that post's single
|
|
577
589
|
// canonical address rather than existing once per language view.
|
|
578
590
|
if (inLanguageView) {
|
|
579
|
-
return c.redirect(
|
|
591
|
+
return c.redirect(
|
|
592
|
+
withRequestQuery(
|
|
593
|
+
toPublicPath(`/${fullPath}`, sitePathPrefix),
|
|
594
|
+
c.req.url,
|
|
595
|
+
),
|
|
596
|
+
301,
|
|
597
|
+
);
|
|
580
598
|
}
|
|
581
599
|
|
|
582
600
|
// The file must belong to this post; the service applies the rest of
|
|
@@ -627,15 +645,19 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
627
645
|
return c.notFound();
|
|
628
646
|
}
|
|
629
647
|
|
|
630
|
-
//
|
|
631
|
-
|
|
632
|
-
|
|
633
|
-
|
|
634
|
-
|
|
635
|
-
|
|
636
|
-
// One address per post: a language-prefixed URL is only ever a way in.
|
|
648
|
+
// One address per post: its first custom URL, or its slug. Anything
|
|
649
|
+
// else that reached it — the slug when there is a custom URL, a later
|
|
650
|
+
// custom URL, a different letter case, a language prefix — is only a way
|
|
651
|
+
// in and redirects there.
|
|
652
|
+
const canonicalPath = getPostPath(post.slug, loaded.canonicalAlias);
|
|
637
653
|
if (inLanguageView || canonicalPath !== `/${fullPath}`) {
|
|
638
|
-
return c.redirect(
|
|
654
|
+
return c.redirect(
|
|
655
|
+
withRequestQuery(
|
|
656
|
+
toPublicPath(canonicalPath, sitePathPrefix),
|
|
657
|
+
c.req.url,
|
|
658
|
+
),
|
|
659
|
+
301,
|
|
660
|
+
);
|
|
639
661
|
}
|
|
640
662
|
|
|
641
663
|
return renderPost(c, post, { allowDraft });
|
|
@@ -646,6 +668,12 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
646
668
|
resolved.smartCollectionId,
|
|
647
669
|
);
|
|
648
670
|
if (!smartCollection) return c.notFound();
|
|
671
|
+
if (fullPath !== smartCollection.slug) {
|
|
672
|
+
return c.redirect(
|
|
673
|
+
withRequestQuery(toViewPath(c, `/${smartCollection.slug}`), c.req.url),
|
|
674
|
+
301,
|
|
675
|
+
);
|
|
676
|
+
}
|
|
649
677
|
|
|
650
678
|
const result = await renderSmartCollectionPage(c, smartCollection.slug);
|
|
651
679
|
return result ?? c.notFound();
|
|
@@ -657,28 +685,26 @@ export async function renderRegisteredPath(c: Context<Env>): Promise<Response> {
|
|
|
657
685
|
);
|
|
658
686
|
if (!collection) return c.notFound();
|
|
659
687
|
|
|
660
|
-
|
|
661
|
-
|
|
662
|
-
|
|
663
|
-
|
|
688
|
+
// One address per collection, as for a post: its first custom URL, or
|
|
689
|
+
// its slug. Any other way in redirects there, within the language view.
|
|
690
|
+
const alias = await c.var.services.customUrls.getByTarget(
|
|
691
|
+
"collection",
|
|
692
|
+
collection.id,
|
|
693
|
+
);
|
|
694
|
+
const canonicalPath = alias ? alias.path : collection.slug;
|
|
695
|
+
if (fullPath !== canonicalPath) {
|
|
696
|
+
return c.redirect(
|
|
697
|
+
withRequestQuery(toViewPath(c, `/${canonicalPath}`), c.req.url),
|
|
698
|
+
301,
|
|
664
699
|
);
|
|
665
|
-
if (alias) {
|
|
666
|
-
return c.redirect(toViewPath(c, `/${alias.path}`), 301);
|
|
667
|
-
}
|
|
668
|
-
|
|
669
|
-
const result = await renderCollectionPage(c, collection.slug);
|
|
670
|
-
return result ?? c.notFound();
|
|
671
700
|
}
|
|
672
701
|
|
|
673
|
-
|
|
674
|
-
|
|
675
|
-
|
|
676
|
-
|
|
677
|
-
|
|
678
|
-
|
|
679
|
-
);
|
|
680
|
-
return result ?? c.notFound();
|
|
681
|
-
}
|
|
702
|
+
const result = await renderCollectionPage(
|
|
703
|
+
c,
|
|
704
|
+
collection.slug,
|
|
705
|
+
alias ? `/${alias.path}` : undefined,
|
|
706
|
+
);
|
|
707
|
+
return result ?? c.notFound();
|
|
682
708
|
}
|
|
683
709
|
|
|
684
710
|
return c.notFound();
|
|
@@ -43,12 +43,13 @@ export async function renderSearchPage(c: Context<Env>): Promise<Response> {
|
|
|
43
43
|
|
|
44
44
|
// This page is the only search a signed-out reader has, so the per-client
|
|
45
45
|
// search limit applies here. The signed-in author isn't metered, as on the
|
|
46
|
-
// search API and MCP.
|
|
46
|
+
// search API and MCP, and a limit of 0 meters no one.
|
|
47
|
+
const { searchPerMinute } = c.var.appConfig.rateLimit;
|
|
47
48
|
const rateLimit =
|
|
48
|
-
query.trim() && !c.var.isAuthenticated
|
|
49
|
+
query.trim() && !c.var.isAuthenticated && searchPerMinute > 0
|
|
49
50
|
? await checkRequestRateLimit(c, {
|
|
50
51
|
name: "search",
|
|
51
|
-
limit:
|
|
52
|
+
limit: searchPerMinute,
|
|
52
53
|
windowSec: 60,
|
|
53
54
|
})
|
|
54
55
|
: null;
|
|
@@ -101,6 +102,7 @@ export async function renderSearchPage(c: Context<Env>): Promise<Response> {
|
|
|
101
102
|
);
|
|
102
103
|
|
|
103
104
|
return renderPublicPage(c, {
|
|
105
|
+
page: "search",
|
|
104
106
|
title: buildPageTitle(
|
|
105
107
|
query ? `Search: ${query}` : "Search",
|
|
106
108
|
navData.siteName,
|
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
import type { Context } from "hono";
|
|
12
|
+
import { buildFeedPostViews } from "../feed/feed.js";
|
|
12
13
|
import type { Bindings, SmartCollection } from "../../types.js";
|
|
13
14
|
import type { AppVariables } from "../../types/app-context.js";
|
|
14
15
|
import { SmartCollectionPage } from "../../ui/pages/SmartCollectionPage.js";
|
|
@@ -20,14 +21,14 @@ import { assembleTimelineItems } from "../../lib/timeline.js";
|
|
|
20
21
|
import { defaultFeedRenderer } from "../../lib/feed.js";
|
|
21
22
|
import {
|
|
22
23
|
buildFeedDiscoveryFields,
|
|
23
|
-
|
|
24
|
+
buildFeedLabels,
|
|
24
25
|
getFeedLimit,
|
|
25
26
|
getRssPublishedBefore,
|
|
27
|
+
feedsPublished,
|
|
26
28
|
renderFeed,
|
|
27
29
|
} from "../../lib/feed-policy.js";
|
|
28
30
|
import { toPlainText as markdownToPlainText } from "../../lib/markdown.js";
|
|
29
|
-
|
|
30
|
-
import { createMediaContext, toPostViews } from "../../lib/view.js";
|
|
31
|
+
|
|
31
32
|
import { toAbsoluteSiteUrl } from "../../lib/url.js";
|
|
32
33
|
import {
|
|
33
34
|
buildSurfaceAlternates,
|
|
@@ -91,6 +92,7 @@ export async function renderSmartCollectionPage(
|
|
|
91
92
|
const viewer = {
|
|
92
93
|
isAuthenticated: navData.isAuthenticated,
|
|
93
94
|
lang: getViewLang(c) ?? undefined,
|
|
95
|
+
timeZone: c.var.appConfig.timeZone,
|
|
94
96
|
};
|
|
95
97
|
|
|
96
98
|
// The rating order is offered only where it would say something. One cheap
|
|
@@ -145,6 +147,7 @@ export async function renderSmartCollectionPage(
|
|
|
145
147
|
: undefined;
|
|
146
148
|
|
|
147
149
|
return renderPublicPage(c, {
|
|
150
|
+
page: "collection",
|
|
148
151
|
title:
|
|
149
152
|
page > 1
|
|
150
153
|
? buildPageTitle(
|
|
@@ -219,6 +222,8 @@ export async function renderSmartCollectionFeed(
|
|
|
219
222
|
c: Context<Env>,
|
|
220
223
|
slug: string,
|
|
221
224
|
): Promise<Response | null> {
|
|
225
|
+
// Null, which the caller answers with 404.
|
|
226
|
+
if (!feedsPublished(c)) return null;
|
|
222
227
|
const smartCollection = await c.var.services.smartCollections.getBySlug(slug);
|
|
223
228
|
if (!smartCollection) return null;
|
|
224
229
|
|
|
@@ -233,6 +238,7 @@ export async function renderSmartCollectionFeed(
|
|
|
233
238
|
const filters = services.smartCollections.toPostFilters(smartCollection, {
|
|
234
239
|
isAuthenticated: false,
|
|
235
240
|
lang: getViewLang(c) ?? undefined,
|
|
241
|
+
timeZone: appConfig.timeZone,
|
|
236
242
|
});
|
|
237
243
|
const posts = await services.posts.list({
|
|
238
244
|
...filters,
|
|
@@ -245,76 +251,11 @@ export async function renderSmartCollectionFeed(
|
|
|
245
251
|
limit: getFeedLimit(c),
|
|
246
252
|
});
|
|
247
253
|
|
|
248
|
-
const
|
|
249
|
-
const postIds = posts.map((post) => post.id);
|
|
250
|
-
const [threadMap, rawMediaMap, aliasesMap] = await Promise.all([
|
|
251
|
-
services.posts.getPublishedThreads(rootIds, { publishedBefore }),
|
|
252
|
-
services.media.getByPostIds(postIds),
|
|
253
|
-
services.paths.getPostAliases(postIds),
|
|
254
|
-
]);
|
|
255
|
-
|
|
256
|
-
const replyIds: string[] = [];
|
|
257
|
-
for (const [rootId, thread] of threadMap) {
|
|
258
|
-
for (const reply of thread) {
|
|
259
|
-
if (reply.id !== rootId) replyIds.push(reply.id);
|
|
260
|
-
}
|
|
261
|
-
}
|
|
262
|
-
const replyMediaMap =
|
|
263
|
-
replyIds.length > 0
|
|
264
|
-
? await services.media.getByPostIds(replyIds)
|
|
265
|
-
: new Map<string, never[]>();
|
|
266
|
-
|
|
267
|
-
const mediaCtx = createMediaContext(appConfig);
|
|
268
|
-
const allRawMedia = new Map(rawMediaMap);
|
|
269
|
-
for (const [id, media] of replyMediaMap) {
|
|
270
|
-
allRawMedia.set(id, media);
|
|
271
|
-
}
|
|
272
|
-
const mediaMap = buildMediaMap(
|
|
273
|
-
allRawMedia,
|
|
274
|
-
mediaCtx.r2PublicUrl,
|
|
275
|
-
mediaCtx.imageTransformUrl,
|
|
276
|
-
mediaCtx.s3PublicUrl,
|
|
277
|
-
mediaCtx.localPublicUrl,
|
|
278
|
-
mediaCtx.sitePathPrefix,
|
|
279
|
-
);
|
|
280
|
-
const aliasMap = new Map<string, string>();
|
|
281
|
-
for (const [id, aliases] of aliasesMap) {
|
|
282
|
-
if (aliases[0]) aliasMap.set(id, aliases[0]);
|
|
283
|
-
}
|
|
284
|
-
|
|
285
|
-
const postViews = toPostViews(
|
|
286
|
-
posts.map((post) => ({
|
|
287
|
-
...post,
|
|
288
|
-
mediaAttachments: mediaMap.get(post.id) ?? [],
|
|
289
|
-
})),
|
|
290
|
-
mediaCtx,
|
|
291
|
-
undefined,
|
|
292
|
-
aliasMap,
|
|
293
|
-
).map((postView, index) => {
|
|
294
|
-
const post = posts[index] as (typeof posts)[number];
|
|
295
|
-
const thread = threadMap.get(post.id);
|
|
296
|
-
const replies =
|
|
297
|
-
thread && thread.length > 1
|
|
298
|
-
? toPostViews(
|
|
299
|
-
thread
|
|
300
|
-
.filter((reply) => reply.id !== post.id)
|
|
301
|
-
.map((reply) => ({
|
|
302
|
-
...reply,
|
|
303
|
-
mediaAttachments: mediaMap.get(reply.id) ?? [],
|
|
304
|
-
})),
|
|
305
|
-
mediaCtx,
|
|
306
|
-
)
|
|
307
|
-
: undefined;
|
|
308
|
-
|
|
309
|
-
return {
|
|
310
|
-
...postView,
|
|
311
|
-
feedUpdatedAt: getFeedEntryUpdatedAt(post, thread),
|
|
312
|
-
threadReplies: replies,
|
|
313
|
-
};
|
|
314
|
-
});
|
|
254
|
+
const postViews = await buildFeedPostViews(c, posts, { publishedBefore });
|
|
315
255
|
|
|
316
256
|
const feedData = {
|
|
317
257
|
...buildFeedDiscoveryFields(c),
|
|
258
|
+
labels: buildFeedLabels(c),
|
|
318
259
|
siteName: appConfig.siteName,
|
|
319
260
|
siteDescription: markdownToPlainText(appConfig.siteDescription),
|
|
320
261
|
siteUrl: appConfig.siteUrl,
|
|
@@ -71,6 +71,22 @@ describe("getInstanceReadiness", () => {
|
|
|
71
71
|
);
|
|
72
72
|
});
|
|
73
73
|
|
|
74
|
+
it("reports an environment value Jant can't use", async () => {
|
|
75
|
+
const { sqlite } = createTestDatabase();
|
|
76
|
+
|
|
77
|
+
const result = await getInstanceReadiness({
|
|
78
|
+
AUTH_SECRET: "test-secret-with-enough-entropy-for-readiness",
|
|
79
|
+
NODE_SQLITE: sqlite,
|
|
80
|
+
TRUST_PROXY: "yes",
|
|
81
|
+
} as Parameters<typeof getInstanceReadiness>[0]);
|
|
82
|
+
|
|
83
|
+
expect(result.status).toBe("error");
|
|
84
|
+
expect(result.checks.startupConfig).toEqual({
|
|
85
|
+
ok: false,
|
|
86
|
+
error: 'TRUST_PROXY can\'t be "yes". Use true or false.',
|
|
87
|
+
});
|
|
88
|
+
});
|
|
89
|
+
|
|
74
90
|
it("reports startup configuration failures when AUTH_SECRET is still the placeholder", async () => {
|
|
75
91
|
const { sqlite } = createTestDatabase();
|
|
76
92
|
|
|
@@ -3,7 +3,7 @@ import { createDatabase, type Database } from "../db/index.js";
|
|
|
3
3
|
import { sqliteSchemaBundle } from "../db/schema-bundle.js";
|
|
4
4
|
import {
|
|
5
5
|
getAuthSecret,
|
|
6
|
-
|
|
6
|
+
readEnvInteger,
|
|
7
7
|
getHostedControlPlaneProviderLabel,
|
|
8
8
|
getHostedControlPlaneSsoSecret,
|
|
9
9
|
getSiteResolutionMode,
|
|
@@ -86,8 +86,7 @@ export async function createCloudflareRequestRuntime(
|
|
|
86
86
|
// Note: Drizzle ORM doesn't officially support D1DatabaseSession yet
|
|
87
87
|
// (issue #2226), but it works at runtime.
|
|
88
88
|
const db = createDatabase(session as unknown as D1Database);
|
|
89
|
-
const slugIdLength =
|
|
90
|
-
parseInt(getEnvString(env, "SLUG_ID_LENGTH") ?? "5", 10) || 5;
|
|
89
|
+
const slugIdLength = readEnvInteger(env, "SLUG_ID_LENGTH") ?? 5;
|
|
91
90
|
const siteLookup = await resolveRequestSite(db, env, publicRequestUrl);
|
|
92
91
|
const baseURL = getResolvedSiteBaseUrl(
|
|
93
92
|
env,
|
package/src/runtime/index.ts
CHANGED
|
@@ -8,7 +8,9 @@ import type { Bindings } from "../types/bindings.js";
|
|
|
8
8
|
* Matched on the `.session_token` suffix so it holds for both the plain and
|
|
9
9
|
* the `__Secure-`-prefixed cookie name. This is a cheap "probably signed in"
|
|
10
10
|
* hint used to pick a database consistency mode — it does not verify the
|
|
11
|
-
* cookie's signature, and it must not be used to
|
|
11
|
+
* cookie's signature, and it must not be used to grant access. It also picks
|
|
12
|
+
* the writes the cross-origin check covers: a cookie this misses is one
|
|
13
|
+
* better-auth wouldn't read as a session either.
|
|
12
14
|
*
|
|
13
15
|
* @param cookieHeader - Raw `Cookie` request header, if any
|
|
14
16
|
* @returns `true` when a session token cookie appears to be present
|
package/src/runtime/node.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { sqliteSchemaBundle } from "../db/schema-bundle.js";
|
|
|
5
5
|
import { createAuth, type Auth } from "../auth.js";
|
|
6
6
|
import {
|
|
7
7
|
getAuthSecret,
|
|
8
|
-
|
|
8
|
+
readEnvInteger,
|
|
9
9
|
getHostedControlPlaneProviderLabel,
|
|
10
10
|
getHostedControlPlaneSsoSecret,
|
|
11
11
|
getSiteResolutionMode,
|
|
@@ -126,8 +126,7 @@ export async function createNodeRequestRuntime(
|
|
|
126
126
|
throw new Error("AUTH_SECRET should be set after startup validation.");
|
|
127
127
|
}
|
|
128
128
|
|
|
129
|
-
const slugIdLength =
|
|
130
|
-
parseInt(getEnvString(env, "SLUG_ID_LENGTH") ?? "5", 10) || 5;
|
|
129
|
+
const slugIdLength = readEnvInteger(env, "SLUG_ID_LENGTH") ?? 5;
|
|
131
130
|
const siteLookup = await resolveRequestSite(
|
|
132
131
|
db,
|
|
133
132
|
env,
|
|
@@ -216,8 +215,7 @@ export async function createNodeCliRuntime(
|
|
|
216
215
|
throw new Error("Node CLI runtime requires a resolved database binding.");
|
|
217
216
|
}
|
|
218
217
|
|
|
219
|
-
const slugIdLength =
|
|
220
|
-
parseInt(getEnvString(env, "SLUG_ID_LENGTH") ?? "5", 10) || 5;
|
|
218
|
+
const slugIdLength = readEnvInteger(env, "SLUG_ID_LENGTH") ?? 5;
|
|
221
219
|
const siteLookup = await resolveCliSite(db, env, selector, databaseSchema);
|
|
222
220
|
|
|
223
221
|
return {
|
package/src/runtime/readiness.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { createDatabase, createNodeDatabase } from "../db/index.js";
|
|
2
2
|
import { sqliteSchemaBundle } from "../db/schema-bundle.js";
|
|
3
|
+
import { getEnvValueIssues } from "../lib/env-values.js";
|
|
3
4
|
import {
|
|
4
5
|
getAuthSecretIssueKind,
|
|
5
6
|
getAuthSecretReadinessError,
|
|
@@ -55,6 +56,10 @@ function getStartupConfigurationReadiness(
|
|
|
55
56
|
errors.push(`${issue.variable}: ${issue.message}`);
|
|
56
57
|
}
|
|
57
58
|
|
|
59
|
+
for (const issue of getEnvValueIssues(env)) {
|
|
60
|
+
errors.push(issue.message);
|
|
61
|
+
}
|
|
62
|
+
|
|
58
63
|
return errors.length > 0
|
|
59
64
|
? {
|
|
60
65
|
ok: false,
|
|
@@ -456,4 +456,119 @@ describe("AuthService", () => {
|
|
|
456
456
|
);
|
|
457
457
|
});
|
|
458
458
|
});
|
|
459
|
+
|
|
460
|
+
describe("resetPassword", () => {
|
|
461
|
+
const OTHER_SITE_ID = "sit_otherreset0000000000000000";
|
|
462
|
+
|
|
463
|
+
beforeEach(() => {
|
|
464
|
+
const testDb = createTestDatabase();
|
|
465
|
+
db = testDb.db as unknown as Database;
|
|
466
|
+
});
|
|
467
|
+
|
|
468
|
+
async function seedUser(id: string, email: string, siteId: string) {
|
|
469
|
+
const createdAt = new Date();
|
|
470
|
+
const timestamp = Math.floor(Date.now() / 1000);
|
|
471
|
+
await db.insert(user).values({
|
|
472
|
+
id,
|
|
473
|
+
name: email,
|
|
474
|
+
email,
|
|
475
|
+
emailVerified: true,
|
|
476
|
+
createdAt,
|
|
477
|
+
updatedAt: createdAt,
|
|
478
|
+
});
|
|
479
|
+
await db.insert(account).values({
|
|
480
|
+
id: id.replace("usr_", "acc_"),
|
|
481
|
+
accountId: email,
|
|
482
|
+
providerId: "credential",
|
|
483
|
+
userId: id,
|
|
484
|
+
password: "old-hash",
|
|
485
|
+
createdAt,
|
|
486
|
+
updatedAt: createdAt,
|
|
487
|
+
});
|
|
488
|
+
await db.insert(siteMembers).values({
|
|
489
|
+
siteId,
|
|
490
|
+
userId: id,
|
|
491
|
+
role: "owner",
|
|
492
|
+
createdAt: timestamp,
|
|
493
|
+
updatedAt: timestamp,
|
|
494
|
+
});
|
|
495
|
+
}
|
|
496
|
+
|
|
497
|
+
async function passwordOf(userId: string) {
|
|
498
|
+
const rows = await db
|
|
499
|
+
.select({ password: account.password })
|
|
500
|
+
.from(account)
|
|
501
|
+
.where(sql`${account.userId} = ${userId}`);
|
|
502
|
+
return rows[0]?.password;
|
|
503
|
+
}
|
|
504
|
+
|
|
505
|
+
it("resets this site's owner, not the first account in the database", async () => {
|
|
506
|
+
const timestamp = Math.floor(Date.now() / 1000);
|
|
507
|
+
await db.insert(sites).values({
|
|
508
|
+
id: OTHER_SITE_ID,
|
|
509
|
+
key: "other",
|
|
510
|
+
status: "active",
|
|
511
|
+
createdAt: timestamp,
|
|
512
|
+
updatedAt: timestamp,
|
|
513
|
+
});
|
|
514
|
+
// Created first, so a bare `SELECT … LIMIT 1` would pick it.
|
|
515
|
+
await seedUser(
|
|
516
|
+
"usr_01otherowner0000000000000",
|
|
517
|
+
"other@example.com",
|
|
518
|
+
OTHER_SITE_ID,
|
|
519
|
+
);
|
|
520
|
+
await seedUser(
|
|
521
|
+
"usr_01thisowner00000000000000",
|
|
522
|
+
"me@example.com",
|
|
523
|
+
DEFAULT_TEST_SITE_ID,
|
|
524
|
+
);
|
|
525
|
+
|
|
526
|
+
const settingsService = createSettingsService(db, DEFAULT_TEST_SITE_ID);
|
|
527
|
+
const authService = createAuthService(db, settingsService, {
|
|
528
|
+
siteId: DEFAULT_TEST_SITE_ID,
|
|
529
|
+
});
|
|
530
|
+
const token = "reset-token";
|
|
531
|
+
const digest = await crypto.subtle.digest(
|
|
532
|
+
"SHA-256",
|
|
533
|
+
new TextEncoder().encode(token),
|
|
534
|
+
);
|
|
535
|
+
const tokenHash = Array.from(new Uint8Array(digest))
|
|
536
|
+
.map((b) => b.toString(16).padStart(2, "0"))
|
|
537
|
+
.join("");
|
|
538
|
+
await settingsService.set(
|
|
539
|
+
SETTINGS_KEYS.PASSWORD_RESET_TOKEN,
|
|
540
|
+
`${tokenHash}:${timestamp + 900}`,
|
|
541
|
+
);
|
|
542
|
+
|
|
543
|
+
await authService.resetPassword(token, "new-password-123");
|
|
544
|
+
|
|
545
|
+
expect(await passwordOf("usr_01thisowner00000000000000")).not.toBe(
|
|
546
|
+
"old-hash",
|
|
547
|
+
);
|
|
548
|
+
expect(await passwordOf("usr_01otherowner0000000000000")).toBe(
|
|
549
|
+
"old-hash",
|
|
550
|
+
);
|
|
551
|
+
});
|
|
552
|
+
});
|
|
553
|
+
|
|
554
|
+
describe("deleteAllData in a host-based database", () => {
|
|
555
|
+
beforeEach(() => {
|
|
556
|
+
const testDb = createTestDatabase();
|
|
557
|
+
db = testDb.db as unknown as Database;
|
|
558
|
+
});
|
|
559
|
+
|
|
560
|
+
it("refuses, since every table holds other sites' rows too", async () => {
|
|
561
|
+
await seedAuthData();
|
|
562
|
+
const settingsService = createSettingsService(db, DEFAULT_TEST_SITE_ID);
|
|
563
|
+
const authService = createAuthService(db, settingsService, {
|
|
564
|
+
siteId: DEFAULT_TEST_SITE_ID,
|
|
565
|
+
siteResolutionMode: "host-based",
|
|
566
|
+
});
|
|
567
|
+
|
|
568
|
+
await expect(authService.deleteAllData()).rejects.toThrow(
|
|
569
|
+
"more than one site",
|
|
570
|
+
);
|
|
571
|
+
expect(await db.select().from(user)).toHaveLength(1);
|
|
572
|
+
});
|
|
573
|
+
});
|
|
459
574
|
});
|