@geekity/cms 0.42.1 → 0.43.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/admin/pages/federation/followers.njk +1 -1
- package/admin/static/editor.js +22 -21
- package/dist/admin/admin-bar.d.ts +2 -3
- package/dist/admin/admin-bar.d.ts.map +1 -1
- package/dist/admin/admin-bar.js +4 -5
- package/dist/admin/admin-bar.js.map +1 -1
- package/dist/admin/app-activity.d.ts +1 -1
- package/dist/admin/appearance.d.ts +5 -5
- package/dist/admin/appearance.js +5 -5
- package/dist/admin/comments.d.ts +3 -3
- package/dist/admin/comments.js +2 -2
- package/dist/admin/comments.js.map +1 -1
- package/dist/admin/connected-apps.d.ts +1 -1
- package/dist/admin/connected-apps.js +1 -1
- package/dist/admin/credentials.d.ts +3 -3
- package/dist/admin/credentials.js +3 -3
- package/dist/admin/dashboard.js +2 -2
- package/dist/admin/dashboard.js.map +1 -1
- package/dist/admin/documents.d.ts +4 -4
- package/dist/admin/documents.d.ts.map +1 -1
- package/dist/admin/documents.js +150 -144
- package/dist/admin/documents.js.map +1 -1
- package/dist/admin/editor-actions.d.ts +1 -1
- package/dist/admin/editor-actions.js +1 -1
- package/dist/admin/federation.d.ts +11 -11
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +10 -10
- package/dist/admin/flash.d.ts +8 -0
- package/dist/admin/flash.d.ts.map +1 -1
- package/dist/admin/flash.js +11 -0
- package/dist/admin/flash.js.map +1 -1
- package/dist/admin/indieauth-consent.d.ts +1 -1
- package/dist/admin/indieauth-consent.js +1 -1
- package/dist/admin/legacy-migrations.d.ts +20 -19
- package/dist/admin/legacy-migrations.d.ts.map +1 -1
- package/dist/admin/legacy-migrations.js +14 -13
- package/dist/admin/legacy-migrations.js.map +1 -1
- package/dist/admin/list-indent.d.ts +19 -0
- package/dist/admin/list-indent.d.ts.map +1 -0
- package/dist/admin/list-indent.js +73 -0
- package/dist/admin/list-indent.js.map +1 -0
- package/dist/admin/media.js +1 -1
- package/dist/admin/menu.d.ts +1 -1
- package/dist/admin/menu.js +4 -4
- package/dist/admin/menu.js.map +1 -1
- package/dist/admin/messages.d.ts +2 -2
- package/dist/admin/messages.js +2 -2
- package/dist/admin/navigation.d.ts +3 -3
- package/dist/admin/navigation.js +3 -3
- package/dist/admin/personal-data.d.ts +1 -1
- package/dist/admin/personal-data.js +1 -1
- package/dist/admin/plugins.d.ts +1 -1
- package/dist/admin/plugins.js +1 -1
- package/dist/admin/preview.js +3 -3
- package/dist/admin/preview.js.map +1 -1
- package/dist/admin/recovery.d.ts +1 -1
- package/dist/admin/recovery.js +1 -1
- package/dist/admin/routes.d.ts +3 -3
- package/dist/admin/routes.js +14 -14
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/settings-discussion.d.ts +3 -3
- package/dist/admin/settings-discussion.js +3 -3
- package/dist/admin/settings-federation.d.ts +2 -2
- package/dist/admin/settings-federation.js +5 -5
- package/dist/admin/settings-federation.js.map +1 -1
- package/dist/admin/settings-general.d.ts +1 -1
- package/dist/admin/settings-general.js +2 -2
- package/dist/admin/settings-general.js.map +1 -1
- package/dist/admin/settings-page.d.ts +2 -2
- package/dist/admin/settings-page.js +1 -1
- package/dist/admin/settings-pages.d.ts +1 -1
- package/dist/admin/settings-pages.js +1 -1
- package/dist/admin/settings-reading.d.ts +2 -2
- package/dist/admin/settings-reading.js +2 -2
- package/dist/admin/syndication-targets.d.ts +2 -2
- package/dist/admin/syndication-targets.js +2 -2
- package/dist/admin/taxonomy.d.ts +4 -4
- package/dist/admin/taxonomy.js +4 -4
- package/dist/admin/templates.d.ts +2 -2
- package/dist/admin/templates.js +2 -2
- package/dist/admin/tools.d.ts +1 -1
- package/dist/admin/tools.js +1 -1
- package/dist/admin/users.d.ts +0 -159
- package/dist/admin/users.d.ts.map +1 -1
- package/dist/admin/users.js +204 -498
- package/dist/admin/users.js.map +1 -1
- package/dist/avatars/avatars.d.ts +2 -2
- package/dist/avatars/avatars.js +2 -2
- package/dist/cache.d.ts +1 -1
- package/dist/cache.js +1 -1
- package/dist/cli/args.d.ts +20 -0
- package/dist/cli/args.d.ts.map +1 -0
- package/dist/cli/args.js +138 -0
- package/dist/cli/args.js.map +1 -0
- package/dist/cli/commands.d.ts +10 -0
- package/dist/cli/commands.d.ts.map +1 -0
- package/dist/cli/commands.js +261 -0
- package/dist/cli/commands.js.map +1 -0
- package/dist/cli/database-in-use.d.ts +9 -0
- package/dist/cli/database-in-use.d.ts.map +1 -0
- package/dist/cli/database-in-use.js +38 -0
- package/dist/cli/database-in-use.js.map +1 -0
- package/dist/cli/dev-mode.d.ts +3 -0
- package/dist/cli/dev-mode.d.ts.map +1 -0
- package/dist/cli/dev-mode.js +31 -0
- package/dist/cli/dev-mode.js.map +1 -0
- package/dist/cli/export.d.ts +3 -0
- package/dist/cli/export.d.ts.map +1 -0
- package/dist/cli/export.js +53 -0
- package/dist/cli/export.js.map +1 -0
- package/dist/cli/format.d.ts +3 -0
- package/dist/cli/format.d.ts.map +1 -0
- package/dist/cli/format.js +10 -0
- package/dist/cli/format.js.map +1 -0
- package/dist/cli/gemini.d.ts +3 -0
- package/dist/cli/gemini.d.ts.map +1 -0
- package/dist/cli/gemini.js +34 -0
- package/dist/cli/gemini.js.map +1 -0
- package/dist/cli/help.d.ts +2 -0
- package/dist/cli/help.d.ts.map +1 -0
- package/dist/cli/help.js +111 -0
- package/dist/cli/help.js.map +1 -0
- package/dist/cli/import.d.ts +3 -0
- package/dist/cli/import.d.ts.map +1 -0
- package/dist/cli/import.js +84 -0
- package/dist/cli/import.js.map +1 -0
- package/dist/cli/init.d.ts +3 -0
- package/dist/cli/init.d.ts.map +1 -0
- package/dist/cli/init.js +21 -0
- package/dist/cli/init.js.map +1 -0
- package/dist/cli/maintenance.d.ts +3 -0
- package/dist/cli/maintenance.d.ts.map +1 -0
- package/dist/cli/maintenance.js +57 -0
- package/dist/cli/maintenance.js.map +1 -0
- package/dist/cli/options.d.ts +16 -0
- package/dist/cli/options.d.ts.map +1 -0
- package/dist/cli/options.js +27 -0
- package/dist/cli/options.js.map +1 -0
- package/dist/cli/password.d.ts +21 -0
- package/dist/cli/password.d.ts.map +1 -0
- package/dist/cli/password.js +52 -0
- package/dist/cli/password.js.map +1 -0
- package/dist/cli/plugin-commands.d.ts +11 -0
- package/dist/cli/plugin-commands.d.ts.map +1 -0
- package/dist/cli/plugin-commands.js +79 -0
- package/dist/cli/plugin-commands.js.map +1 -0
- package/dist/cli/plugin-folder.d.ts +3 -0
- package/dist/cli/plugin-folder.d.ts.map +1 -0
- package/dist/cli/plugin-folder.js +93 -0
- package/dist/cli/plugin-folder.js.map +1 -0
- package/dist/cli/rebuild.d.ts +5 -0
- package/dist/cli/rebuild.d.ts.map +1 -0
- package/dist/cli/rebuild.js +44 -0
- package/dist/cli/rebuild.js.map +1 -0
- package/dist/cli/resend.d.ts +3 -0
- package/dist/cli/resend.d.ts.map +1 -0
- package/dist/cli/resend.js +36 -0
- package/dist/cli/resend.js.map +1 -0
- package/dist/cli/run-job.d.ts +5 -0
- package/dist/cli/run-job.d.ts.map +1 -0
- package/dist/cli/run-job.js +29 -0
- package/dist/cli/run-job.js.map +1 -0
- package/dist/cli/serve.d.ts +3 -0
- package/dist/cli/serve.d.ts.map +1 -0
- package/dist/cli/serve.js +65 -0
- package/dist/cli/serve.js.map +1 -0
- package/dist/cli/settings.d.ts +5 -0
- package/dist/cli/settings.d.ts.map +1 -0
- package/dist/cli/settings.js +144 -0
- package/dist/cli/settings.js.map +1 -0
- package/dist/cli/site-plugins.d.ts +5 -0
- package/dist/cli/site-plugins.d.ts.map +1 -0
- package/dist/cli/site-plugins.js +7 -0
- package/dist/cli/site-plugins.js.map +1 -0
- package/dist/cli/strip-metadata.d.ts +3 -0
- package/dist/cli/strip-metadata.d.ts.map +1 -0
- package/dist/cli/strip-metadata.js +20 -0
- package/dist/cli/strip-metadata.js.map +1 -0
- package/dist/cli/sync.d.ts +3 -0
- package/dist/cli/sync.d.ts.map +1 -0
- package/dist/cli/sync.js +22 -0
- package/dist/cli/sync.js.map +1 -0
- package/dist/cli/user.d.ts +3 -0
- package/dist/cli/user.d.ts.map +1 -0
- package/dist/cli/user.js +54 -0
- package/dist/cli/user.js.map +1 -0
- package/dist/cli.d.ts +0 -62
- package/dist/cli.d.ts.map +1 -1
- package/dist/cli.js +6 -1566
- package/dist/cli.js.map +1 -1
- package/dist/cms/app.js +10 -10
- package/dist/cms/app.js.map +1 -1
- package/dist/cms/boot.js +5 -5
- package/dist/cms/boot.js.map +1 -1
- package/dist/cms/create.d.ts +17 -17
- package/dist/cms/create.d.ts.map +1 -1
- package/dist/cms/create.js +1 -1
- package/dist/cms/create.js.map +1 -1
- package/dist/cms/server-error.d.ts +1 -1
- package/dist/cms/server-error.js +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +33 -16
- package/dist/cms/services.js.map +1 -1
- package/dist/comments/akismet.d.ts +4 -4
- package/dist/comments/akismet.js +6 -6
- package/dist/comments/akismet.js.map +1 -1
- package/dist/comments/conversation.d.ts +29 -29
- package/dist/comments/conversation.d.ts.map +1 -1
- package/dist/comments/conversation.js +2 -2
- package/dist/comments/conversation.js.map +1 -1
- package/dist/comments/form.d.ts +3 -3
- package/dist/comments/form.d.ts.map +1 -1
- package/dist/comments/intake.d.ts +4 -4
- package/dist/comments/intake.d.ts.map +1 -1
- package/dist/comments/intake.js +1 -1
- package/dist/comments/migrations.d.ts +3 -3
- package/dist/comments/migrations.js +3 -3
- package/dist/comments/moderate.d.ts +2 -2
- package/dist/comments/moderate.js +2 -2
- package/dist/comments/page-form.d.ts +1 -1
- package/dist/comments/page-form.js +1 -1
- package/dist/comments/records.d.ts +9 -9
- package/dist/comments/records.d.ts.map +1 -1
- package/dist/comments/records.js +11 -10
- package/dist/comments/records.js.map +1 -1
- package/dist/comments/reply-notices.d.ts +2 -2
- package/dist/comments/reply-post.d.ts +2 -2
- package/dist/comments/submission.d.ts +8 -8
- package/dist/comments/submission.d.ts.map +1 -1
- package/dist/comments/submission.js +9 -9
- package/dist/comments/submission.js.map +1 -1
- package/dist/config.d.ts +27 -27
- package/dist/config.js +3 -3
- package/dist/contact/index.d.ts +1 -1
- package/dist/contact/index.js +1 -1
- package/dist/contact/records.d.ts +7 -7
- package/dist/contact/records.js +7 -7
- package/dist/content/alt-text.d.ts +2 -2
- package/dist/content/alt-text.js +2 -2
- package/dist/content/authors.d.ts +6 -6
- package/dist/content/authors.d.ts.map +1 -1
- package/dist/content/authors.js +6 -6
- package/dist/content/authors.js.map +1 -1
- package/dist/content/citation.d.ts +1 -1
- package/dist/content/content-tree.d.ts +5 -0
- package/dist/content/content-tree.d.ts.map +1 -0
- package/dist/content/content-tree.js +54 -0
- package/dist/content/content-tree.js.map +1 -0
- package/dist/content/content-watcher.d.ts +15 -0
- package/dist/content/content-watcher.d.ts.map +1 -0
- package/dist/content/content-watcher.js +104 -0
- package/dist/content/content-watcher.js.map +1 -0
- package/dist/content/document-form.d.ts +25 -24
- package/dist/content/document-form.d.ts.map +1 -1
- package/dist/content/document-form.js +7 -7
- package/dist/content/document-form.js.map +1 -1
- package/dist/content/document-kind.d.ts +6 -6
- package/dist/content/document.d.ts +1 -1
- package/dist/content/enclosure-form.js +1 -1
- package/dist/content/enclosure.js +1 -1
- package/dist/content/event-form.d.ts +2 -2
- package/dist/content/event.d.ts +3 -3
- package/dist/content/event.js +3 -3
- package/dist/content/guids.d.ts +6 -6
- package/dist/content/guids.d.ts.map +1 -1
- package/dist/content/guids.js +7 -7
- package/dist/content/guids.js.map +1 -1
- package/dist/content/handles.d.ts +1 -1
- package/dist/content/handles.js +1 -1
- package/dist/content/html-to-markdown.js +2 -2
- package/dist/content/language.d.ts +1 -1
- package/dist/content/language.js +1 -1
- package/dist/content/locale.d.ts +1 -1
- package/dist/content/locale.js +1 -1
- package/dist/content/markdown.d.ts +1 -1
- package/dist/content/markdown.js +1 -1
- package/dist/content/parser.d.ts +1 -1
- package/dist/content/parser.d.ts.map +1 -1
- package/dist/content/permalinks.d.ts +4 -4
- package/dist/content/permalinks.js +4 -4
- package/dist/content/photo-form.js +2 -2
- package/dist/content/photo.d.ts +2 -2
- package/dist/content/photo.js +1 -1
- package/dist/content/pinned.d.ts +3 -3
- package/dist/content/pinned.js +3 -3
- package/dist/content/post-fields.js +2 -2
- package/dist/content/post-fields.js.map +1 -1
- package/dist/content/post-type.d.ts +4 -4
- package/dist/content/post-type.js +1 -1
- package/dist/content/reconcile.d.ts +15 -0
- package/dist/content/reconcile.d.ts.map +1 -0
- package/dist/content/reconcile.js +106 -0
- package/dist/content/reconcile.js.map +1 -0
- package/dist/content/redirects.d.ts +2 -3
- package/dist/content/redirects.d.ts.map +1 -1
- package/dist/content/redirects.js +2 -3
- package/dist/content/redirects.js.map +1 -1
- package/dist/content/rsvp.d.ts +1 -1
- package/dist/content/rsvp.js +1 -1
- package/dist/content/sanitize.js +1 -1
- package/dist/content/save.d.ts +3 -3
- package/dist/content/save.js +4 -4
- package/dist/content/scan.d.ts +12 -0
- package/dist/content/scan.d.ts.map +1 -0
- package/dist/content/scan.js +58 -0
- package/dist/content/scan.js.map +1 -0
- package/dist/content/search.d.ts +3 -3
- package/dist/content/search.js +3 -3
- package/dist/content/served.d.ts +5 -5
- package/dist/content/served.js +4 -4
- package/dist/content/site-links.d.ts +3 -4
- package/dist/content/site-links.d.ts.map +1 -1
- package/dist/content/site-links.js +1 -2
- package/dist/content/site-links.js.map +1 -1
- package/dist/content/sqlite/clauses.d.ts +1 -1
- package/dist/content/sqlite/clauses.js +1 -1
- package/dist/content/sqlite/rows.d.ts +1 -1
- package/dist/content/sqlite/rows.js +1 -1
- package/dist/content/store.d.ts +26 -26
- package/dist/content/sync.d.ts +3 -3
- package/dist/content/sync.d.ts.map +1 -1
- package/dist/content/sync.js +65 -382
- package/dist/content/sync.js.map +1 -1
- package/dist/content/taxonomy.d.ts +9 -8
- package/dist/content/taxonomy.d.ts.map +1 -1
- package/dist/content/taxonomy.js +9 -8
- package/dist/content/taxonomy.js.map +1 -1
- package/dist/content/time.d.ts +1 -1
- package/dist/content/time.js +1 -1
- package/dist/content/trash.d.ts +4 -5
- package/dist/content/trash.d.ts.map +1 -1
- package/dist/content/trash.js +4 -5
- package/dist/content/trash.js.map +1 -1
- package/dist/content/write.d.ts +4 -4
- package/dist/content/write.js +19 -19
- package/dist/content/write.js.map +1 -1
- package/dist/drain.d.ts +1 -1
- package/dist/drain.js +1 -1
- package/dist/federation/actor.d.ts +9 -9
- package/dist/federation/actor.js +10 -10
- package/dist/federation/article.d.ts +14 -14
- package/dist/federation/article.js +27 -27
- package/dist/federation/article.js.map +1 -1
- package/dist/federation/backfill.d.ts +2 -2
- package/dist/federation/backfill.js +2 -2
- package/dist/federation/citations.d.ts +1 -1
- package/dist/federation/citations.js +1 -1
- package/dist/federation/cited-post.d.ts +1 -1
- package/dist/federation/cited-post.js +1 -1
- package/dist/federation/delivery-plan.d.ts +1 -1
- package/dist/federation/delivery.d.ts +3 -3
- package/dist/federation/delivery.d.ts.map +1 -1
- package/dist/federation/delivery.js +25 -15
- package/dist/federation/delivery.js.map +1 -1
- package/dist/federation/federation.d.ts +3 -3
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +7 -8
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/handles.d.ts +1 -1
- package/dist/federation/handles.js +1 -1
- package/dist/federation/inbox.d.ts +6 -6
- package/dist/federation/inbox.js +9 -9
- package/dist/federation/keys.d.ts +3 -3
- package/dist/federation/keys.js +3 -3
- package/dist/federation/object-ids.d.ts +1 -1
- package/dist/federation/outbox-observer.d.ts +17 -0
- package/dist/federation/outbox-observer.d.ts.map +1 -0
- package/dist/federation/outbox-observer.js +98 -0
- package/dist/federation/outbox-observer.js.map +1 -0
- package/dist/federation/paths.d.ts +8 -8
- package/dist/federation/paths.js +8 -8
- package/dist/federation/profiles.d.ts +2 -3
- package/dist/federation/profiles.d.ts.map +1 -1
- package/dist/federation/profiles.js +2 -3
- package/dist/federation/profiles.js.map +1 -1
- package/dist/federation/quotes.d.ts +1 -1
- package/dist/federation/records.d.ts +24 -24
- package/dist/federation/records.js +23 -23
- package/dist/federation/records.js.map +1 -1
- package/dist/federation/refusals.d.ts +1 -1
- package/dist/federation/relays.d.ts +1 -1
- package/dist/federation/relays.d.ts.map +1 -1
- package/dist/federation/relays.js +38 -13
- package/dist/federation/relays.js.map +1 -1
- package/dist/federation/webfinger.d.ts +2 -2
- package/dist/federation/webfinger.js +2 -2
- package/dist/files/atomic.d.ts +2 -2
- package/dist/files/atomic.js +1 -1
- package/dist/forms/checker.d.ts +2 -2
- package/dist/forms/checker.d.ts.map +1 -1
- package/dist/forms/protection.d.ts +1 -1
- package/dist/forms/protection.js +1 -1
- package/dist/gemini/certificate.js +1 -1
- package/dist/images/markup.d.ts +2 -2
- package/dist/images/variants.d.ts +8 -8
- package/dist/images/variants.js +1 -1
- package/dist/indexnow.d.ts +1 -1
- package/dist/indieauth/grants.d.ts +2 -2
- package/dist/indieauth/identity.d.ts +3 -5
- package/dist/indieauth/identity.d.ts.map +1 -1
- package/dist/indieauth/identity.js +3 -5
- package/dist/indieauth/identity.js.map +1 -1
- package/dist/indieauth/redeem.d.ts +2 -2
- package/dist/indieauth/redeem.js +2 -2
- package/dist/indieauth/request.d.ts +2 -2
- package/dist/indieauth/request.js +2 -2
- package/dist/indieauth/tokens.d.ts +3 -5
- package/dist/indieauth/tokens.d.ts.map +1 -1
- package/dist/indieauth/tokens.js +3 -5
- package/dist/indieauth/tokens.js.map +1 -1
- package/dist/jobs/file-records.d.ts +1 -1
- package/dist/jobs/file-records.js +1 -1
- package/dist/jobs/in-process.d.ts +1 -1
- package/dist/jobs/in-process.js +1 -1
- package/dist/jobs/queue.d.ts +1 -1
- package/dist/jobs/queue.js +1 -1
- package/dist/mail/provider.d.ts +2 -2
- package/dist/mail/provider.js +2 -2
- package/dist/media/library.d.ts +2 -2
- package/dist/media/uploads.js +2 -2
- package/dist/media/uploads.js.map +1 -1
- package/dist/micropub/create.d.ts +1 -1
- package/dist/micropub/endpoint.d.ts +7 -7
- package/dist/micropub/endpoint.js +8 -8
- package/dist/micropub/endpoint.js.map +1 -1
- package/dist/micropub/media.d.ts +4 -4
- package/dist/micropub/media.js +4 -4
- package/dist/micropub/update.d.ts +1 -1
- package/dist/micropub/update.js +1 -1
- package/dist/notifications/comments.d.ts +1 -1
- package/dist/notifications/comments.js +2 -2
- package/dist/notifications/comments.js.map +1 -1
- package/dist/notifications/digest.d.ts +7 -7
- package/dist/notifications/digest.js +7 -7
- package/dist/notifications/mail-service.d.ts +4 -4
- package/dist/notifications/mail-service.d.ts.map +1 -1
- package/dist/notifications/mail-service.js +3 -3
- package/dist/notifications/mail-templates.d.ts +3 -3
- package/dist/notifications/optouts.d.ts +1 -1
- package/dist/notifications/optouts.js +1 -1
- package/dist/notifications/tokens.d.ts +2 -2
- package/dist/plugin.d.ts +5 -5
- package/dist/plugin.js +5 -5
- package/dist/plugins/changes.js +2 -2
- package/dist/plugins/folder.d.ts +2 -2
- package/dist/plugins/folder.js +2 -2
- package/dist/plugins/install.d.ts +1 -1
- package/dist/plugins/install.js +1 -1
- package/dist/plugins/registry.d.ts +1 -1
- package/dist/plugins/registry.js +1 -1
- package/dist/plugins/site.d.ts +1 -1
- package/dist/plugins/site.js +1 -1
- package/dist/privacy/erase.d.ts +1 -1
- package/dist/privacy/erase.js +1 -1
- package/dist/privacy/retention.d.ts +2 -2
- package/dist/privacy/retention.js +2 -2
- package/dist/site/admin-paths.d.ts +2 -2
- package/dist/site/admin-paths.js +2 -2
- package/dist/site/authors.d.ts +6 -6
- package/dist/site/authors.js +5 -5
- package/dist/site/dashboard-layout.d.ts +1 -1
- package/dist/site/indexnow-key.js +1 -1
- package/dist/site/namespace.d.ts +1 -1
- package/dist/site/namespace.js +1 -1
- package/dist/site/navigation.d.ts +10 -10
- package/dist/site/navigation.js +10 -10
- package/dist/site/notification-preferences.d.ts +3 -3
- package/dist/site/notification-preferences.js +2 -2
- package/dist/site/retention-policy.d.ts +1 -1
- package/dist/site/retention-policy.js +1 -1
- package/dist/site/users.d.ts +23 -24
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +6 -6
- package/dist/site/users.js.map +1 -1
- package/dist/store/admin-store.d.ts +3 -3
- package/dist/store/admin-store.d.ts.map +1 -1
- package/dist/store/comments.d.ts +17 -17
- package/dist/store/comments.d.ts.map +1 -1
- package/dist/store/comments.js +14 -21
- package/dist/store/comments.js.map +1 -1
- package/dist/store/conversation.d.ts +2 -2
- package/dist/store/deliveries.d.ts +13 -5
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +18 -16
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/followers.d.ts +5 -5
- package/dist/store/followers.d.ts.map +1 -1
- package/dist/store/followers.js +7 -10
- package/dist/store/followers.js.map +1 -1
- package/dist/store/inbox-replies.d.ts +4 -4
- package/dist/store/inbox-replies.js +4 -4
- package/dist/store/inbox.d.ts +5 -5
- package/dist/store/inbox.d.ts.map +1 -1
- package/dist/store/inbox.js +21 -34
- package/dist/store/inbox.js.map +1 -1
- package/dist/store/profiles.d.ts +5 -5
- package/dist/store/profiles.d.ts.map +1 -1
- package/dist/store/profiles.js +4 -5
- package/dist/store/profiles.js.map +1 -1
- package/dist/store/relays.d.ts.map +1 -1
- package/dist/store/relays.js +7 -9
- package/dist/store/relays.js.map +1 -1
- package/dist/store/rows.d.ts +6 -20
- package/dist/store/rows.d.ts.map +1 -1
- package/dist/store/rows.js +10 -15
- package/dist/store/rows.js.map +1 -1
- package/dist/store/schema.js +35 -35
- package/dist/store/schema.js.map +1 -1
- package/dist/store/sessions.d.ts +1 -1
- package/dist/store/sessions.d.ts.map +1 -1
- package/dist/store/sessions.js +10 -10
- package/dist/store/sessions.js.map +1 -1
- package/dist/store/state.d.ts.map +1 -1
- package/dist/store/state.js +2 -2
- package/dist/store/state.js.map +1 -1
- package/dist/store/tokens.d.ts +1 -1
- package/dist/store/tokens.d.ts.map +1 -1
- package/dist/store/tokens.js +5 -5
- package/dist/store/tokens.js.map +1 -1
- package/dist/store/webmentions.d.ts +2 -2
- package/dist/store/webmentions.d.ts.map +1 -1
- package/dist/store/webmentions.js +11 -11
- package/dist/store/webmentions.js.map +1 -1
- package/dist/supervisor/plugin-watcher.d.ts +26 -0
- package/dist/supervisor/plugin-watcher.d.ts.map +1 -0
- package/dist/supervisor/plugin-watcher.js +90 -0
- package/dist/supervisor/plugin-watcher.js.map +1 -0
- package/dist/supervisor/primary.d.ts +4 -7
- package/dist/supervisor/primary.d.ts.map +1 -1
- package/dist/supervisor/primary.js +37 -94
- package/dist/supervisor/primary.js.map +1 -1
- package/dist/supervisor/protocol.d.ts +1 -1
- package/dist/supervisor/protocol.js +1 -1
- package/dist/supervisor/reload-queue.d.ts +10 -0
- package/dist/supervisor/reload-queue.d.ts.map +1 -0
- package/dist/supervisor/reload-queue.js +28 -0
- package/dist/supervisor/reload-queue.js.map +1 -0
- package/dist/supervisor/supervision.d.ts +2 -2
- package/dist/supervisor/supervision.js +2 -2
- package/dist/supervisor/worker.d.ts +1 -1
- package/dist/supervisor/worker.js +1 -1
- package/dist/theme/site-data.d.ts +3 -3
- package/dist/theme/site-data.js +2 -2
- package/dist/theme/templates.d.ts +3 -3
- package/dist/theme/templates.js +16 -16
- package/dist/theme/templates.js.map +1 -1
- package/dist/theme/themes.d.ts +11 -13
- package/dist/theme/themes.d.ts.map +1 -1
- package/dist/theme/themes.js +8 -9
- package/dist/theme/themes.js.map +1 -1
- package/dist/web/activity-folding.d.ts +33 -0
- package/dist/web/activity-folding.d.ts.map +1 -0
- package/dist/web/activity-folding.js +238 -0
- package/dist/web/activity-folding.js.map +1 -0
- package/dist/web/archive.d.ts +2 -3
- package/dist/web/archive.d.ts.map +1 -1
- package/dist/web/archive.js +2 -3
- package/dist/web/archive.js.map +1 -1
- package/dist/web/asset-routes.d.ts +1 -1
- package/dist/web/asset-routes.js +1 -1
- package/dist/web/comment-routes.js +2 -2
- package/dist/web/comment-routes.js.map +1 -1
- package/dist/web/compression.d.ts +1 -1
- package/dist/web/compression.js +1 -1
- package/dist/web/context.d.ts +21 -21
- package/dist/web/context.d.ts.map +1 -1
- package/dist/web/context.js +7 -7
- package/dist/web/conversation-context.d.ts +15 -0
- package/dist/web/conversation-context.d.ts.map +1 -0
- package/dist/web/conversation-context.js +2 -0
- package/dist/web/conversation-context.js.map +1 -0
- package/dist/web/conversation-feed.d.ts +18 -0
- package/dist/web/conversation-feed.d.ts.map +1 -0
- package/dist/web/conversation-feed.js +53 -0
- package/dist/web/conversation-feed.js.map +1 -0
- package/dist/web/conversation-gather.d.ts +12 -0
- package/dist/web/conversation-gather.d.ts.map +1 -0
- package/dist/web/conversation-gather.js +189 -0
- package/dist/web/conversation-gather.js.map +1 -0
- package/dist/web/conversation-lookup.d.ts +15 -0
- package/dist/web/conversation-lookup.d.ts.map +1 -0
- package/dist/web/conversation-lookup.js +101 -0
- package/dist/web/conversation-lookup.js.map +1 -0
- package/dist/web/conversation-threads.d.ts +12 -0
- package/dist/web/conversation-threads.d.ts.map +1 -0
- package/dist/web/conversation-threads.js +144 -0
- package/dist/web/conversation-threads.js.map +1 -0
- package/dist/web/conversation.d.ts +25 -61
- package/dist/web/conversation.d.ts.map +1 -1
- package/dist/web/conversation.js +14 -854
- package/dist/web/conversation.js.map +1 -1
- package/dist/web/document-page.js +4 -4
- package/dist/web/document-page.js.map +1 -1
- package/dist/web/document-render.d.ts +9 -0
- package/dist/web/document-render.d.ts.map +1 -0
- package/dist/web/document-render.js +130 -0
- package/dist/web/document-render.js.map +1 -0
- package/dist/web/document-site.d.ts +1 -1
- package/dist/web/document-site.d.ts.map +1 -1
- package/dist/web/document-site.js +1 -1
- package/dist/web/document-site.js.map +1 -1
- package/dist/web/env.d.ts +19 -19
- package/dist/web/env.d.ts.map +1 -1
- package/dist/web/federation-routes.d.ts +2 -2
- package/dist/web/federation-routes.d.ts.map +1 -1
- package/dist/web/federation-routes.js +22 -21
- package/dist/web/federation-routes.js.map +1 -1
- package/dist/web/feed-atom.d.ts +3 -3
- package/dist/web/feed-atom.js +3 -3
- package/dist/web/feed-item.d.ts +15 -16
- package/dist/web/feed-item.d.ts.map +1 -1
- package/dist/web/feed-item.js +1 -1
- package/dist/web/feed-item.js.map +1 -1
- package/dist/web/feed-json.d.ts +4 -4
- package/dist/web/feed-json.d.ts.map +1 -1
- package/dist/web/feed-json.js +2 -2
- package/dist/web/feed-routes.d.ts +3 -3
- package/dist/web/feed-routes.js +4 -4
- package/dist/web/feed-routes.js.map +1 -1
- package/dist/web/feed-rss.d.ts +2 -2
- package/dist/web/feed-rss.js +4 -4
- package/dist/web/feed-rss.js.map +1 -1
- package/dist/web/feed-source.d.ts +5 -5
- package/dist/web/feed-source.d.ts.map +1 -1
- package/dist/web/feed-source.js +2 -2
- package/dist/web/feed-source.js.map +1 -1
- package/dist/web/feed-xml.d.ts +4 -4
- package/dist/web/feed-xml.d.ts.map +1 -1
- package/dist/web/feed-xml.js +4 -4
- package/dist/web/feed-xml.js.map +1 -1
- package/dist/web/font-routes.d.ts +1 -1
- package/dist/web/font-routes.js +1 -1
- package/dist/web/health.d.ts +1 -1
- package/dist/web/index.d.ts +5 -3
- package/dist/web/index.d.ts.map +1 -1
- package/dist/web/index.js +4 -2
- package/dist/web/index.js.map +1 -1
- package/dist/web/indieauth-activity-log.js +1 -1
- package/dist/web/indieauth-bearer.d.ts +2 -2
- package/dist/web/indieauth-discovery.d.ts +12 -12
- package/dist/web/indieauth-discovery.d.ts.map +1 -1
- package/dist/web/indieauth-discovery.js +12 -12
- package/dist/web/indieauth-discovery.js.map +1 -1
- package/dist/web/indieauth-token.d.ts +2 -2
- package/dist/web/indieauth-token.js +2 -2
- package/dist/web/listing-render.d.ts +11 -0
- package/dist/web/listing-render.d.ts.map +1 -0
- package/dist/web/listing-render.js +76 -0
- package/dist/web/listing-render.js.map +1 -0
- package/dist/web/listing-subject.js +1 -1
- package/dist/web/listing-subject.js.map +1 -1
- package/dist/web/llms.d.ts +1 -1
- package/dist/web/llms.js +1 -1
- package/dist/web/maintenance.d.ts +1 -1
- package/dist/web/maintenance.js +1 -1
- package/dist/web/manifest.d.ts +1 -1
- package/dist/web/manifest.js +1 -1
- package/dist/web/markdown-chrome.d.ts +11 -0
- package/dist/web/markdown-chrome.d.ts.map +1 -0
- package/dist/web/markdown-chrome.js +178 -0
- package/dist/web/markdown-chrome.js.map +1 -0
- package/dist/web/markdown-conversation.d.ts +1 -1
- package/dist/web/markdown-conversation.d.ts.map +1 -1
- package/dist/web/markdown-environment.d.ts +10 -0
- package/dist/web/markdown-environment.d.ts.map +1 -0
- package/dist/web/markdown-environment.js +56 -0
- package/dist/web/markdown-environment.js.map +1 -0
- package/dist/web/markdown-representation.d.ts +1 -1
- package/dist/web/markdown-representation.d.ts.map +1 -1
- package/dist/web/markdown-representation.js +2 -2
- package/dist/web/markdown-representation.js.map +1 -1
- package/dist/web/negotiate.d.ts +5 -5
- package/dist/web/negotiate.d.ts.map +1 -1
- package/dist/web/negotiate.js +3 -3
- package/dist/web/negotiate.js.map +1 -1
- package/dist/web/oembed.d.ts +3 -3
- package/dist/web/oembed.js +3 -3
- package/dist/web/opensearch.d.ts +1 -1
- package/dist/web/opensearch.js +1 -1
- package/dist/web/page-context.d.ts +29 -0
- package/dist/web/page-context.d.ts.map +1 -0
- package/dist/web/page-context.js +126 -0
- package/dist/web/page-context.js.map +1 -0
- package/dist/web/page-tags.js +1 -1
- package/dist/web/page-tags.js.map +1 -1
- package/dist/web/paths.d.ts +1 -1
- package/dist/web/paths.js +3 -3
- package/dist/web/plugin-federation.d.ts +1 -1
- package/dist/web/plugin-federation.js +1 -1
- package/dist/web/render-scope.d.ts +20 -0
- package/dist/web/render-scope.d.ts.map +1 -0
- package/dist/web/render-scope.js +36 -0
- package/dist/web/render-scope.js.map +1 -0
- package/dist/web/render.d.ts +21 -363
- package/dist/web/render.d.ts.map +1 -1
- package/dist/web/render.js +46 -899
- package/dist/web/render.js.map +1 -1
- package/dist/web/request.d.ts +1 -1
- package/dist/web/request.js +1 -1
- package/dist/web/robots.d.ts +1 -1
- package/dist/web/robots.js +1 -1
- package/dist/web/routes.js +19 -19
- package/dist/web/routes.js.map +1 -1
- package/dist/web/search.d.ts +1 -1
- package/dist/web/search.js +1 -1
- package/dist/web/session.d.ts +8 -8
- package/dist/web/session.js +8 -8
- package/dist/web/share-image.d.ts +2 -3
- package/dist/web/share-image.d.ts.map +1 -1
- package/dist/web/share-image.js +1 -1
- package/dist/web/share-image.js.map +1 -1
- package/dist/web/site-view.d.ts +2 -2
- package/dist/web/status-pages.d.ts +1 -1
- package/dist/web/status-pages.d.ts.map +1 -1
- package/dist/web/theme-environment.d.ts +14 -0
- package/dist/web/theme-environment.d.ts.map +1 -0
- package/dist/web/theme-environment.js +112 -0
- package/dist/web/theme-environment.js.map +1 -0
- package/dist/web/theme-templates.d.ts +67 -0
- package/dist/web/theme-templates.d.ts.map +1 -0
- package/dist/web/theme-templates.js +65 -0
- package/dist/web/theme-templates.js.map +1 -0
- package/dist/webmention/microformats.d.ts +5 -5
- package/dist/webmention/microformats.d.ts.map +1 -1
- package/dist/webmention/receive.d.ts +7 -7
- package/dist/webmention/receive.d.ts.map +1 -1
- package/dist/webmention/receive.js +4 -4
- package/dist/webmention/receive.js.map +1 -1
- package/dist/webmention/reply-context/oembed.js +1 -1
- package/dist/webmention/reply-context.d.ts +10 -10
- package/dist/webmention/reply-context.d.ts.map +1 -1
- package/dist/webmention/reply-context.js +5 -5
- package/dist/webmention/reply-contexts.d.ts +6 -6
- package/dist/webmention/reply-contexts.d.ts.map +1 -1
- package/dist/webmention/reply-contexts.js +2 -2
- package/dist/webmention/service.d.ts +13 -13
- package/dist/webmention/service.js +9 -9
- package/dist/webmention/syndication.d.ts +6 -6
- package/dist/webmention/syndication.d.ts.map +1 -1
- package/dist/webmention/syndication.js +6 -6
- package/dist/webmention/syndication.js.map +1 -1
- package/package.json +4 -2
package/dist/store/comments.d.ts
CHANGED
|
@@ -8,7 +8,7 @@ export declare const COMMENT_SOURCES: readonly ['comment', 'webmention', 'activi
|
|
|
8
8
|
* One of {@link COMMENT_SOURCES}.
|
|
9
9
|
*
|
|
10
10
|
* `comment` is the form under the post. `webmention` is another site's post
|
|
11
|
-
* pointing at this one
|
|
11
|
+
* pointing at this one, which lands in the same file with the same
|
|
12
12
|
* shape and is told apart only by this. `activitypub` is a fediverse reply or
|
|
13
13
|
* reaction a site received before it ran Geekity, brought across by an import:
|
|
14
14
|
* one this site receives itself is logged in the inbox instead.
|
|
@@ -23,7 +23,7 @@ export declare const COMMENT_KINDS: readonly ['reply', 'like', 'boost', 'mention
|
|
|
23
23
|
* `mention` are the webmention vocabulary's two extra: a repost is a boost by
|
|
24
24
|
* another name and is shown with them, and a mention is the one thing neither
|
|
25
25
|
* of the others is — somebody's page pointing at this one without answering
|
|
26
|
-
* it
|
|
26
|
+
* it.
|
|
27
27
|
*/
|
|
28
28
|
export type CommentKind = (typeof COMMENT_KINDS)[number];
|
|
29
29
|
/** Where a comment stands with the moderator. */
|
|
@@ -37,7 +37,7 @@ export declare const COMMENT_STATUSES: readonly ['pending', 'approved', 'spam'];
|
|
|
37
37
|
* mistake can be undone.
|
|
38
38
|
*/
|
|
39
39
|
export type CommentStatus = (typeof COMMENT_STATUSES)[number];
|
|
40
|
-
/** What a comment can have had removed from it for privacy
|
|
40
|
+
/** What a comment can have had removed from it for privacy. */
|
|
41
41
|
export declare const REDACTED_FIELDS: readonly ['email', 'addressHash', 'author'];
|
|
42
42
|
/**
|
|
43
43
|
* One of {@link REDACTED_FIELDS}.
|
|
@@ -61,8 +61,8 @@ export interface CommentAuthor {
|
|
|
61
61
|
/**
|
|
62
62
|
* Their avatar, or `null`.
|
|
63
63
|
*
|
|
64
|
-
* A webmention has one out of the `u-photo` of the source page's `h-card
|
|
65
|
-
*
|
|
64
|
+
* A webmention has one out of the `u-photo` of the source page's `h-card`,
|
|
65
|
+
* and an imported fediverse comment its actor's icon.
|
|
66
66
|
* A form asks for no picture: one it did ask for would be a stranger's file
|
|
67
67
|
* on somebody else's page. The page serves it through the avatar cache.
|
|
68
68
|
*/
|
|
@@ -79,7 +79,7 @@ export interface CommentContent {
|
|
|
79
79
|
* One comment, as its post's file under `content/_data/comments/` holds it.
|
|
80
80
|
*
|
|
81
81
|
* The shape is deliberately wider than a form submission. A webmention
|
|
82
|
-
*
|
|
82
|
+
* is somebody else's post pointing at this one: it has a `url` and no
|
|
83
83
|
* email, it may be a like rather than a reply, and it belongs in the same file
|
|
84
84
|
* and the same thread. So every entry says its `source` and its `kind`, and
|
|
85
85
|
* nothing assumes a person filled in a form.
|
|
@@ -121,7 +121,7 @@ export interface CommentRecord {
|
|
|
121
121
|
*/
|
|
122
122
|
url: string | null;
|
|
123
123
|
/**
|
|
124
|
-
* Whether whoever wrote it asked to hear about replies to it
|
|
124
|
+
* Whether whoever wrote it asked to hear about replies to it.
|
|
125
125
|
*
|
|
126
126
|
* Only ever true for a comment that carries an `author.email`, because there
|
|
127
127
|
* would be nowhere to send it otherwise, and only ever set by somebody
|
|
@@ -132,8 +132,8 @@ export interface CommentRecord {
|
|
|
132
132
|
notify: boolean;
|
|
133
133
|
/**
|
|
134
134
|
* What was removed from it for privacy, in the order {@link REDACTED_FIELDS}
|
|
135
|
-
* lists them, when anything was
|
|
136
|
-
* that has never swept stay byte for byte what they were.
|
|
135
|
+
* lists them, when anything was. Absent rather than empty otherwise, so the
|
|
136
|
+
* files of a site that has never swept stay byte for byte what they were.
|
|
137
137
|
*
|
|
138
138
|
* It is what tells an email that was taken away from one that was never
|
|
139
139
|
* given: an author whose email was removed must not match the auto-approval
|
|
@@ -142,19 +142,19 @@ export interface CommentRecord {
|
|
|
142
142
|
*/
|
|
143
143
|
redacted?: readonly RedactedField[];
|
|
144
144
|
/**
|
|
145
|
-
* What a reply that is an RSVP says
|
|
145
|
+
* What a reply that is an RSVP says: the `p-rsvp` of the page a
|
|
146
146
|
* webmention came from. Absent for every other comment, so the files of a
|
|
147
147
|
* site that has had none stay byte for byte what they were.
|
|
148
148
|
*/
|
|
149
149
|
rsvp?: RsvpValue;
|
|
150
150
|
/**
|
|
151
151
|
* The page whose entry carried it, for a webmention reply read out of
|
|
152
|
-
* another webmention's source rather than sent on its own (a salmention
|
|
153
|
-
*
|
|
152
|
+
* another webmention's source rather than sent on its own (a salmention).
|
|
153
|
+
* Absent for every other comment.
|
|
154
154
|
*/
|
|
155
155
|
via?: string;
|
|
156
156
|
/**
|
|
157
|
-
* Whether it was imported from another system
|
|
157
|
+
* Whether it was imported from another system, the word a
|
|
158
158
|
* migrated post uses. It was published before the site came here, so it is
|
|
159
159
|
* shown in its thread and carried by no feed. Absent for every other comment.
|
|
160
160
|
*/
|
|
@@ -168,14 +168,14 @@ export interface CommentRecord {
|
|
|
168
168
|
origin?: string;
|
|
169
169
|
/**
|
|
170
170
|
* The site user who wrote it, by username, for a comment written by
|
|
171
|
-
* somebody signed in to the system it was imported from
|
|
171
|
+
* somebody signed in to the system it was imported from. The
|
|
172
172
|
* thread names them as it names their reply posts. Absent for every other
|
|
173
173
|
* comment.
|
|
174
174
|
*/
|
|
175
175
|
user?: string;
|
|
176
176
|
/**
|
|
177
177
|
* The fediverse actor who wrote it, by id, for a migrated fediverse comment
|
|
178
|
-
* whose actor the export named
|
|
178
|
+
* whose actor the export named. What tells their like here from
|
|
179
179
|
* the same person's like delivered since, whatever profile page each names.
|
|
180
180
|
* Absent for every other comment.
|
|
181
181
|
*/
|
|
@@ -231,7 +231,7 @@ export interface CommentStore {
|
|
|
231
231
|
countApprovedCommentsExceptImportedFediverseSince(since: string): CommentCount[];
|
|
232
232
|
/** One comment by id, or `undefined`. */
|
|
233
233
|
getComment(id: string): PostComment | undefined;
|
|
234
|
-
/** The comments whose `url` is this one, whatever their status
|
|
234
|
+
/** The comments whose `url` is this one, whatever their status. */
|
|
235
235
|
listCommentsAt(url: string): PostComment[];
|
|
236
236
|
/** How many comments stand at each status. What the dashboard shows. */
|
|
237
237
|
countCommentsByStatus(): Record<CommentStatus, number>;
|
|
@@ -250,7 +250,7 @@ export interface CommentStore {
|
|
|
250
250
|
/**
|
|
251
251
|
* Make the comment index say exactly this, in one transaction.
|
|
252
252
|
*
|
|
253
|
-
* What a rebuild from `content/_data/comments/` calls
|
|
253
|
+
* What a rebuild from `content/_data/comments/` calls: the
|
|
254
254
|
* files are the source, so a row they do not carry is a comment that should
|
|
255
255
|
* not be on the page. Nothing outside a rebuild should reach for it.
|
|
256
256
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../src/store/comments.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGhD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACpD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"comments.d.ts","sourceRoot":"","sources":["../../src/store/comments.ts"],"names":[],"mappings":"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"}
|
package/dist/store/comments.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { rsvpValue } from '../content/rsvp.js';
|
|
2
|
-
import { countByStatus, inTransaction, NO_LIMIT, nullableText, oneOf } from './rows.js';
|
|
2
|
+
import { allRows, countByStatus, getRow, inTransaction, NO_LIMIT, nullableText, oneOf, } from './rows.js';
|
|
3
3
|
/** Where a comment came from. */
|
|
4
4
|
export const COMMENT_SOURCES = ['comment', 'webmention', 'activitypub'];
|
|
5
5
|
/** What a comment is: something written, or a wordless pointer at the post. */
|
|
6
6
|
export const COMMENT_KINDS = ['reply', 'like', 'boost', 'mention', 'repost'];
|
|
7
7
|
/** Where a comment stands with the moderator. */
|
|
8
8
|
export const COMMENT_STATUSES = ['pending', 'approved', 'spam'];
|
|
9
|
-
/** What a comment can have had removed from it for privacy
|
|
9
|
+
/** What a comment can have had removed from it for privacy. */
|
|
10
10
|
export const REDACTED_FIELDS = ['email', 'addressHash', 'author'];
|
|
11
11
|
/**
|
|
12
12
|
* What a comment brought from the system it was imported from, as a record
|
|
@@ -91,7 +91,7 @@ export function openCommentStore(db, written) {
|
|
|
91
91
|
};
|
|
92
92
|
return {
|
|
93
93
|
listCommentsFor(slug) {
|
|
94
|
-
return statements.listCommentsFor
|
|
94
|
+
return allRows(statements.listCommentsFor, toComment, slug);
|
|
95
95
|
},
|
|
96
96
|
listComments(options = {}) {
|
|
97
97
|
// Prepared here rather than beside the others because the `WHERE` is not
|
|
@@ -99,34 +99,28 @@ export function openCommentStore(db, written) {
|
|
|
99
99
|
// approved comments across every post.
|
|
100
100
|
const where = options.status === undefined ? '' : 'WHERE status = ?';
|
|
101
101
|
const parameters = options.status === undefined ? [] : [options.status];
|
|
102
|
-
|
|
103
|
-
.prepare(`SELECT * FROM comments ${where}
|
|
102
|
+
return allRows(db.prepare(`SELECT * FROM comments ${where}
|
|
104
103
|
ORDER BY submitted_at DESC, id DESC
|
|
105
|
-
LIMIT ? OFFSET ?`)
|
|
106
|
-
.all(...parameters, options.limit ?? NO_LIMIT, options.offset ?? 0);
|
|
107
|
-
return rows.map(toComment);
|
|
104
|
+
LIMIT ? OFFSET ?`), toComment, ...parameters, options.limit ?? NO_LIMIT, options.offset ?? 0);
|
|
108
105
|
},
|
|
109
106
|
getComment(id) {
|
|
110
|
-
|
|
111
|
-
return row === undefined ? undefined : toComment(row);
|
|
107
|
+
return getRow(statements.commentById, toComment, id);
|
|
112
108
|
},
|
|
113
109
|
listLatestCommentsExceptImportedFediverse(limit) {
|
|
114
|
-
return statements.latestComments
|
|
110
|
+
return allRows(statements.latestComments, toComment, limit);
|
|
115
111
|
},
|
|
116
112
|
countApprovedCommentsExceptImportedFediverseSince(since) {
|
|
117
|
-
|
|
118
|
-
return rows.map((row) => ({
|
|
113
|
+
return allRows(statements.approvedCommentCounts, (row) => ({
|
|
119
114
|
slug: String(row['slug']),
|
|
120
115
|
source: row['source'] === 'webmention' ? 'webmention' : 'comment',
|
|
121
116
|
count: Number(row['count']),
|
|
122
|
-
}));
|
|
117
|
+
}), since);
|
|
123
118
|
},
|
|
124
119
|
listCommentsAt(url) {
|
|
125
|
-
return statements.commentsAt
|
|
120
|
+
return allRows(statements.commentsAt, toComment, url);
|
|
126
121
|
},
|
|
127
122
|
countCommentsByStatus() {
|
|
128
|
-
|
|
129
|
-
return countByStatus(rows, COMMENT_STATUSES, commentStatus);
|
|
123
|
+
return countByStatus(statements.countCommentsByStatus.all(), COMMENT_STATUSES, commentStatus);
|
|
130
124
|
},
|
|
131
125
|
hasApprovedAuthor(name, email) {
|
|
132
126
|
// `IS` rather than `=`, so an author who gave no email is matched by the
|
|
@@ -134,19 +128,18 @@ export function openCommentStore(db, written) {
|
|
|
134
128
|
return statements.hasApprovedAuthor.get(name, email) !== undefined;
|
|
135
129
|
},
|
|
136
130
|
putComment(comment) {
|
|
137
|
-
const before = statements.commentById
|
|
131
|
+
const before = getRow(statements.commentById, (row) => row['status'], comment.id);
|
|
138
132
|
statements.putComment.run(...commentColumns(comment));
|
|
139
133
|
written({
|
|
140
134
|
kind: 'comment',
|
|
141
135
|
slug: comment.slug,
|
|
142
136
|
id: comment.id,
|
|
143
|
-
approved: comment.status === 'approved' && before
|
|
137
|
+
approved: comment.status === 'approved' && before !== 'approved',
|
|
144
138
|
});
|
|
145
139
|
return comment;
|
|
146
140
|
},
|
|
147
141
|
deleteComment(id) {
|
|
148
|
-
const
|
|
149
|
-
const slug = row === undefined ? undefined : String(row['slug']);
|
|
142
|
+
const slug = getRow(statements.commentById, (row) => String(row['slug']), id);
|
|
150
143
|
const deleted = statements.deleteComment.run(id).changes > 0;
|
|
151
144
|
if (slug !== undefined)
|
|
152
145
|
written({ kind: 'comment', slug, id, approved: false });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../src/store/comments.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAG/C,OAAO,
|
|
1
|
+
{"version":3,"file":"comments.js","sourceRoot":"","sources":["../../src/store/comments.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* What {@link ConversationEvents.onConversationWrite} hears: a comment on the post of
|
|
3
3
|
* that slug, or an activity naming these objects as what it is about or what
|
|
4
4
|
* it answers. `approved` says this write is the one that approved the comment,
|
|
5
|
-
* so it is on the page now and was not before
|
|
5
|
+
* so it is on the page now and was not before.
|
|
6
6
|
*/
|
|
7
7
|
export type ConversationWrite = {
|
|
8
8
|
readonly kind: 'comment';
|
|
@@ -16,7 +16,7 @@ export type ConversationWrite = {
|
|
|
16
16
|
export interface ConversationEvents {
|
|
17
17
|
/**
|
|
18
18
|
* Hear about every comment written or forgotten and every activity logged,
|
|
19
|
-
* as it happens
|
|
19
|
+
* as it happens. A rebuild of either index is not news and says
|
|
20
20
|
* nothing. Returns the function that stops listening.
|
|
21
21
|
*/
|
|
22
22
|
onConversationWrite(listener: (written: ConversationWrite) => void): () => void;
|
|
@@ -1,21 +1,22 @@
|
|
|
1
1
|
import type { DatabaseSync } from 'node:sqlite';
|
|
2
2
|
import type { Clock } from '../util/clock.ts';
|
|
3
3
|
/** How one delivery of one activity to one follower ended. */
|
|
4
|
-
export declare const DELIVERY_STATUSES: readonly ['sent', 'queued', 'failed'];
|
|
4
|
+
export declare const DELIVERY_STATUSES: readonly ['sent', 'queued', 'retrying', 'failed'];
|
|
5
5
|
/**
|
|
6
6
|
* One of {@link DELIVERY_STATUSES}.
|
|
7
7
|
*
|
|
8
8
|
* `sent` is a POST the follower's server accepted. `queued` is one handed to
|
|
9
|
-
* Fedify's outbox queue
|
|
10
|
-
*
|
|
11
|
-
* `failed` is a delivery
|
|
9
|
+
* Fedify's outbox queue and not yet settled. `retrying` is one whose last
|
|
10
|
+
* attempt failed, with that error, and which the queue will try again.
|
|
11
|
+
* `failed` is a delivery Fedify gave up on, or one that threw before it
|
|
12
|
+
* reached the queue, with the reason in the row.
|
|
12
13
|
*/
|
|
13
14
|
export type DeliveryStatus = (typeof DELIVERY_STATUSES)[number];
|
|
14
15
|
/**
|
|
15
16
|
* How one attempt to deliver one activity to one recipient ended, and what the
|
|
16
17
|
* activity was.
|
|
17
18
|
*
|
|
18
|
-
* The whole of what SQLite keeps about anything the site has sent
|
|
19
|
+
* The whole of what SQLite keeps about anything the site has sent.
|
|
19
20
|
* No payload goes with it: an activity is rebuilt from the post's file at the
|
|
20
21
|
* moment somebody asks for it to go again, so storing the bytes that went out
|
|
21
22
|
* last time would only be a second, staler answer to the same question. What
|
|
@@ -52,6 +53,12 @@ export interface Delivery {
|
|
|
52
53
|
/** When the attempt was made, as an ISO 8601 instant. */
|
|
53
54
|
readonly attemptedAt: string;
|
|
54
55
|
}
|
|
56
|
+
export interface DeliveryOutcome {
|
|
57
|
+
readonly activityId: string;
|
|
58
|
+
readonly inbox: string;
|
|
59
|
+
readonly status: DeliveryStatus;
|
|
60
|
+
readonly error: string | null;
|
|
61
|
+
}
|
|
55
62
|
/** A {@link Delivery} before the store has timed it. */
|
|
56
63
|
export type NewDelivery = Omit<Delivery, 'attemptedAt'> & {
|
|
57
64
|
attemptedAt?: string | undefined;
|
|
@@ -63,6 +70,7 @@ export interface DeliveryStore {
|
|
|
63
70
|
* with each follower", which a resend moves rather than adds to.
|
|
64
71
|
*/
|
|
65
72
|
recordDelivery(delivery: NewDelivery): Delivery;
|
|
73
|
+
settleDeliveries(outcome: DeliveryOutcome): void;
|
|
66
74
|
/** Every follower's outcome for one activity, in follower order. */
|
|
67
75
|
listDeliveries(activityId: string): Delivery[];
|
|
68
76
|
/** How many followers this activity stands at each status with. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.d.ts","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"deliveries.d.ts","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAK9C,8DAA8D;AAC9D,eAAO,MAAM,iBAAiB,YAAI,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,CAAU,CAAC;AAEnF;;;;;;;;GAQG;AACH,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,iBAAiB,CAAC,CAAC,MAAM,CAAC,CAAC;AAEhE;;;;;;;;;;;;;;GAcG;AACH,MAAM,WAAW,QAAQ;IACvB,iDAAiD;IACjD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,sCAAsC;IACtC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mDAAmD;IACnD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,kFAAkF;IAClF,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,mBAAmB;IACnB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,gCAAgC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,wDAAwD;AACxD,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,GAAG;IACxD,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B;;;;OAIG;IACH,cAAc,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,CAAC;IAChD,gBAAgB,CAAC,OAAO,EAAE,eAAe,GAAG,IAAI,CAAC;IACjD,oEAAoE;IACpE,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;IAC/C,mEAAmE;IACnE,uBAAuB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC5E;;;;;;;OAOG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC3D;;;;;;;;;OASG;IACH,oBAAoB,CAAC,QAAQ,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC7D,kEAAkE;IAClE,oBAAoB,IAAI,MAAM,EAAE,CAAC;IACjC,0BAA0B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CACnD;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,aAAa,CA0G/E"}
|
package/dist/store/deliveries.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { countByStatus, nullableText, oneOf } from './rows.js';
|
|
1
|
+
import { allRows, countByStatus, getRow, nullableText, oneOf, readCount } from './rows.js';
|
|
2
2
|
/** How one delivery of one activity to one follower ended. */
|
|
3
|
-
export const DELIVERY_STATUSES = ['sent', 'queued', 'failed'];
|
|
3
|
+
export const DELIVERY_STATUSES = ['sent', 'queued', 'retrying', 'failed'];
|
|
4
4
|
export function openDeliveryStore(db, clock) {
|
|
5
5
|
const statements = {
|
|
6
6
|
recordDelivery: db.prepare(`
|
|
@@ -18,6 +18,10 @@ export function openDeliveryStore(db, clock) {
|
|
|
18
18
|
error = excluded.error,
|
|
19
19
|
attempted_at = excluded.attempted_at
|
|
20
20
|
RETURNING *
|
|
21
|
+
`),
|
|
22
|
+
settleDeliveries: db.prepare(`
|
|
23
|
+
UPDATE ap_deliveries SET status = ?, error = ?, attempted_at = ?
|
|
24
|
+
WHERE activity_id = ? AND inbox_id = ?
|
|
21
25
|
`),
|
|
22
26
|
listDeliveries: db.prepare(`
|
|
23
27
|
SELECT * FROM ap_deliveries WHERE activity_id = ? ORDER BY actor_id
|
|
@@ -44,34 +48,32 @@ export function openDeliveryStore(db, clock) {
|
|
|
44
48
|
};
|
|
45
49
|
return {
|
|
46
50
|
recordDelivery(delivery) {
|
|
47
|
-
const
|
|
48
|
-
if (
|
|
51
|
+
const recorded = getRow(statements.recordDelivery, toDelivery, delivery.activityId, delivery.activityType, delivery.objectId, delivery.slug, delivery.actorId, delivery.inboxId, delivery.status, delivery.error, delivery.attemptedAt ?? clock().toISOString());
|
|
52
|
+
if (recorded === undefined) {
|
|
49
53
|
throw new Error(`The delivery of "${delivery.activityId}" to "${delivery.actorId}" was not recorded.`);
|
|
50
54
|
}
|
|
51
|
-
return
|
|
55
|
+
return recorded;
|
|
56
|
+
},
|
|
57
|
+
settleDeliveries(outcome) {
|
|
58
|
+
statements.settleDeliveries.run(outcome.status, outcome.error, clock().toISOString(), outcome.activityId, outcome.inbox);
|
|
52
59
|
},
|
|
53
60
|
listDeliveries(activityId) {
|
|
54
|
-
|
|
55
|
-
return rows.map(toDelivery);
|
|
61
|
+
return allRows(statements.listDeliveries, toDelivery, activityId);
|
|
56
62
|
},
|
|
57
63
|
countDeliveriesByStatus(activityId) {
|
|
58
|
-
|
|
59
|
-
return countByStatus(rows, DELIVERY_STATUSES, deliveryStatus);
|
|
64
|
+
return countByStatus(statements.countDeliveriesByStatus.all(activityId), DELIVERY_STATUSES, deliveryStatus);
|
|
60
65
|
},
|
|
61
66
|
lastDeliveryToInbox(inboxId) {
|
|
62
|
-
|
|
63
|
-
return row === undefined ? undefined : toDelivery(row);
|
|
67
|
+
return getRow(statements.lastDeliveryToInbox, toDelivery, inboxId);
|
|
64
68
|
},
|
|
65
69
|
lastDeliveryToObject(objectId) {
|
|
66
|
-
|
|
67
|
-
return row === undefined ? undefined : toDelivery(row);
|
|
70
|
+
return getRow(statements.lastDeliveryToObject, toDelivery, objectId);
|
|
68
71
|
},
|
|
69
72
|
listDeletedObjectIds() {
|
|
70
|
-
|
|
71
|
-
return rows.map((row) => row.object_id);
|
|
73
|
+
return allRows(statements.listDeletedObjectIds, (row) => String(row['object_id']));
|
|
72
74
|
},
|
|
73
75
|
countFailedDeliveriesSince(since) {
|
|
74
|
-
return
|
|
76
|
+
return readCount(statements.countFailedDeliveriesSince, since);
|
|
75
77
|
},
|
|
76
78
|
};
|
|
77
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,15 +6,15 @@ import type { ListPageOptions } from './rows.ts';
|
|
|
6
6
|
*
|
|
7
7
|
* The followers are irreplaceable — an actor that followed and was forgotten
|
|
8
8
|
* never hears from the site again and has no way of noticing — so
|
|
9
|
-
* `content/_data/federation/followers.json` is where they are kept
|
|
10
|
-
*
|
|
9
|
+
* `content/_data/federation/followers.json` is where they are kept,
|
|
10
|
+
* and this row is the index of that file, emptied and read back
|
|
11
11
|
* on every boot. The display columns are a copy of what the actor said about
|
|
12
12
|
* itself when it followed, so the admin can list its followers without
|
|
13
13
|
* dereferencing every one of them.
|
|
14
14
|
*/
|
|
15
15
|
export interface Follower {
|
|
16
16
|
/**
|
|
17
|
-
* Which user is followed
|
|
17
|
+
* Which user is followed.
|
|
18
18
|
*
|
|
19
19
|
* Every user is an actor with followers of their own, so a follower is only
|
|
20
20
|
* ever a follower *of somebody*: the column is what makes one person's
|
|
@@ -80,8 +80,8 @@ export interface FollowerStore {
|
|
|
80
80
|
/**
|
|
81
81
|
* Make the followers index say exactly this, in one transaction.
|
|
82
82
|
*
|
|
83
|
-
* What a rebuild from every `content/_data/federation/{username}/followers.json` calls
|
|
84
|
-
*
|
|
83
|
+
* What a rebuild from every `content/_data/federation/{username}/followers.json` calls:
|
|
84
|
+
* the file is the source, so a row it does not carry is a row
|
|
85
85
|
* that should not be delivered to, and replacing the lot is the only way to
|
|
86
86
|
* say that. Nothing outside a rebuild should reach for it.
|
|
87
87
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"followers.d.ts","sourceRoot":"","sources":["../../src/store/followers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,KAAK,EAAE,eAAe,
|
|
1
|
+
{"version":3,"file":"followers.d.ts","sourceRoot":"","sources":["../../src/store/followers.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,KAAK,EAAE,eAAe,EAAO,MAAM,WAAW,CAAC;AAEtD;;;;;;;;;;GAUG;AACH,MAAM,WAAW,QAAQ;IACvB;;;;;;;OAOG;IACH,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,sEAAsE;IACtE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,iEAAiE;IACjE,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB;;;;OAIG;IACH,QAAQ,CAAC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,yEAAyE;IACzE,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,uDAAuD;IACvD,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,qCAAqC;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,2EAA2E;IAC3E,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,uDAAuD;IACvD,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED;;;;;GAKG;AACH,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,GAAG;IACvD,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC,CAAC;AAEF,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,cAAc,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC1C;;;;;;;OAOG;IACH,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,QAAQ,EAAE,CAAC;IACxE,uDAAuD;IACvD,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,CAAC;IAErE;;;;OAIG;IACH,WAAW,CAAC,QAAQ,EAAE,WAAW,GAAG,QAAQ,CAAC;IAC7C,oFAAoF;IACpF,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3D;;;;;;;OAOG;IACH,gBAAgB,CAAC,SAAS,EAAE,SAAS,WAAW,EAAE,GAAG,IAAI,CAAC;CAC3D;AAED,wBAAgB,iBAAiB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,aAAa,CAmG/E"}
|
package/dist/store/followers.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { inTransaction, NO_LIMIT, nullableText } from './rows.js';
|
|
1
|
+
import { allRows, getRow, inTransaction, NO_LIMIT, nullableText, readCount } from './rows.js';
|
|
2
2
|
export function openFollowerStore(db, clock) {
|
|
3
3
|
const statements = {
|
|
4
4
|
// `?1 IS NULL` is how one statement answers both questions: naming a user
|
|
@@ -28,27 +28,24 @@ export function openFollowerStore(db, clock) {
|
|
|
28
28
|
};
|
|
29
29
|
return {
|
|
30
30
|
countFollowers(username) {
|
|
31
|
-
|
|
32
|
-
return Number(row?.['count'] ?? 0);
|
|
31
|
+
return readCount(statements.countFollowers, username ?? null);
|
|
33
32
|
},
|
|
34
33
|
listFollowers(username, options = {}) {
|
|
35
|
-
|
|
36
|
-
return rows.map(toFollower);
|
|
34
|
+
return allRows(statements.listFollowers, toFollower, username ?? null, options.limit ?? NO_LIMIT, options.offset ?? 0);
|
|
37
35
|
},
|
|
38
36
|
getFollower(username, actorId) {
|
|
39
|
-
|
|
40
|
-
return row === undefined ? undefined : toFollower(row);
|
|
37
|
+
return getRow(statements.followerById, toFollower, username, actorId);
|
|
41
38
|
},
|
|
42
39
|
putFollower(follower) {
|
|
43
40
|
statements.putFollower.run(follower.username, follower.actorId, follower.inboxId, follower.sharedInboxId, follower.handle, follower.name, follower.iconUrl, follower.url, follower.followedAt ?? clock().toISOString());
|
|
44
41
|
// Read back rather than returning what was written: the upsert leaves an
|
|
45
42
|
// existing `followed_at` alone, so the row is the only thing that knows
|
|
46
43
|
// when the follow really began.
|
|
47
|
-
const
|
|
48
|
-
if (
|
|
44
|
+
const stored = getRow(statements.followerById, toFollower, follower.username, follower.actorId);
|
|
45
|
+
if (stored === undefined) {
|
|
49
46
|
throw new Error(`The follower "${follower.actorId}" vanished between insert and read.`);
|
|
50
47
|
}
|
|
51
|
-
return
|
|
48
|
+
return stored;
|
|
52
49
|
},
|
|
53
50
|
deleteFollower(username, actorId) {
|
|
54
51
|
return statements.deleteFollower.run(username, actorId).changes > 0;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"followers.js","sourceRoot":"","sources":["../../src/store/followers.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"followers.js","sourceRoot":"","sources":["../../src/store/followers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* What a logged inbound activity means as a reply.
|
|
3
3
|
*
|
|
4
|
-
* The inbox keeps every `Create` it is sent whole
|
|
4
|
+
* The inbox keeps every `Create` it is sent whole, and a reply is
|
|
5
5
|
* simply one whose object answers something: `inReplyTo` naming a post's
|
|
6
6
|
* ActivityStreams object id. Everything the comments feeds show is read back
|
|
7
7
|
* out of that stored JSON-LD rather than out of columns, so the index can be
|
|
8
|
-
* thrown away and rebuilt from the
|
|
8
|
+
* thrown away and rebuilt from the inbox log files.
|
|
9
9
|
*/
|
|
10
10
|
import type { InboxActivity } from './admin-store.ts';
|
|
11
11
|
/** The activity type a reply arrives as. A comment is a note somebody created. */
|
|
@@ -71,7 +71,7 @@ export declare function quoteFrom(activity: InboxActivity): Quote | undefined;
|
|
|
71
71
|
*
|
|
72
72
|
* A guess, and the last resort: a follower is named from the profile it
|
|
73
73
|
* published when it followed, and anybody else from the profile the site
|
|
74
|
-
* fetched when they were first heard from
|
|
74
|
+
* fetched when they were first heard from. This is for an actor
|
|
75
75
|
* neither of those knows yet.
|
|
76
76
|
*
|
|
77
77
|
* An id whose last segment is a number implies nothing. A current Mastodon
|
|
@@ -99,7 +99,7 @@ export declare function replyTargetOf(json: string): string | null;
|
|
|
99
99
|
/**
|
|
100
100
|
* The id of the note a logged activity delivers as a reply, or `null` when it
|
|
101
101
|
* delivers none: what {@link replyFrom} names the reply, worked out from what
|
|
102
|
-
* a row stores so the admin store can index its `/replies/` key
|
|
102
|
+
* a row stores so the admin store can index its `/replies/` key.
|
|
103
103
|
*/
|
|
104
104
|
export declare function replyIdOf(activity: Pick<InboxActivity, 'activityType' | 'objectId' | 'json'>): string | null;
|
|
105
105
|
/**
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* What a logged inbound activity means as a reply.
|
|
3
3
|
*
|
|
4
|
-
* The inbox keeps every `Create` it is sent whole
|
|
4
|
+
* The inbox keeps every `Create` it is sent whole, and a reply is
|
|
5
5
|
* simply one whose object answers something: `inReplyTo` naming a post's
|
|
6
6
|
* ActivityStreams object id. Everything the comments feeds show is read back
|
|
7
7
|
* out of that stored JSON-LD rather than out of columns, so the index can be
|
|
8
|
-
* thrown away and rebuilt from the
|
|
8
|
+
* thrown away and rebuilt from the inbox log files.
|
|
9
9
|
*/
|
|
10
10
|
import { isRecord } from '../util/guards.js';
|
|
11
11
|
/** The activity type a reply arrives as. A comment is a note somebody created. */
|
|
@@ -84,7 +84,7 @@ function noteFrom(activity) {
|
|
|
84
84
|
*
|
|
85
85
|
* A guess, and the last resort: a follower is named from the profile it
|
|
86
86
|
* published when it followed, and anybody else from the profile the site
|
|
87
|
-
* fetched when they were first heard from
|
|
87
|
+
* fetched when they were first heard from. This is for an actor
|
|
88
88
|
* neither of those knows yet.
|
|
89
89
|
*
|
|
90
90
|
* An id whose last segment is a number implies nothing. A current Mastodon
|
|
@@ -142,7 +142,7 @@ export function replyTargetOf(json) {
|
|
|
142
142
|
/**
|
|
143
143
|
* The id of the note a logged activity delivers as a reply, or `null` when it
|
|
144
144
|
* delivers none: what {@link replyFrom} names the reply, worked out from what
|
|
145
|
-
* a row stores so the admin store can index its `/replies/` key
|
|
145
|
+
* a row stores so the admin store can index its `/replies/` key.
|
|
146
146
|
*/
|
|
147
147
|
export function replyIdOf(activity) {
|
|
148
148
|
if (activity.activityType !== REPLY_ACTIVITY_TYPE)
|