@jant/core 0.10.0 → 0.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/commands/db/execute-file.js +1 -1
- package/bin/commands/db/export.js +1 -1
- package/bin/commands/migrate.js +4 -4
- package/bin/commands/posts/rebuild-html.js +1 -1
- package/bin/commands/reset-password.js +1 -1
- package/bin/commands/search/reindex.js +1 -1
- package/bin/commands/setup.js +4 -2
- package/bin/commands/site/export.js +3 -0
- package/bin/commands/site/import.js +178 -91
- package/bin/commands/site/pull-media.js +3 -2
- package/bin/commands/site/snapshot/export.js +3 -1
- package/bin/commands/site/snapshot/import.js +3 -2
- package/bin/commands/start.js +44 -0
- package/bin/commands/telegram/register-webhooks.js +1 -1
- package/bin/commands/uploads/cleanup.js +48 -9
- package/bin/jant.js +39 -4
- package/bin/lib/import-sources.js +151 -0
- package/bin/lib/node-env.js +14 -9
- package/bin/lib/runtime-target.js +1 -1
- package/bin/lib/site-pull-media.js +56 -4
- package/bin/lib/site-snapshot.js +39 -2
- package/bin/lib/sql-export.js +66 -10
- package/dist/{app-DIVtyB4m.js → app-jQI4OPRe.js} +5055 -4448
- package/dist/client/.vite/manifest.json +38 -38
- package/dist/client/_assets/chunks/{create-editor-B-m7X7S5.js → create-editor-5Y49x7h5.js} +2 -2
- package/dist/client/_assets/chunks/{footnote-rail-CmeoVtnU.js → footnote-rail-BJwswtVQ.js} +1 -1
- package/dist/client/_assets/chunks/{settings-paths-C-ZZBTau.js → settings-paths-h6RjIe3C.js} +2 -2
- package/dist/client/_assets/chunks/{slug-format-BcIsNKz-.js → slug-format-Dsi0e9Xn.js} +1 -1
- package/dist/client/_assets/chunks/{slugify-373citbs.js → slugify-DlHLyUHS.js} +1 -1
- package/dist/client/_assets/chunks/sortable-list-DYMcJrlS.js +2 -0
- package/dist/client/_assets/chunks/unsafe-svg-DxrzM_Gb.js +2 -0
- package/dist/client/_assets/client-52vQhZAv.js +296 -0
- package/dist/client/_assets/client-BaqmpPQ-.css +2 -0
- package/dist/client/_assets/{client-auth-BpkkKTsV.js → client-auth-BDcCR6u1.js} +2 -2
- package/dist/client/_assets/client-author-CGVvrNZ8.css +2 -0
- package/dist/client/_assets/{client-compose-C-DXzcFR.js → client-compose-CzEwT5qX.js} +4 -4
- package/dist/client/_assets/{client-manage-BfT7ht4M.js → client-manage-CF7x21L4.js} +37 -37
- package/dist/client/_assets/{client-settings-CGR_nZ78.js → client-settings-DIM44Zqh.js} +2 -2
- package/dist/{url-CKlGzvdN.js → constants-DEgyqWDl.js} +340 -1
- package/dist/index.d.ts +44 -0
- package/dist/index.js +33 -1
- package/dist/node.js +57 -13
- package/package.json +13 -18
- package/src/__tests__/api-docs.test.ts +168 -1
- package/src/__tests__/bin/import-sources.test.ts +85 -0
- package/src/__tests__/bin/uploads-cleanup.test.ts +66 -26
- package/src/__tests__/cli-commands.test.ts +40 -0
- package/src/__tests__/config-docs.test.ts +119 -16
- package/src/__tests__/custom-url-redirects.test.ts +108 -0
- package/src/__tests__/export-collection-custom-urls.test.ts +69 -0
- package/src/__tests__/export-docs.test.ts +113 -41
- package/src/__tests__/export-feed-ids.test.ts +1 -0
- package/src/__tests__/export-format-version.test.ts +88 -0
- package/src/__tests__/export-hugo-build.test.ts +139 -4
- package/src/__tests__/export-import-roundtrip.test.ts +2 -1
- package/src/__tests__/export-service.test.ts +42 -13
- package/src/__tests__/export-smart-collection.test.ts +1 -1
- package/src/__tests__/feed-docs.test.ts +287 -21
- package/src/__tests__/feed-reply-addresses.test.ts +100 -0
- package/src/__tests__/feeds-disabled.test.ts +98 -0
- package/src/__tests__/fixtures/export-format/1.json +76 -0
- package/src/__tests__/fixtures/export-format/2.json +80 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/README.md +130 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2thjq/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/2u5e5/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/0x4nv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/faqyt/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/41q27/the-potting-mix-guide-i-keep-rereading/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5kayp/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/5ynfs/hu597/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-night-heron-field-guide-for-my-walk-folder/_index.md +31 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/a-quiet-saturday-after-a-busy-week/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/archive/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/are-na-is-the-only-bookmark-pile-i-still-revisit/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/bought-too-many-lemons-again/_index.md +37 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/city-walks/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshot-for-screenshots-ocr-and-screen-recording-on-the-mac/_index.md +33 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/cleanshotmac-shang-de-jie-tu-ocr-lu-ping-gong-ju/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/co344/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/collections/_index.md +5 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/current-tea-rotation/_index.md +34 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/derek-sivers-still-writes-the-kind-of-internet-i-want-more-of/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/desk-but-better/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/e0kcg/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/egi3c/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/evf9j/_index.md +152 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/featured/_index.md +8 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-basho/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-epictetus/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-marcus-aurelius/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-seneca/_index.md +26 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/from-thoreau/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/2cl6d/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/3zqv7/index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/5oxsv/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gkbvv/_index.md +39 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/gwob9/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/home-cooking/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/hz729/_index.md +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/inaturalist-ai-zi-ran-she-qu/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/j4v0q/_index.md +35 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k278t/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k4eee/_index.md +22 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a-reading-log-idea-i-might-steal/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/a83qu/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/k5vh8/from-seneca-5hibo/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/kan-qi-lai-bi-jiao-ku-de-gong-si-men/_index.md +41 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/l2m7y/_index.md +29 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/lan-ya-yao-kong-qi-chuang-shang-yue-du-de-fan-ye-shen-qi/_index.md +57 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/mynoise-for-rainy-afternoons/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/n09le/_index.md +23 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/ni-fu-jin-de-wei-ji-bai-ke-tiao-mu/_index.md +42 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/nts-archives-are-good-cleaning-music/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/c91j0/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/qyucy/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/qgfcu/wsgck/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/rain-makes-my-neighborhood-look-better/_index.md +46 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/reading-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/s4r3e/_index.md +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/serious-eats-on-tomato-and-egg-soup/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/_index.md +44 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/cxiu6/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/t77ms/index.md +18 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/te812/the-soup-trick-i-always-forget/index.md +20 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/telk3/from-thoreau-pawt2/index.md +21 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-five-minute-reset-is-still-the-best-habit-i-have/_index.md +36 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-hallway-light-took-12-minutes-and-3-months/_index.md +32 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/the-recurse-center-manual-is-weirdly-calming/_index.md +30 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tiny-projects/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tong-wang-xing-fu-zhi-lu/_index.md +68 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/tou-ma-yan-jiang-ju-le-bu-chu-ti-yan/_index.md +62 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/useful-links/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/weekend-notes/_index.md +12 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/content/what-i-actually-use-my-notebook-for/_index.md +52 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/data/jant.toml +124 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/hugo.toml +45 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/_redirects +25 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/40bc6cd1f12e-med_01kn8jtq3penf98tfq4gzmh9g9.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jtx8qenf98tm9ahxr48sw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv0jdenf98tp6qr9zgjjc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jv452enf98trbkwrvhvgd.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvb16enf98txp7p0pf5ge.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jve5nenf98tzap11gpxzr.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvq58enf98v538w5vsqp4.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jvsaeenf98v6ct4gjzppc.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01kn8jw26cenf98vc7k0ppz5k8.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q1hme4e8cmby77dn66yy.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q2w7e4e8cmc20036yh66.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q7d2e4e8cmdeqjmyafby.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m313q887e4e8cmdjssych7yh.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167jx2f6ct88pkz45j3ycp.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167mbdf6ct88pr4ga1b9kf.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167nsvf6ct88q1anhz4svb.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83-poster.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167qaxf6ct88qfndwzxx83.mp4 +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167sm0f6ct88qw5brtsgcw.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167tf8f6ct88r169s51j49.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167vaaf6ct88rbx5ztenwb.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167w51f6ct88rp19pybkw1.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167x0nf6ct88rzajb84tw3.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167xxbf6ct88s5t2300bjk.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167yq5f6ct88s9pjwt5fxg.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/static/media/med_01m3167zg4f6ct88sge8jp28ja.webp +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/apple-touch-icon.png +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/custom.css +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/themes/jant/static/favicon.ico +0 -0
- package/src/__tests__/fixtures/releases/0.10.0/site-export/wrangler.jsonc +24 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/db.sql +322 -0
- package/src/__tests__/fixtures/releases/0.10.0/snapshot/meta.json +11 -0
- package/src/__tests__/helpers/app.ts +6 -1
- package/src/__tests__/helpers/export-fixtures.ts +1 -0
- package/src/__tests__/import-refused-aliases.test.ts +98 -0
- package/src/__tests__/import-site-command.test.ts +73 -8
- package/src/__tests__/public-types.test.ts +64 -0
- package/src/__tests__/release-fixtures.test.ts +79 -24
- package/src/__tests__/release-version.test.ts +84 -0
- package/src/__tests__/site-pull-media.test.ts +48 -0
- package/src/__tests__/snapshot-tables.test.ts +37 -0
- package/src/__tests__/sql-export.test.ts +21 -1
- package/src/__tests__/stored-file-headers.test.ts +94 -0
- package/src/__tests__/template-deploy-workflow.test.ts +101 -0
- package/src/__tests__/theme-docs.test.ts +113 -24
- package/src/__tests__/toolchain-versions.test.ts +54 -0
- package/src/__tests__/trailing-slash-redirect.test.ts +61 -0
- package/src/__tests__/vite-config-graph.test.ts +98 -0
- package/src/app.tsx +89 -66
- package/src/client/__tests__/compose-bridge-image-upload.test.ts +1 -0
- package/src/client/__tests__/compose-bridge.test.ts +87 -0
- package/src/client/__tests__/compose-shortcuts.test.ts +4 -4
- package/src/client/__tests__/footnote-rail.test.ts +1 -1
- package/src/client/__tests__/lazy-entries.test.ts +1 -1
- package/src/client/__tests__/media-scroll-hint.test.ts +2 -2
- package/src/client/avatar-upload.ts +10 -10
- package/src/client/components/__tests__/jant-compose-dialog.test.ts +295 -4
- package/src/client/components/__tests__/jant-compose-editor.test.ts +34 -0
- package/src/client/components/__tests__/jant-settings-general.test.ts +0 -32
- package/src/client/components/compose-types.ts +14 -0
- package/src/client/components/jant-compose-dialog.ts +96 -41
- package/src/client/components/jant-compose-editor.ts +21 -4
- package/src/client/components/jant-config-editor.ts +4 -6
- package/src/client/components/jant-media-lightbox.ts +4 -4
- package/src/client/components/jant-settings-general.ts +0 -4
- package/src/client/components/nav-manager-types.ts +6 -5
- package/src/client/compose-bridge.ts +15 -4
- package/src/client/compose-launch.ts +4 -6
- package/src/client/compose-shortcuts.ts +1 -1
- package/src/client/footnote-rail.ts +1 -1
- package/src/client/lazy-entries.ts +1 -1
- package/src/client/media-scroll-hint.ts +2 -2
- package/src/client/tiptap/__tests__/markdown-clipboard.test.ts +55 -0
- package/src/client/tiptap/markdown-clipboard.ts +50 -2
- package/src/client/upload-session.ts +7 -6
- package/src/db/__tests__/backfill-external-redirects.test.ts +59 -0
- package/src/db/__tests__/backfill-featured-discover.test.ts +56 -0
- package/src/db/backfills/0007_restore_external_redirect_scheme.sql +20 -0
- package/src/db/backfills/0008_turn_off_featured_only_discover.sql +11 -0
- package/src/i18n/locales/public/en.po +46 -48
- package/src/i18n/locales/public/en.ts +1 -1
- package/src/i18n/locales/public/zh-Hans.po +45 -46
- package/src/i18n/locales/public/zh-Hans.ts +1 -1
- package/src/i18n/locales/public/zh-Hant.po +45 -46
- package/src/i18n/locales/public/zh-Hant.ts +1 -1
- package/src/i18n/locales/settings/en.po +15 -29
- package/src/i18n/locales/settings/en.ts +1 -1
- package/src/i18n/locales/settings/zh-Hans.po +15 -29
- package/src/i18n/locales/settings/zh-Hans.ts +1 -1
- package/src/i18n/locales/settings/zh-Hant.po +15 -29
- package/src/i18n/locales/settings/zh-Hant.ts +1 -1
- package/src/index.ts +43 -2
- package/src/lib/__tests__/api-settings.test.ts +3 -3
- package/src/lib/__tests__/constants.test.ts +10 -0
- package/src/lib/__tests__/discover.test.ts +8 -9
- package/src/lib/__tests__/env-values.test.ts +125 -0
- package/src/lib/__tests__/feed-path.test.ts +29 -0
- package/src/lib/__tests__/feed.test.ts +50 -22
- package/src/lib/__tests__/filter-dimensions.test.ts +22 -8
- package/src/lib/__tests__/post-list-cursor.test.ts +0 -10
- package/src/lib/__tests__/rate-limit.test.ts +22 -7
- package/src/lib/__tests__/resolve-config.test.ts +5 -3
- package/src/lib/__tests__/schemas.test.ts +72 -23
- package/src/lib/__tests__/slugify.test.ts +9 -0
- package/src/lib/__tests__/startup-config.test.ts +12 -0
- package/src/lib/__tests__/storage-s3.test.ts +214 -0
- package/src/lib/__tests__/theme.test.ts +20 -1
- package/src/lib/__tests__/time.test.ts +56 -0
- package/src/lib/__tests__/timeline.test.ts +46 -0
- package/src/lib/__tests__/url-fetch.test.ts +65 -1
- package/src/lib/__tests__/url.test.ts +60 -1
- package/src/lib/api-nav-items.ts +16 -20
- package/src/lib/api-post-input.ts +34 -1
- package/src/lib/api-posts.ts +125 -23
- package/src/lib/api-public-posts.ts +28 -37
- package/src/lib/api-search.ts +49 -2
- package/src/lib/api-settings.ts +159 -54
- package/src/lib/api-threads.ts +34 -11
- package/src/lib/constants.ts +6 -0
- package/src/lib/discover.ts +7 -23
- package/src/lib/env-values.ts +140 -0
- package/src/lib/env.ts +203 -12
- package/src/lib/feed-path.ts +8 -2
- package/src/lib/feed-policy.ts +110 -7
- package/src/lib/feed.ts +69 -25
- package/src/lib/filter-dimensions.ts +17 -10
- package/src/lib/github-sync-site-config.ts +1 -0
- package/src/lib/hugo-markdown.ts +5 -6
- package/src/lib/navigation.ts +4 -1
- package/src/lib/post-list-cursor.ts +33 -29
- package/src/lib/public-storage.ts +43 -0
- package/src/lib/rate-limit.ts +31 -16
- package/src/lib/render.tsx +5 -0
- package/src/lib/resolve-config.ts +16 -19
- package/src/lib/schemas.ts +248 -180
- package/src/lib/slugify.ts +6 -1
- package/src/lib/sse.ts +1 -1
- package/src/lib/startup-config.ts +20 -1
- package/src/lib/theme.ts +8 -5
- package/src/lib/thread-fold.ts +6 -0
- package/src/lib/thread-query.ts +19 -24
- package/src/lib/time.ts +137 -17
- package/src/lib/timeline.ts +56 -13
- package/src/lib/url-fetch.ts +141 -40
- package/src/lib/url.ts +86 -1
- package/src/middleware/__tests__/auth.test.ts +27 -0
- package/src/middleware/__tests__/cors.test.ts +54 -0
- package/src/middleware/__tests__/cross-origin.test.ts +149 -0
- package/src/middleware/__tests__/public-content-access.test.ts +2 -42
- package/src/middleware/auth.ts +34 -3
- package/src/middleware/cors.ts +4 -4
- package/src/middleware/cross-origin.ts +124 -0
- package/src/middleware/error-handler.ts +7 -0
- package/src/middleware/public-content-access.ts +3 -26
- package/src/middleware/secure-headers.ts +8 -2
- package/src/node/__tests__/cli-migrate.test.ts +2 -2
- package/src/node/__tests__/cli-runtime-target.test.ts +13 -2
- package/src/node/__tests__/cli-site-snapshot.test.ts +57 -0
- package/src/node/__tests__/cli-snapshot-meta.test.ts +11 -1
- package/src/node/__tests__/cli-sql-export.test.ts +25 -1
- package/src/node/__tests__/cli-start.test.ts +66 -0
- package/src/node/__tests__/request-handler.test.ts +37 -0
- package/src/node/__tests__/runtime.test.ts +56 -1
- package/src/node/request-handler.ts +58 -5
- package/src/node/runtime.ts +37 -11
- package/src/preset.css +3 -3
- package/src/routes/__tests__/compose.test.ts +84 -0
- package/src/routes/api/__tests__/collections.test.ts +68 -0
- package/src/routes/api/__tests__/mcp.test.ts +164 -9
- package/src/routes/api/__tests__/media.test.ts +9 -1
- package/src/routes/api/__tests__/nav-items.test.ts +27 -1
- package/src/routes/api/__tests__/posts.test.ts +269 -78
- package/src/routes/api/__tests__/search.test.ts +17 -4
- package/src/routes/api/__tests__/settings.test.ts +119 -85
- package/src/routes/api/__tests__/telegram.test.ts +11 -6
- package/src/routes/api/__tests__/threads.test.ts +11 -0
- package/src/routes/api/__tests__/upload-response.test.ts +48 -0
- package/src/routes/api/__tests__/uploads.test.ts +35 -2
- package/src/routes/api/collections.ts +3 -3
- package/src/routes/api/custom-urls.ts +2 -1
- package/src/routes/api/export.ts +1 -0
- package/src/routes/api/internal/__tests__/post-body-html.test.ts +19 -0
- package/src/routes/api/internal/__tests__/uploads.test.ts +2 -0
- package/src/routes/api/internal/sites.ts +16 -4
- package/src/routes/api/mcp.ts +1 -0
- package/src/routes/api/media.ts +7 -8
- package/src/routes/api/nav-items.ts +2 -1
- package/src/routes/api/posts.ts +18 -24
- package/src/routes/api/public/__tests__/posts.test.ts +15 -0
- package/src/routes/api/public/__tests__/threads-collections.test.ts +12 -45
- package/src/routes/api/public/__tests__/threads.test.ts +41 -9
- package/src/routes/api/public/posts.ts +2 -2
- package/src/routes/api/public/threads.ts +16 -26
- package/src/routes/api/search.ts +7 -41
- package/src/routes/api/settings.ts +32 -28
- package/src/routes/api/smart-collections.ts +6 -1
- package/src/routes/api/threads.ts +25 -26
- package/src/routes/api/upload.ts +6 -21
- package/src/routes/api/uploads.ts +14 -20
- package/src/routes/auth/__tests__/dev.test.ts +16 -13
- package/src/routes/auth/__tests__/hosted-sso.test.ts +51 -0
- package/src/routes/auth/__tests__/setup-auth.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-discover.test.ts +2 -0
- package/src/routes/auth/__tests__/setup-flow.test.ts +32 -0
- package/src/routes/auth/__tests__/setup-rate-limit.test.ts +72 -0
- package/src/routes/auth/__tests__/setup-steps.test.ts +2 -0
- package/src/routes/auth/__tests__/signin.test.ts +167 -2
- package/src/routes/auth/dev.ts +4 -6
- package/src/routes/auth/hosted-sso.ts +9 -6
- package/src/routes/auth/setup.tsx +35 -5
- package/src/routes/auth/signin.tsx +96 -1
- package/src/routes/compose.tsx +47 -47
- package/src/routes/dash/__tests__/settings-avatar.test.ts +59 -4
- package/src/routes/dash/__tests__/settings-demo-locks.test.ts +147 -0
- package/src/routes/dash/custom-urls.tsx +2 -0
- package/src/routes/dash/settings.tsx +79 -32
- package/src/routes/feed/__tests__/feed.test.ts +93 -3
- package/src/routes/feed/__tests__/sitemap.test.ts +42 -0
- package/src/routes/feed/feed.ts +128 -175
- package/src/routes/feed/sitemap.ts +9 -7
- package/src/routes/pages/__tests__/archive-years.test.ts +45 -0
- package/src/routes/pages/__tests__/collection-routing.test.ts +40 -0
- package/src/routes/pages/__tests__/collections.test.ts +3 -0
- package/src/routes/pages/__tests__/language-routing.test.ts +31 -0
- package/src/routes/pages/__tests__/post-page-round-trips.test.ts +34 -2
- package/src/routes/pages/__tests__/search.test.ts +5 -2
- package/src/routes/pages/__tests__/thread-gap.test.ts +207 -0
- package/src/routes/pages/archive.tsx +33 -94
- package/src/routes/pages/brand.tsx +1 -0
- package/src/routes/pages/collection.tsx +13 -84
- package/src/routes/pages/collections.tsx +2 -0
- package/src/routes/pages/featured.tsx +7 -2
- package/src/routes/pages/home.tsx +1 -0
- package/src/routes/pages/latest.tsx +6 -2
- package/src/routes/pages/new.tsx +1 -0
- package/src/routes/pages/page.tsx +73 -47
- package/src/routes/pages/search.tsx +5 -3
- package/src/routes/pages/smart-collection.tsx +11 -70
- package/src/routes/pages/subscribe.tsx +1 -0
- package/src/routes/pages/theme-sample.tsx +1 -0
- package/src/runtime/__tests__/readiness.test.ts +16 -0
- package/src/runtime/cloudflare.ts +2 -3
- package/src/runtime/index.ts +3 -1
- package/src/runtime/node.ts +3 -5
- package/src/runtime/readiness.ts +5 -0
- package/src/services/__tests__/auth.test.ts +115 -0
- package/src/services/__tests__/collection.test.ts +9 -0
- package/src/services/__tests__/github-sync-webhook.test.ts +78 -0
- package/src/services/__tests__/hosted-handoff.test.ts +208 -1
- package/src/services/__tests__/media.test.ts +47 -27
- package/src/services/__tests__/navigation.test.ts +67 -15
- package/src/services/__tests__/post.test.ts +103 -56
- package/src/services/__tests__/search.test.ts +38 -0
- package/src/services/__tests__/settings.test.ts +2 -14
- package/src/services/__tests__/smart-collection.test.ts +2 -2
- package/src/services/__tests__/telegram-ingest.test.ts +113 -0
- package/src/services/__tests__/thread.test.ts +26 -11
- package/src/services/auth.ts +36 -4
- package/src/services/collection.ts +46 -5
- package/src/services/custom-url.ts +11 -4
- package/src/services/export-theme/assets/client-site.css +1 -1
- package/src/services/export-theme/assets/client-site.js +2 -2
- package/src/services/export-theme/layouts/_default/baseof.html +1 -1
- package/src/services/export-theme/layouts/collection/single.html +1 -1
- package/src/services/export-theme/layouts/partials/featured-thread.html +8 -1
- package/src/services/export-theme/layouts/partials/head.html +1 -1
- package/src/services/export-theme/layouts/partials/media-gallery.html +6 -3
- package/src/services/export-theme/layouts/smart_collection/list.html +1 -1
- package/src/services/export-theme/styles/main.css +3 -3
- package/src/services/export.ts +68 -19
- package/src/services/github-sync.ts +10 -10
- package/src/services/hosted-handoff.ts +106 -6
- package/src/services/index.ts +3 -1
- package/src/services/language.ts +33 -0
- package/src/services/mcp.ts +176 -438
- package/src/services/media.ts +69 -21
- package/src/services/navigation.ts +19 -4
- package/src/services/path.ts +45 -3
- package/src/services/post.ts +329 -214
- package/src/services/search.ts +22 -3
- package/src/services/settings.ts +36 -3
- package/src/services/site-admin.ts +1 -0
- package/src/services/smart-collection.ts +10 -3
- package/src/services/telegram.ts +23 -6
- package/src/services/thread.ts +11 -3
- package/src/services/upload-session.ts +14 -15
- package/src/styles/components.css +2 -2
- package/src/styles/site-media.css +2 -2
- package/src/styles/tokens.css +19 -22
- package/src/styles/ui-author.css +73 -94
- package/src/styles/ui.css +62 -62
- package/src/types/app-context.ts +5 -1
- package/src/types/bindings.ts +11 -0
- package/src/types/config.ts +4 -4
- package/src/types/constants.ts +20 -0
- package/src/types/props.ts +34 -8
- package/src/types/views.ts +28 -13
- package/src/ui/color-themes.ts +6 -5
- package/src/ui/dash/settings/GeneralContent.tsx +0 -22
- package/src/ui/dash/settings/__tests__/GeneralContent.test.tsx +0 -21
- package/src/ui/feed/CuratedThreadPreview.tsx +7 -2
- package/src/ui/feed/LinkCard.tsx +1 -2
- package/src/ui/feed/NoteCard.tsx +1 -2
- package/src/ui/feed/QuoteCard.tsx +2 -2
- package/src/ui/feed/ThreadPreview.tsx +6 -6
- package/src/ui/feed/TimelineFeed.tsx +1 -7
- package/src/ui/feed/__tests__/thread-preview.test.ts +123 -10
- package/src/ui/feed/__tests__/timeline-cards.test.ts +18 -1
- package/src/ui/layouts/BaseLayout.tsx +5 -0
- package/src/ui/pages/ArchivePage.tsx +1 -1
- package/src/ui/pages/BrandPage.tsx +1 -1
- package/src/ui/pages/CollectionPage.tsx +0 -1
- package/src/ui/pages/CollectionsPage.tsx +2 -2
- package/src/ui/pages/ComposePage.tsx +1 -1
- package/src/ui/pages/FeaturedPage.tsx +1 -1
- package/src/ui/pages/HomePage.tsx +1 -1
- package/src/ui/pages/PostPage.tsx +1 -1
- package/src/ui/pages/SearchPage.tsx +1 -1
- package/src/ui/pages/SmartCollectionPage.tsx +2 -3
- package/src/ui/pages/SubscribePage.tsx +1 -1
- package/src/ui/pages/ThemeSamplePage.tsx +1 -1
- package/src/ui/shared/MediaGallery.tsx +1 -1
- package/src/vendor/datastar.js +9 -1956
- package/src/vendor/datastar.js.map +4 -4
- package/dist/client/_assets/chunks/sortable-list-BJyd-LXE.js +0 -2
- package/dist/client/_assets/chunks/unsafe-svg-DU_DNMy5.js +0 -2
- package/dist/client/_assets/client-D4AT9Iqr.js +0 -295
- package/dist/client/_assets/client-DRuw7XCt.css +0 -2
- package/dist/client/_assets/client-author-DQ8R-8KR.css +0 -2
package/src/services/search.ts
CHANGED
|
@@ -167,11 +167,30 @@ function buildSqliteFtsQuery(query: string): string | null {
|
|
|
167
167
|
return terms.map((term) => `"${term.replace(/"/g, '""')}"*`).join(" ");
|
|
168
168
|
}
|
|
169
169
|
|
|
170
|
+
/**
|
|
171
|
+
* Postgres prefix query for the words in `query`, or null when it has none.
|
|
172
|
+
*
|
|
173
|
+
* `extractSearchTerms` falls back to the whole query when it holds no letter or
|
|
174
|
+
* digit, which suits SQLite's trigram index: it matches punctuation literally.
|
|
175
|
+
* Here the term is written into tsquery syntax, where `'`, `&`, `|`, `!`, `(`
|
|
176
|
+
* and `:` are operators, so a query such as `'''` failed to parse and the
|
|
177
|
+
* search answered 500. The `simple` configuration never indexes punctuation
|
|
178
|
+
* either, so such a query has nothing to match in `search_document`; returning
|
|
179
|
+
* null hands it to the LIKE search, which does.
|
|
180
|
+
*
|
|
181
|
+
* @param query - The reader's search text
|
|
182
|
+
* @returns A `to_tsquery` input, or null to skip full-text search
|
|
183
|
+
* @example
|
|
184
|
+
* buildPgPrefixTsQuery("coffee beans"); // "coffee:* & beans:*"
|
|
185
|
+
* buildPgPrefixTsQuery("'''"); // null
|
|
186
|
+
*/
|
|
170
187
|
function buildPgPrefixTsQuery(query: string): string | null {
|
|
171
|
-
const
|
|
172
|
-
|
|
188
|
+
const words = extractSearchTerms(query).filter((term) =>
|
|
189
|
+
/^[\p{L}\p{N}]+$/u.test(term),
|
|
190
|
+
);
|
|
191
|
+
if (words.length === 0) return null;
|
|
173
192
|
|
|
174
|
-
return
|
|
193
|
+
return words.map((term) => `${term}:*`).join(" & ");
|
|
175
194
|
}
|
|
176
195
|
|
|
177
196
|
/**
|
package/src/services/settings.ts
CHANGED
|
@@ -29,9 +29,13 @@ import type { StorageDriver } from "../lib/storage.js";
|
|
|
29
29
|
import type { MediaService } from "./media.js";
|
|
30
30
|
import {
|
|
31
31
|
validateUploadFile,
|
|
32
|
+
validateStoredUploadSignature,
|
|
32
33
|
generateSiteAssetStorageKey,
|
|
33
34
|
getSiteStorageKey,
|
|
34
35
|
} from "../lib/upload.js";
|
|
36
|
+
|
|
37
|
+
/** Avatar formats kept: the browser turns every upload into one of these. */
|
|
38
|
+
const AVATAR_MIME_TYPES = new Set(["image/png", "image/jpeg", "image/webp"]);
|
|
35
39
|
import { arrayBufferToBase64 } from "../lib/favicon.js";
|
|
36
40
|
import { ValidationError } from "../lib/errors.js";
|
|
37
41
|
import { normalizeEditableSettingValue } from "../lib/schemas.js";
|
|
@@ -126,7 +130,13 @@ export interface GeneralSettingsResult {
|
|
|
126
130
|
}
|
|
127
131
|
|
|
128
132
|
export interface AvatarUploadData {
|
|
129
|
-
file: {
|
|
133
|
+
file: {
|
|
134
|
+
stream(): ReadableStream;
|
|
135
|
+
slice(start?: number, end?: number): Blob;
|
|
136
|
+
name: string;
|
|
137
|
+
type: string;
|
|
138
|
+
size: number;
|
|
139
|
+
};
|
|
130
140
|
faviconIco?: ArrayBuffer;
|
|
131
141
|
appleTouchIcon?: ArrayBuffer;
|
|
132
142
|
}
|
|
@@ -523,8 +533,7 @@ export function createSettingsService(
|
|
|
523
533
|
// told anyone it exists. Opting out is the half that used to be missed:
|
|
524
534
|
// a directory that is not told keeps the blog until its next scheduled
|
|
525
535
|
// read, and the owner watches a blog they just removed sit there for
|
|
526
|
-
// another hour.
|
|
527
|
-
// listed changes nothing a directory needs to be told twice.
|
|
536
|
+
// another hour.
|
|
528
537
|
const wasListed = previous !== null && previous !== "off";
|
|
529
538
|
const isListed = mode !== "off";
|
|
530
539
|
const changed = wasListed !== isListed;
|
|
@@ -607,6 +616,30 @@ export function createSettingsService(
|
|
|
607
616
|
throw new ValidationError(uploadError);
|
|
608
617
|
}
|
|
609
618
|
|
|
619
|
+
// The browser resizes every avatar to a PNG before upload, so only the
|
|
620
|
+
// raster formats the upload path serves inline are accepted, and the
|
|
621
|
+
// bytes must be what the type says. An SVG is a document that can run
|
|
622
|
+
// script when opened from the site's origin.
|
|
623
|
+
if (!AVATAR_MIME_TYPES.has(data.file.type)) {
|
|
624
|
+
throw new ValidationError("Upload a PNG, JPEG, or WebP image.");
|
|
625
|
+
}
|
|
626
|
+
const signatureError = validateStoredUploadSignature(
|
|
627
|
+
data.file.type,
|
|
628
|
+
new Uint8Array(await data.file.slice(0, 64).arrayBuffer()),
|
|
629
|
+
);
|
|
630
|
+
if (signatureError) {
|
|
631
|
+
throw new ValidationError(signatureError);
|
|
632
|
+
}
|
|
633
|
+
if (data.appleTouchIcon) {
|
|
634
|
+
const appleTouchError = validateStoredUploadSignature(
|
|
635
|
+
"image/png",
|
|
636
|
+
new Uint8Array(data.appleTouchIcon.slice(0, 64)),
|
|
637
|
+
);
|
|
638
|
+
if (appleTouchError) {
|
|
639
|
+
throw new ValidationError(appleTouchError);
|
|
640
|
+
}
|
|
641
|
+
}
|
|
642
|
+
|
|
610
643
|
const { id, filename, storageKey } = generateSiteAssetStorageKey(
|
|
611
644
|
siteId,
|
|
612
645
|
"avatar",
|
|
@@ -822,6 +822,7 @@ export function createSiteAdminService(
|
|
|
822
822
|
rssFeedsEnabled: appConfig.rssFeedsEnabled,
|
|
823
823
|
mainRssFeed: appConfig.mainRssFeed,
|
|
824
824
|
archiveDefaultLayout: appConfig.archiveDefaultLayout,
|
|
825
|
+
timeZone: appConfig.timeZone,
|
|
825
826
|
siteFooter: appConfig.siteFooter,
|
|
826
827
|
showHeaderAvatar: appConfig.showHeaderAvatar,
|
|
827
828
|
siteAvatarUrl: appConfig.siteAvatarUrl,
|
|
@@ -70,6 +70,8 @@ export interface SmartCollectionViewer {
|
|
|
70
70
|
isAuthenticated: boolean;
|
|
71
71
|
/** Content language of the current view, when the site has more than one. */
|
|
72
72
|
lang?: string;
|
|
73
|
+
/** The site's time zone, whose calendar a year condition reads. */
|
|
74
|
+
timeZone: string;
|
|
73
75
|
}
|
|
74
76
|
|
|
75
77
|
export interface SmartCollectionService {
|
|
@@ -344,7 +346,10 @@ export function createSmartCollectionService(
|
|
|
344
346
|
excludeLatestHidden: false,
|
|
345
347
|
// Membership never depends on presentation, so the year condition is
|
|
346
348
|
// pinned to the publication axis whatever the chosen order is.
|
|
347
|
-
...toPostFilters(smartCollection.selection, {
|
|
349
|
+
...toPostFilters(smartCollection.selection, {
|
|
350
|
+
yearAxis: "published",
|
|
351
|
+
timeZone: viewer.timeZone,
|
|
352
|
+
}),
|
|
348
353
|
sortBy: axis,
|
|
349
354
|
sortOrder: smartCollection.sort,
|
|
350
355
|
ignorePinnedSort: true,
|
|
@@ -392,7 +397,9 @@ export function createSmartCollectionService(
|
|
|
392
397
|
// Same predicate builder the pages use, so the number in the directory
|
|
393
398
|
// and the number on the page it links to agree.
|
|
394
399
|
const measured = await posts.aggregateMany(
|
|
395
|
-
entries.map((entry) =>
|
|
400
|
+
entries.map((entry) =>
|
|
401
|
+
toPostFilters(entry.selection, { timeZone: viewer.timeZone }),
|
|
402
|
+
),
|
|
396
403
|
{
|
|
397
404
|
status: "published",
|
|
398
405
|
excludeReplies: true,
|
|
@@ -599,7 +606,7 @@ export function createSmartCollectionService(
|
|
|
599
606
|
// builder the saved page will use — a preview that counted differently
|
|
600
607
|
// than the page would be worse than no preview.
|
|
601
608
|
const [matched, all] = await posts.aggregateMany(
|
|
602
|
-
[toPostFilters(parsed, {}), {}],
|
|
609
|
+
[toPostFilters(parsed, { timeZone: viewer.timeZone }), {}],
|
|
603
610
|
base,
|
|
604
611
|
);
|
|
605
612
|
return { count: matched?.count ?? 0, baseline: all?.count ?? 0 };
|
package/src/services/telegram.ts
CHANGED
|
@@ -35,7 +35,12 @@ import {
|
|
|
35
35
|
setMyCommands,
|
|
36
36
|
setWebhook,
|
|
37
37
|
} from "../lib/telegram.js";
|
|
38
|
-
import {
|
|
38
|
+
import {
|
|
39
|
+
generateStorageKey,
|
|
40
|
+
getPosterStorageKey,
|
|
41
|
+
getStoredUploadPolicy,
|
|
42
|
+
validateStoredUploadSignature,
|
|
43
|
+
} from "../lib/upload.js";
|
|
39
44
|
import type { StorageDriver } from "../lib/storage.js";
|
|
40
45
|
import type { Media, MediaKind } from "../types.js";
|
|
41
46
|
import { ValidationError } from "../lib/errors.js";
|
|
@@ -535,13 +540,25 @@ export function createTelegramService(
|
|
|
535
540
|
input.originalName,
|
|
536
541
|
);
|
|
537
542
|
|
|
538
|
-
//
|
|
539
|
-
//
|
|
540
|
-
//
|
|
543
|
+
// The MIME type is whatever the sender's client claimed, so a file that
|
|
544
|
+
// arrives through Telegram follows the browser upload rules: a format
|
|
545
|
+
// Jant shows inline must really be that format, and anything else is
|
|
546
|
+
// stored as a download. Posts still play and show it; only opening the
|
|
547
|
+
// file directly is affected.
|
|
548
|
+
const policy = getStoredUploadPolicy(input.mimeType);
|
|
549
|
+
if (policy?.requiresSignatureCheck) {
|
|
550
|
+
const signatureError = validateStoredUploadSignature(
|
|
551
|
+
input.mimeType,
|
|
552
|
+
bytes,
|
|
553
|
+
);
|
|
554
|
+
if (signatureError) {
|
|
555
|
+
throw new ValidationError(signatureError);
|
|
556
|
+
}
|
|
557
|
+
}
|
|
558
|
+
|
|
541
559
|
await deps.storage.put(storageKey, bytes, {
|
|
542
560
|
contentType: input.mimeType,
|
|
543
|
-
contentDisposition:
|
|
544
|
-
input.mediaKind === "document" ? "attachment" : "inline",
|
|
561
|
+
contentDisposition: policy?.contentDisposition ?? "attachment",
|
|
545
562
|
cacheControl: "public, max-age=31536000, immutable",
|
|
546
563
|
});
|
|
547
564
|
|
package/src/services/thread.ts
CHANGED
|
@@ -61,6 +61,8 @@ export interface ThreadListQuery {
|
|
|
61
61
|
sort?: ThreadSort;
|
|
62
62
|
/** Attach the homepage fold to each Thread. */
|
|
63
63
|
fold?: boolean;
|
|
64
|
+
/** The site's time zone, whose calendar a `year` in `selection` reads. */
|
|
65
|
+
timeZone: string;
|
|
64
66
|
}
|
|
65
67
|
|
|
66
68
|
/** One Thread, as a list or a lookup returns it. */
|
|
@@ -140,7 +142,7 @@ export interface ThreadService {
|
|
|
140
142
|
*
|
|
141
143
|
* @param rootId - The Thread root's ID, as {@link findRoot} returned it
|
|
142
144
|
* @param query - Who is asking, and the author's status filter
|
|
143
|
-
* @param page - The previous page's `nextCursor
|
|
145
|
+
* @param page - The previous page's `nextCursor`, and the page size
|
|
144
146
|
* @returns The page's Posts and the cursor after them
|
|
145
147
|
* @example
|
|
146
148
|
* await threads.listPosts(root.id, { audience: "reader" }, { limit: 100 });
|
|
@@ -284,7 +286,10 @@ export function createThreadService(deps: {
|
|
|
284
286
|
const { collection: _named, ...rootSelection } = selection;
|
|
285
287
|
const options: ThreadRootPageOptions = {
|
|
286
288
|
...base,
|
|
287
|
-
rootFilters: toPostFilters(rootSelection, {
|
|
289
|
+
rootFilters: toPostFilters(rootSelection, {
|
|
290
|
+
yearAxis: "published",
|
|
291
|
+
timeZone: query.timeZone,
|
|
292
|
+
}),
|
|
288
293
|
};
|
|
289
294
|
const collectionOrder =
|
|
290
295
|
query.sort === undefined
|
|
@@ -310,7 +315,10 @@ export function createThreadService(deps: {
|
|
|
310
315
|
excludeReplies: true,
|
|
311
316
|
// Membership never depends on presentation: the year reads the
|
|
312
317
|
// publication date whatever the order.
|
|
313
|
-
...toPostFilters(selection, {
|
|
318
|
+
...toPostFilters(selection, {
|
|
319
|
+
yearAxis: "published",
|
|
320
|
+
timeZone: query.timeZone,
|
|
321
|
+
}),
|
|
314
322
|
...(visibility === "featured"
|
|
315
323
|
? toListOrder("published")
|
|
316
324
|
: toListOrder(query.sort ?? "activity")),
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
|
|
9
9
|
import { and, asc, eq, inArray, lt } from "drizzle-orm";
|
|
10
10
|
import type { Database } from "../db/index.js";
|
|
11
|
+
import type { Media } from "../types.js";
|
|
11
12
|
import {
|
|
12
13
|
sqliteSchemaBundle,
|
|
13
14
|
type DatabaseSchema,
|
|
@@ -127,13 +128,14 @@ export interface UploadSessionService {
|
|
|
127
128
|
id: string,
|
|
128
129
|
data: CompleteUploadData,
|
|
129
130
|
deps: { storage: StorageDriver; storageDriver: string },
|
|
130
|
-
): Promise<
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
131
|
+
): Promise<Media>;
|
|
132
|
+
/**
|
|
133
|
+
* One batch of upload cleanup: expired sessions and their temporary files,
|
|
134
|
+
* then deleted media past the recycle window.
|
|
135
|
+
*
|
|
136
|
+
* @returns What the batch removed, and `done` when neither list had a full
|
|
137
|
+
* batch left, so a caller walking to the end can stop
|
|
138
|
+
*/
|
|
137
139
|
cleanupExpired(deps: {
|
|
138
140
|
storage: StorageDriver;
|
|
139
141
|
storageDriver: string;
|
|
@@ -143,6 +145,7 @@ export interface UploadSessionService {
|
|
|
143
145
|
deletedSessions: number;
|
|
144
146
|
deletedOrphanMedia: number;
|
|
145
147
|
purgedStorageObjects: number;
|
|
148
|
+
done: boolean;
|
|
146
149
|
}>;
|
|
147
150
|
abort(id: string, deps: { storage: StorageDriver }): Promise<void>;
|
|
148
151
|
}
|
|
@@ -641,7 +644,7 @@ export function createUploadSessionService(
|
|
|
641
644
|
);
|
|
642
645
|
}
|
|
643
646
|
|
|
644
|
-
await media.create({
|
|
647
|
+
const created = await media.create({
|
|
645
648
|
id: session.mediaId,
|
|
646
649
|
filename: session.filename,
|
|
647
650
|
originalName: session.originalName,
|
|
@@ -672,13 +675,7 @@ export function createUploadSessionService(
|
|
|
672
675
|
);
|
|
673
676
|
await updateSession(id, { state: "completed" });
|
|
674
677
|
|
|
675
|
-
return
|
|
676
|
-
id: session.mediaId,
|
|
677
|
-
filename: session.filename,
|
|
678
|
-
storageKey: session.finalStorageKey,
|
|
679
|
-
mimeType: session.expectedContentType,
|
|
680
|
-
size: session.expectedSize,
|
|
681
|
-
};
|
|
678
|
+
return created;
|
|
682
679
|
} catch (error) {
|
|
683
680
|
await updateSession(id, { state: "failed" });
|
|
684
681
|
throw error;
|
|
@@ -775,6 +772,8 @@ export function createUploadSessionService(
|
|
|
775
772
|
// infer liveness from attachment state.
|
|
776
773
|
deletedOrphanMedia: 0,
|
|
777
774
|
purgedStorageObjects,
|
|
775
|
+
// A short read on both lists means nothing was left behind this batch.
|
|
776
|
+
done: expiredSessions.length < limit && purgedStorageObjects < limit,
|
|
778
777
|
};
|
|
779
778
|
},
|
|
780
779
|
};
|
|
@@ -12,8 +12,8 @@
|
|
|
12
12
|
|
|
13
13
|
/* Search result highlight */
|
|
14
14
|
mark {
|
|
15
|
-
background-color: var(--search-mark-bg);
|
|
16
|
-
color: var(--search-mark-color);
|
|
15
|
+
background-color: var(--site-search-mark-bg);
|
|
16
|
+
color: var(--site-search-mark-color);
|
|
17
17
|
border-radius: 2px;
|
|
18
18
|
padding: 0 2px;
|
|
19
19
|
}
|
|
@@ -822,7 +822,7 @@
|
|
|
822
822
|
color: var(--site-text-primary);
|
|
823
823
|
border-radius: var(--media-radius, 0.5rem);
|
|
824
824
|
overflow: hidden;
|
|
825
|
-
background-color: var(--site-
|
|
825
|
+
background-color: var(--site-subtle-bg);
|
|
826
826
|
border: 1px solid var(--site-divider);
|
|
827
827
|
transition: background-color 0.15s;
|
|
828
828
|
}
|
|
@@ -974,7 +974,7 @@ button.media-gallery-card {
|
|
|
974
974
|
}
|
|
975
975
|
|
|
976
976
|
/* Visible focus ring when a keyboard user tabs onto the scrollable strip. */
|
|
977
|
-
.media-gallery-scroll-wrap > [data-
|
|
977
|
+
.media-gallery-scroll-wrap > [data-media-gallery]:focus-visible {
|
|
978
978
|
outline: 2px solid var(--site-text-primary);
|
|
979
979
|
outline-offset: 2px;
|
|
980
980
|
border-radius: 4px;
|
package/src/styles/tokens.css
CHANGED
|
@@ -234,12 +234,6 @@
|
|
|
234
234
|
);
|
|
235
235
|
--site-threadline: var(--border);
|
|
236
236
|
--site-page-bg: var(--background);
|
|
237
|
-
/* Despite the name, this is the page colour and ~60 rules use it that way —
|
|
238
|
-
including three that use it as *text* on a dark button. It cannot be
|
|
239
|
-
lifted without repainting the whole site; `--site-raised-bg` below is the
|
|
240
|
-
one that actually means "above the page". Read this as
|
|
241
|
-
"--site-default-surface" until the call sites are triaged. */
|
|
242
|
-
--site-elevated-bg: var(--background);
|
|
243
237
|
/* What sits *above* the page: dialogs, popovers, menus, sheets. On a light
|
|
244
238
|
page this is the page colour, because the separating is done by the
|
|
245
239
|
backdrop dim and the drop shadows — both black over white. Neither works
|
|
@@ -258,7 +252,10 @@
|
|
|
258
252
|
var(--site-column-outline) 68%,
|
|
259
253
|
transparent
|
|
260
254
|
);
|
|
261
|
-
|
|
255
|
+
/* A soft fill for what sits a step off the page without floating above
|
|
256
|
+
it: hover states in navigation and menus, cards in the feed, code
|
|
257
|
+
blocks. */
|
|
258
|
+
--site-subtle-bg: var(--accent);
|
|
262
259
|
--site-text-primary: var(--foreground);
|
|
263
260
|
--site-text-secondary: var(--muted-foreground);
|
|
264
261
|
--site-reading-title: color-mix(
|
|
@@ -313,8 +310,8 @@
|
|
|
313
310
|
--site-divider: var(--border);
|
|
314
311
|
--site-feed-card-bg: color-mix(
|
|
315
312
|
in srgb,
|
|
316
|
-
var(--site-
|
|
317
|
-
var(--site-
|
|
313
|
+
var(--site-page-bg) 88%,
|
|
314
|
+
var(--site-subtle-bg)
|
|
318
315
|
);
|
|
319
316
|
--site-feed-card-border: color-mix(
|
|
320
317
|
in srgb,
|
|
@@ -334,8 +331,8 @@
|
|
|
334
331
|
--site-code-bg: color-mix(in srgb, var(--site-reading-meta) 12%, transparent);
|
|
335
332
|
--site-code-block-bg: color-mix(
|
|
336
333
|
in srgb,
|
|
337
|
-
var(--site-
|
|
338
|
-
var(--site-
|
|
334
|
+
var(--site-page-bg) 94%,
|
|
335
|
+
var(--site-subtle-bg)
|
|
339
336
|
);
|
|
340
337
|
--site-code-block-border: color-mix(
|
|
341
338
|
in srgb,
|
|
@@ -385,7 +382,7 @@
|
|
|
385
382
|
);
|
|
386
383
|
--site-thread-context-bg: color-mix(
|
|
387
384
|
in srgb,
|
|
388
|
-
var(--site-
|
|
385
|
+
var(--site-subtle-bg) 58%,
|
|
389
386
|
transparent
|
|
390
387
|
);
|
|
391
388
|
--site-thread-context-border: color-mix(
|
|
@@ -395,7 +392,7 @@
|
|
|
395
392
|
);
|
|
396
393
|
--site-thread-gap-bg: color-mix(
|
|
397
394
|
in srgb,
|
|
398
|
-
var(--site-
|
|
395
|
+
var(--site-subtle-bg) 42%,
|
|
399
396
|
transparent
|
|
400
397
|
);
|
|
401
398
|
--site-thread-item-spacing: 32px;
|
|
@@ -411,12 +408,12 @@
|
|
|
411
408
|
--compose-paper-bg: var(--site-raised-bg);
|
|
412
409
|
--compose-control-bg: color-mix(
|
|
413
410
|
in srgb,
|
|
414
|
-
var(--site-
|
|
411
|
+
var(--site-subtle-bg) 72%,
|
|
415
412
|
var(--compose-paper-bg)
|
|
416
413
|
);
|
|
417
414
|
--compose-control-bg-strong: color-mix(
|
|
418
415
|
in srgb,
|
|
419
|
-
var(--site-
|
|
416
|
+
var(--site-subtle-bg) 88%,
|
|
420
417
|
var(--compose-paper-bg)
|
|
421
418
|
);
|
|
422
419
|
--compose-control-border: color-mix(
|
|
@@ -456,12 +453,12 @@
|
|
|
456
453
|
--compose-floating-bg: color-mix(
|
|
457
454
|
in srgb,
|
|
458
455
|
var(--compose-paper-bg) 94%,
|
|
459
|
-
var(--site-
|
|
456
|
+
var(--site-subtle-bg) 6%
|
|
460
457
|
);
|
|
461
458
|
|
|
462
459
|
/* Search highlight */
|
|
463
|
-
--search-mark-bg: oklch(0.92 0.14 90 / 0.55);
|
|
464
|
-
--search-mark-color: oklch(0.35 0.09 70);
|
|
460
|
+
--site-search-mark-bg: oklch(0.92 0.14 90 / 0.55);
|
|
461
|
+
--site-search-mark-color: oklch(0.35 0.09 70);
|
|
465
462
|
|
|
466
463
|
/* Admin */
|
|
467
464
|
--dash-bg: oklch(0.97 0.005 80);
|
|
@@ -567,8 +564,8 @@
|
|
|
567
564
|
var(--site-text-primary)
|
|
568
565
|
);
|
|
569
566
|
--site-reading-link: var(--site-reading-body);
|
|
570
|
-
--search-mark-bg: oklch(0.45 0.1 85 / 0.5);
|
|
571
|
-
--search-mark-color: oklch(0.92 0.08 90);
|
|
567
|
+
--site-search-mark-bg: oklch(0.45 0.1 85 / 0.5);
|
|
568
|
+
--site-search-mark-color: oklch(0.92 0.08 90);
|
|
572
569
|
--dash-bg: oklch(0.2 0.005 80);
|
|
573
570
|
--site-raised-bg: color-mix(
|
|
574
571
|
in oklab,
|
|
@@ -607,8 +604,8 @@
|
|
|
607
604
|
var(--site-text-primary)
|
|
608
605
|
);
|
|
609
606
|
--site-reading-link: var(--site-reading-body);
|
|
610
|
-
--search-mark-bg: oklch(0.45 0.1 85 / 0.5);
|
|
611
|
-
--search-mark-color: oklch(0.92 0.08 90);
|
|
607
|
+
--site-search-mark-bg: oklch(0.45 0.1 85 / 0.5);
|
|
608
|
+
--site-search-mark-color: oklch(0.92 0.08 90);
|
|
612
609
|
--dash-bg: oklch(0.2 0.005 80);
|
|
613
610
|
/* 12% of the foreground mixed into the page. The headroom here is small and
|
|
614
611
|
bounded: `--site-divider` sits 1.36:1 above the page, and a surface lifted
|