@geekity/cms 0.36.1 → 0.38.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/components/admin-bar.njk +1 -2
- package/admin/components/blocks.njk +250 -0
- package/admin/components/card.njk +8 -4
- package/admin/layouts/base.njk +1 -1
- package/admin/pages/comments/all.njk +1 -1
- package/admin/pages/dashboard/home.njk +33 -32
- package/admin/pages/documents/editor.njk +6 -6
- package/admin/pages/federation/followers.njk +2 -2
- package/admin/pages/media/file.njk +1 -1
- package/admin/pages/media/library.njk +4 -4
- package/admin/pages/plugins/add.njk +46 -0
- package/admin/pages/plugins/installed.njk +5 -32
- package/admin/pages/plugins/screen.njk +5 -35
- package/admin/pages/settings/general.njk +1 -1
- package/admin/pages/tools/export.njk +1 -1
- package/admin/pages/tools/maintenance.njk +1 -1
- package/admin/pages/users/edit.njk +1 -1
- package/admin/static/admin.css +300 -0
- package/dist/admin/admin-bar.js +1 -2
- package/dist/admin/admin-bar.js.map +1 -1
- package/dist/admin/blocks.d.ts +133 -0
- package/dist/admin/blocks.d.ts.map +1 -0
- package/dist/admin/blocks.js +454 -0
- package/dist/admin/blocks.js.map +1 -0
- package/dist/admin/core-widgets.d.ts +3 -0
- package/dist/admin/core-widgets.d.ts.map +1 -0
- package/dist/admin/core-widgets.js +17 -0
- package/dist/admin/core-widgets.js.map +1 -0
- package/dist/admin/engagement.d.ts +16 -0
- package/dist/admin/engagement.d.ts.map +1 -0
- package/dist/admin/engagement.js +38 -0
- package/dist/admin/engagement.js.map +1 -0
- package/dist/admin/federation.d.ts +2 -0
- package/dist/admin/federation.d.ts.map +1 -1
- package/dist/admin/federation.js +2 -1
- package/dist/admin/federation.js.map +1 -1
- package/dist/admin/formatting.d.ts +1 -0
- package/dist/admin/formatting.d.ts.map +1 -1
- package/dist/admin/formatting.js +18 -0
- package/dist/admin/formatting.js.map +1 -1
- package/dist/admin/index.d.ts +1 -1
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/plugins.d.ts.map +1 -1
- package/dist/admin/plugins.js +27 -13
- package/dist/admin/plugins.js.map +1 -1
- package/dist/admin/posts-by-path.d.ts +11 -0
- package/dist/admin/posts-by-path.d.ts.map +1 -0
- package/dist/admin/posts-by-path.js +59 -0
- package/dist/admin/posts-by-path.js.map +1 -0
- package/dist/admin/routes.d.ts +0 -2
- package/dist/admin/routes.d.ts.map +1 -1
- package/dist/admin/routes.js +23 -13
- package/dist/admin/routes.js.map +1 -1
- package/dist/admin/templates.d.ts +6 -0
- package/dist/admin/templates.d.ts.map +1 -1
- package/dist/admin/templates.js +14 -0
- package/dist/admin/templates.js.map +1 -1
- package/dist/admin/tools.js +1 -1
- package/dist/admin/tools.js.map +1 -1
- package/dist/admin/widget-fediverse.d.ts +3 -0
- package/dist/admin/widget-fediverse.d.ts.map +1 -0
- package/dist/admin/widget-fediverse.js +49 -0
- package/dist/admin/widget-fediverse.js.map +1 -0
- package/dist/admin/widget-followers.d.ts +3 -0
- package/dist/admin/widget-followers.d.ts.map +1 -0
- package/dist/admin/widget-followers.js +37 -0
- package/dist/admin/widget-followers.js.map +1 -0
- package/dist/admin/widget-health.d.ts +3 -0
- package/dist/admin/widget-health.d.ts.map +1 -0
- package/dist/admin/widget-health.js +103 -0
- package/dist/admin/widget-health.js.map +1 -0
- package/dist/admin/widget-interactions.d.ts +4 -0
- package/dist/admin/widget-interactions.d.ts.map +1 -0
- package/dist/admin/widget-interactions.js +99 -0
- package/dist/admin/widget-interactions.js.map +1 -0
- package/dist/admin/widget-posting.d.ts +3 -0
- package/dist/admin/widget-posting.d.ts.map +1 -0
- package/dist/admin/widget-posting.js +111 -0
- package/dist/admin/widget-posting.js.map +1 -0
- package/dist/admin/widget-scheduled.d.ts +4 -0
- package/dist/admin/widget-scheduled.d.ts.map +1 -0
- package/dist/admin/widget-scheduled.js +30 -0
- package/dist/admin/widget-scheduled.js.map +1 -0
- package/dist/admin/widget-top-posts.d.ts +4 -0
- package/dist/admin/widget-top-posts.d.ts.map +1 -0
- package/dist/admin/widget-top-posts.js +55 -0
- package/dist/admin/widget-top-posts.js.map +1 -0
- package/dist/admin/widgets.d.ts +35 -0
- package/dist/admin/widgets.d.ts.map +1 -0
- package/dist/admin/widgets.js +103 -0
- package/dist/admin/widgets.js.map +1 -0
- package/dist/cms/app.d.ts.map +1 -1
- package/dist/cms/app.js +2 -1
- package/dist/cms/app.js.map +1 -1
- package/dist/cms/boot.d.ts.map +1 -1
- package/dist/cms/boot.js +3 -2
- package/dist/cms/boot.js.map +1 -1
- package/dist/cms/server-error.d.ts.map +1 -1
- package/dist/cms/server-error.js +1 -2
- package/dist/cms/server-error.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +19 -0
- package/dist/cms/services.js.map +1 -1
- package/dist/content/alt-text.d.ts +1 -0
- package/dist/content/alt-text.d.ts.map +1 -1
- package/dist/content/alt-text.js +26 -1
- package/dist/content/alt-text.js.map +1 -1
- package/dist/content/sqlite/catalog.d.ts.map +1 -1
- package/dist/content/sqlite/catalog.js +15 -2
- package/dist/content/sqlite/catalog.js.map +1 -1
- package/dist/content/store.d.ts +10 -0
- package/dist/content/store.d.ts.map +1 -1
- package/dist/content/store.js.map +1 -1
- package/dist/content/write.d.ts.map +1 -1
- package/dist/content/write.js +3 -1
- package/dist/content/write.js.map +1 -1
- package/dist/federation/backfill.d.ts +1 -1
- package/dist/federation/backfill.d.ts.map +1 -1
- package/dist/federation/backfill.js +5 -1
- package/dist/federation/backfill.js.map +1 -1
- package/dist/federation/follower-history.d.ts +16 -0
- package/dist/federation/follower-history.d.ts.map +1 -0
- package/dist/federation/follower-history.js +61 -0
- package/dist/federation/follower-history.js.map +1 -0
- package/dist/federation/inbox.d.ts.map +1 -1
- package/dist/federation/inbox.js +2 -1
- package/dist/federation/inbox.js.map +1 -1
- package/dist/federation/records.d.ts +1 -0
- package/dist/federation/records.d.ts.map +1 -1
- package/dist/federation/records.js +24 -6
- package/dist/federation/records.js.map +1 -1
- package/dist/files/data-files.d.ts +1 -0
- package/dist/files/data-files.d.ts.map +1 -1
- package/dist/files/data-files.js +6 -0
- package/dist/files/data-files.js.map +1 -1
- package/dist/jobs/queue.d.ts.map +1 -1
- package/dist/jobs/queue.js +5 -0
- package/dist/jobs/queue.js.map +1 -1
- package/dist/jobs/types.d.ts +7 -0
- package/dist/jobs/types.d.ts.map +1 -1
- package/dist/jobs/types.js.map +1 -1
- package/dist/plugin.d.ts +275 -21
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +9 -8
- package/dist/plugin.js.map +1 -1
- package/dist/plugins/fetch.d.ts +0 -5
- package/dist/plugins/fetch.d.ts.map +1 -1
- package/dist/plugins/fetch.js +31 -7
- package/dist/plugins/fetch.js.map +1 -1
- package/dist/plugins/host-api.d.ts +3 -0
- package/dist/plugins/host-api.d.ts.map +1 -0
- package/dist/plugins/host-api.js +8 -0
- package/dist/plugins/host-api.js.map +1 -0
- package/dist/plugins/install.d.ts.map +1 -1
- package/dist/plugins/install.js +4 -2
- package/dist/plugins/install.js.map +1 -1
- package/dist/plugins/page-tags.d.ts +8 -0
- package/dist/plugins/page-tags.d.ts.map +1 -0
- package/dist/plugins/page-tags.js +73 -0
- package/dist/plugins/page-tags.js.map +1 -0
- package/dist/plugins/registry.d.ts +4 -1
- package/dist/plugins/registry.d.ts.map +1 -1
- package/dist/plugins/registry.js +50 -9
- package/dist/plugins/registry.js.map +1 -1
- package/dist/plugins/site.js +1 -1
- package/dist/plugins/site.js.map +1 -1
- package/dist/store/admin-store.d.ts +2 -2
- package/dist/store/admin-store.d.ts.map +1 -1
- package/dist/store/admin-store.js.map +1 -1
- package/dist/store/comments.d.ts +7 -0
- package/dist/store/comments.d.ts.map +1 -1
- package/dist/store/comments.js +21 -0
- package/dist/store/comments.js.map +1 -1
- package/dist/store/deliveries.d.ts +1 -0
- package/dist/store/deliveries.d.ts.map +1 -1
- package/dist/store/deliveries.js +6 -0
- package/dist/store/deliveries.js.map +1 -1
- package/dist/store/inbox.d.ts +16 -0
- package/dist/store/inbox.d.ts.map +1 -1
- package/dist/store/inbox.js +62 -0
- package/dist/store/inbox.js.map +1 -1
- package/dist/store/queue-database.d.ts +6 -0
- package/dist/store/queue-database.d.ts.map +1 -1
- package/dist/store/queue-database.js +16 -1
- package/dist/store/queue-database.js.map +1 -1
- package/dist/store/webmentions.d.ts +1 -0
- package/dist/store/webmentions.d.ts.map +1 -1
- package/dist/store/webmentions.js +6 -0
- package/dist/store/webmentions.js.map +1 -1
- package/dist/web/env.d.ts +3 -0
- package/dist/web/env.d.ts.map +1 -1
- package/dist/web/feed-item.d.ts +4 -3
- package/dist/web/feed-item.d.ts.map +1 -1
- package/dist/web/feed-item.js +8 -2
- package/dist/web/feed-item.js.map +1 -1
- package/dist/web/listing-pages.d.ts.map +1 -1
- package/dist/web/listing-pages.js +7 -2
- package/dist/web/listing-pages.js.map +1 -1
- package/dist/web/page-tags.d.ts +4 -0
- package/dist/web/page-tags.d.ts.map +1 -0
- package/dist/web/page-tags.js +39 -0
- package/dist/web/page-tags.js.map +1 -0
- package/dist/web/render.d.ts +2 -0
- package/dist/web/render.d.ts.map +1 -1
- package/dist/web/render.js +14 -0
- package/dist/web/render.js.map +1 -1
- package/dist/web/routes.d.ts +2 -1
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +3 -1
- package/dist/web/routes.js.map +1 -1
- package/package.json +12 -12
- package/themes/default/layouts/base.njk +6 -4
|
@@ -89,6 +89,7 @@ export interface DeliveryStore {
|
|
|
89
89
|
lastDeliveryToObject(objectId: string): Delivery | undefined;
|
|
90
90
|
/** Every object id a `Delete` was ever recorded going out for. */
|
|
91
91
|
listDeletedObjectIds(): string[];
|
|
92
|
+
countFailedDeliveriesSince(since: string): number;
|
|
92
93
|
}
|
|
93
94
|
export declare function openDeliveryStore(db: DatabaseSync, clock: Clock): DeliveryStore;
|
|
94
95
|
//# sourceMappingURL=deliveries.d.ts.map
|
|
@@ -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;AAI9C,8DAA8D;AAC9D,eAAO,MAAM,iBAAiB,YAAI,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAC;AAEvE;;;;;;;GAOG;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,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,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;
|
|
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;AAI9C,8DAA8D;AAC9D,eAAO,MAAM,iBAAiB,YAAI,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAC;AAEvE;;;;;;;GAOG;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,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,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,CA6F/E"}
|
package/dist/store/deliveries.js
CHANGED
|
@@ -37,6 +37,9 @@ export function openDeliveryStore(db, clock) {
|
|
|
37
37
|
`),
|
|
38
38
|
listDeletedObjectIds: db.prepare(`
|
|
39
39
|
SELECT DISTINCT object_id FROM ap_deliveries WHERE activity_type = 'Delete' ORDER BY object_id
|
|
40
|
+
`),
|
|
41
|
+
countFailedDeliveriesSince: db.prepare(`
|
|
42
|
+
SELECT COUNT(*) AS count FROM ap_deliveries WHERE status = 'failed' AND attempted_at >= ?
|
|
40
43
|
`),
|
|
41
44
|
};
|
|
42
45
|
return {
|
|
@@ -67,6 +70,9 @@ export function openDeliveryStore(db, clock) {
|
|
|
67
70
|
const rows = statements.listDeletedObjectIds.all();
|
|
68
71
|
return rows.map((row) => row.object_id);
|
|
69
72
|
},
|
|
73
|
+
countFailedDeliveriesSince(since) {
|
|
74
|
+
return Number(statements.countFailedDeliveriesSince.get(since)?.['count'] ?? 0);
|
|
75
|
+
},
|
|
70
76
|
};
|
|
71
77
|
}
|
|
72
78
|
function toDelivery(row) {
|
|
@@ -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;AAE/D,8DAA8D;AAC9D,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"deliveries.js","sourceRoot":"","sources":["../../src/store/deliveries.ts"],"names":[],"mappings":"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"}
|
package/dist/store/inbox.d.ts
CHANGED
|
@@ -75,6 +75,19 @@ export type NewInboxActivity = Omit<InboxActivity, 'id' | 'receivedAt' | 'inRepl
|
|
|
75
75
|
*/
|
|
76
76
|
recipient?: string | null | undefined;
|
|
77
77
|
};
|
|
78
|
+
export interface InboxInteraction {
|
|
79
|
+
readonly kind: 'like' | 'boost' | 'reply';
|
|
80
|
+
readonly receivedAt: string;
|
|
81
|
+
}
|
|
82
|
+
export interface LatestInteraction extends InboxInteraction {
|
|
83
|
+
readonly actorId: string;
|
|
84
|
+
readonly about: string | null;
|
|
85
|
+
}
|
|
86
|
+
export interface InteractionCount {
|
|
87
|
+
readonly kind: InboxInteraction['kind'];
|
|
88
|
+
readonly about: string | null;
|
|
89
|
+
readonly count: number;
|
|
90
|
+
}
|
|
78
91
|
export interface InboxStore {
|
|
79
92
|
/** How many activities the inbound log holds. */
|
|
80
93
|
countInboxActivities(): number;
|
|
@@ -125,6 +138,9 @@ export interface InboxStore {
|
|
|
125
138
|
listActivitiesAbout(objectIds: readonly string[]): InboxActivity[];
|
|
126
139
|
/** The logged replies whose note's id has this `/replies/` key (TASK-327). */
|
|
127
140
|
listRepliesByKey(key: string): InboxActivity[];
|
|
141
|
+
listInteractionsSince(since: string): InboxInteraction[];
|
|
142
|
+
listLatestInteractions(limit: number): LatestInteraction[];
|
|
143
|
+
countInteractionsSince(since: string): InteractionCount[];
|
|
128
144
|
}
|
|
129
145
|
export declare function openInboxStore(db: DatabaseSync, written: (change: ConversationWrite) => void, clock: Clock): InboxStore;
|
|
130
146
|
/** The `/replies/` key of a logged reply's note, or `null` for anything else. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/store/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAuB,SAAS,EAAiB,MAAM,oBAAoB,CAAC;AACnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AASjD;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,mBAAmB;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC;;;;;;;OAOG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,+CAA+C;IAC/C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,qEAAqE;IACrE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,aAAa,EACb,IAAI,GAAG,YAAY,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAC5D,GAAG;IACF,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,2CAA2C;IAC3C,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,UAAU;IACzB,iDAAiD;IACjD,oBAAoB,IAAI,MAAM,CAAC;IAC/B,oEAAoE;IACpE,mBAAmB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAAC;IAChE;;;;;OAKG;IACH,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,aAAa,CAAC;IAC5D,qFAAqF;IACrF,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACzC;;;;;;;;;OASG;IACH,sBAAsB,CAAC,UAAU,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtE,iEAAiE;IACjE,YAAY,IAAI,MAAM,CAAC;IACvB,qEAAqE;IACrE,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAAC;IACxD,uEAAuE;IACvE,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,uEAAuE;IACvE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAAC;IAC5E;;;;;;;;;;;;;OAaG;IACH,mBAAmB,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAEnE,8EAA8E;IAC9E,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"inbox.d.ts","sourceRoot":"","sources":["../../src/store/inbox.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAG9C,OAAO,EAAuB,SAAS,EAAiB,MAAM,oBAAoB,CAAC;AACnF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AASjD;;;;;;;;GAQG;AACH,MAAM,WAAW,aAAa;IAC5B,mDAAmD;IACnD,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,yEAAyE;IACzE,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,6EAA6E;IAC7E,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,mBAAmB;IACnB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,oFAAoF;IACpF,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC;;;;;;;OAOG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC;;;;;;;;OAQG;IACH,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,+CAA+C;IAC/C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B;;;;;OAKG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,qEAAqE;IACrE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED;;;;;;;;GAQG;AACH,MAAM,MAAM,gBAAgB,GAAG,IAAI,CACjC,aAAa,EACb,IAAI,GAAG,YAAY,GAAG,WAAW,GAAG,WAAW,GAAG,SAAS,CAC5D,GAAG;IACF,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,2CAA2C;IAC3C,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IAC9B;;;;;OAKG;IACH,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,GAAG,OAAO,CAAC;IAC1C,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAkB,SAAQ,gBAAgB;IACzD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAsBD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACxB;AAQD,MAAM,WAAW,UAAU;IACzB,iDAAiD;IACjD,oBAAoB,IAAI,MAAM,CAAC;IAC/B,oEAAoE;IACpE,mBAAmB,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAAC;IAChE;;;;;OAKG;IACH,gBAAgB,CAAC,QAAQ,EAAE,gBAAgB,GAAG,aAAa,CAAC;IAC5D,qFAAqF;IACrF,mBAAmB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC;IACzC;;;;;;;;;OASG;IACH,sBAAsB,CAAC,UAAU,EAAE,SAAS,gBAAgB,EAAE,GAAG,IAAI,CAAC;IACtE,iEAAiE;IACjE,YAAY,IAAI,MAAM,CAAC;IACvB,qEAAqE;IACrE,WAAW,CAAC,OAAO,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAAC;IACxD,uEAAuE;IACvE,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAAC;IACzC,uEAAuE;IACvE,aAAa,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,eAAe,GAAG,aAAa,EAAE,CAAC;IAC5E;;;;;;;;;;;;;OAaG;IACH,mBAAmB,CAAC,SAAS,EAAE,SAAS,MAAM,EAAE,GAAG,aAAa,EAAE,CAAC;IAEnE,8EAA8E;IAC9E,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/C,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAC;IAEzD,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,EAAE,CAAC;IAE3D,sBAAsB,CAAC,KAAK,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAAC;CAC3D;AAED,wBAAgB,cAAc,CAC5B,EAAE,EAAE,YAAY,EAChB,OAAO,EAAE,CAAC,MAAM,EAAE,iBAAiB,KAAK,IAAI,EAC5C,KAAK,EAAE,KAAK,GACX,UAAU,CA4MZ;AAyBD,iFAAiF;AACjF,wBAAgB,UAAU,CAAC,QAAQ,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,IAAI,CAGnF"}
|
package/dist/store/inbox.js
CHANGED
|
@@ -7,6 +7,30 @@ import { inTransaction, NO_LIMIT, nullableText } from './rows.js';
|
|
|
7
7
|
* would show a post a number no page of comments could produce.
|
|
8
8
|
*/
|
|
9
9
|
const IS_REPLY = `activity_type = '${REPLY_ACTIVITY_TYPE}' AND in_reply_to IS NOT NULL`;
|
|
10
|
+
const INTERACTIONS = `
|
|
11
|
+
SELECT activity_type, actor_id,
|
|
12
|
+
CASE WHEN activity_type = '${REPLY_ACTIVITY_TYPE}' THEN in_reply_to ELSE object_id END AS about,
|
|
13
|
+
MIN(received_at) AS received_at
|
|
14
|
+
FROM ap_inbox AS said
|
|
15
|
+
WHERE received_at >= ?
|
|
16
|
+
AND (activity_type IN ('Like', 'Announce') OR (${IS_REPLY}))
|
|
17
|
+
AND NOT EXISTS (
|
|
18
|
+
SELECT 1 FROM ap_inbox AS taken
|
|
19
|
+
WHERE taken.actor_id = said.actor_id
|
|
20
|
+
AND (
|
|
21
|
+
(taken.activity_type = 'Undo' AND taken.object_id = said.activity_id)
|
|
22
|
+
OR (taken.activity_type = 'Delete' AND said.activity_type = '${REPLY_ACTIVITY_TYPE}'
|
|
23
|
+
AND taken.object_id = said.object_id)
|
|
24
|
+
)
|
|
25
|
+
)
|
|
26
|
+
GROUP BY activity_type,
|
|
27
|
+
CASE WHEN activity_type = '${REPLY_ACTIVITY_TYPE}' THEN NULL ELSE actor_id END,
|
|
28
|
+
object_id`;
|
|
29
|
+
const INTERACTION_KINDS = {
|
|
30
|
+
Like: 'like',
|
|
31
|
+
Announce: 'boost',
|
|
32
|
+
[REPLY_ACTIVITY_TYPE]: 'reply',
|
|
33
|
+
};
|
|
10
34
|
export function openInboxStore(db, written, clock) {
|
|
11
35
|
const statements = {
|
|
12
36
|
clearInboxActivities: db.prepare('DELETE FROM ap_inbox'),
|
|
@@ -51,6 +75,12 @@ export function openInboxStore(db, written, clock) {
|
|
|
51
75
|
`),
|
|
52
76
|
repliesByKey: db.prepare(`
|
|
53
77
|
SELECT * FROM ap_inbox WHERE ${IS_REPLY} AND reply_key = ? ORDER BY received_at, id
|
|
78
|
+
`),
|
|
79
|
+
interactionsSince: db.prepare(`${INTERACTIONS} ORDER BY received_at`),
|
|
80
|
+
latestInteractions: db.prepare(`${INTERACTIONS} ORDER BY received_at DESC LIMIT ?`),
|
|
81
|
+
interactionCounts: db.prepare(`
|
|
82
|
+
SELECT activity_type, about, COUNT(*) AS count FROM (${INTERACTIONS})
|
|
83
|
+
GROUP BY activity_type, about
|
|
54
84
|
`),
|
|
55
85
|
};
|
|
56
86
|
return {
|
|
@@ -126,6 +156,38 @@ export function openInboxStore(db, written, clock) {
|
|
|
126
156
|
listRepliesByKey(key) {
|
|
127
157
|
return statements.repliesByKey.all(key).map(toInboxActivity);
|
|
128
158
|
},
|
|
159
|
+
listInteractionsSince(since) {
|
|
160
|
+
const rows = statements.interactionsSince.all(since);
|
|
161
|
+
return rows.flatMap((row) => {
|
|
162
|
+
const kind = INTERACTION_KINDS[String(row['activity_type'])];
|
|
163
|
+
return kind === undefined ? [] : [{ kind, receivedAt: String(row['received_at']) }];
|
|
164
|
+
});
|
|
165
|
+
},
|
|
166
|
+
listLatestInteractions(limit) {
|
|
167
|
+
const rows = statements.latestInteractions.all('', limit);
|
|
168
|
+
return rows.flatMap((row) => {
|
|
169
|
+
const kind = INTERACTION_KINDS[String(row['activity_type'])];
|
|
170
|
+
return kind === undefined
|
|
171
|
+
? []
|
|
172
|
+
: [
|
|
173
|
+
{
|
|
174
|
+
kind,
|
|
175
|
+
actorId: String(row['actor_id']),
|
|
176
|
+
about: nullableText(row['about']),
|
|
177
|
+
receivedAt: String(row['received_at']),
|
|
178
|
+
},
|
|
179
|
+
];
|
|
180
|
+
});
|
|
181
|
+
},
|
|
182
|
+
countInteractionsSince(since) {
|
|
183
|
+
const rows = statements.interactionCounts.all(since);
|
|
184
|
+
return rows.flatMap((row) => {
|
|
185
|
+
const kind = INTERACTION_KINDS[String(row['activity_type'])];
|
|
186
|
+
return kind === undefined
|
|
187
|
+
? []
|
|
188
|
+
: [{ kind, about: nullableText(row['about']), count: Number(row['count']) }];
|
|
189
|
+
});
|
|
190
|
+
},
|
|
129
191
|
};
|
|
130
192
|
}
|
|
131
193
|
function toInboxActivity(row) {
|
package/dist/store/inbox.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../src/store/inbox.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAGlE;;;;GAIG;AACH,MAAM,QAAQ,GAAG,oBAAoB,mBAAmB,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"inbox.js","sourceRoot":"","sources":["../../src/store/inbox.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,4 +8,10 @@ export declare function queueFile(dataDir: string): string;
|
|
|
8
8
|
*/
|
|
9
9
|
export declare function openQueueDatabase(dataDir: string): DatabaseSync;
|
|
10
10
|
export declare function countWaitingMessages(dataDir: string): number;
|
|
11
|
+
/**
|
|
12
|
+
* How many deliveries first tried at or after `since` wait in the queue for a
|
|
13
|
+
* retry: Fedify puts an outbox message back with its attempt raised after a
|
|
14
|
+
* failure, and takes it out for good once the inbox accepts it.
|
|
15
|
+
*/
|
|
16
|
+
export declare function countRetryingDeliveries(dataDir: string, since: string): number;
|
|
11
17
|
//# sourceMappingURL=queue-database.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"queue-database.d.ts","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAI3C,eAAO,MAAM,sBAAsB,wBAAwB,CAAC;AAI5D,wBAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;GAIG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,YAAY,CAM/D;AAED,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;GAIG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAQ9E"}
|
|
@@ -19,6 +19,19 @@ export function openQueueDatabase(dataDir) {
|
|
|
19
19
|
return new DatabaseSync(file, { timeout: BUSY_TIMEOUT_MS });
|
|
20
20
|
}
|
|
21
21
|
export function countWaitingMessages(dataDir) {
|
|
22
|
+
return countMessages(dataDir, '', []);
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* How many deliveries first tried at or after `since` wait in the queue for a
|
|
26
|
+
* retry: Fedify puts an outbox message back with its attempt raised after a
|
|
27
|
+
* failure, and takes it out for good once the inbox accepts it.
|
|
28
|
+
*/
|
|
29
|
+
export function countRetryingDeliveries(dataDir, since) {
|
|
30
|
+
return countMessages(dataDir, `WHERE json_extract(message, '$.type') = 'outbox'
|
|
31
|
+
AND json_extract(message, '$.attempt') >= 1
|
|
32
|
+
AND json_extract(message, '$.started') >= ?`, [since]);
|
|
33
|
+
}
|
|
34
|
+
function countMessages(dataDir, where, values) {
|
|
22
35
|
const file = queueFile(dataDir);
|
|
23
36
|
if (!existsSync(file))
|
|
24
37
|
return 0;
|
|
@@ -29,7 +42,9 @@ export function countWaitingMessages(dataDir) {
|
|
|
29
42
|
.get(FEDERATION_QUEUE_TABLE);
|
|
30
43
|
if (table === undefined)
|
|
31
44
|
return 0;
|
|
32
|
-
const row = db
|
|
45
|
+
const row = db
|
|
46
|
+
.prepare(`SELECT count(*) AS waiting FROM ${FEDERATION_QUEUE_TABLE} ${where}`)
|
|
47
|
+
.get(...values);
|
|
33
48
|
return Number(row?.['waiting'] ?? 0);
|
|
34
49
|
}
|
|
35
50
|
finally {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;AAE5D,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvB,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAChF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,EAAE;aACb,OAAO,CAAC,kEAAkE,CAAC;aAC3E,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"queue-database.js","sourceRoot":"","sources":["../../src/store/queue-database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,CAAC,MAAM,sBAAsB,GAAG,qBAAqB,CAAC;AAE5D,MAAM,eAAe,GAAG,IAAI,CAAC;AAE7B,MAAM,UAAU,SAAS,CAAC,OAAe;IACvC,OAAO,QAAQ,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,OAAe;IAC/C,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;IACtC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACvB,OAAO,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,aAAa,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;AACxC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,uBAAuB,CAAC,OAAe,EAAE,KAAa;IACpE,OAAO,aAAa,CAClB,OAAO,EACP;;mDAE+C,EAC/C,CAAC,KAAK,CAAC,CACR,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,OAAe,EAAE,KAAa,EAAE,MAAyB;IAC9E,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;IAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;QAAE,OAAO,CAAC,CAAC;IAChC,MAAM,EAAE,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAChF,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,EAAE;aACb,OAAO,CAAC,kEAAkE,CAAC;aAC3E,GAAG,CAAC,sBAAsB,CAAC,CAAC;QAC/B,IAAI,KAAK,KAAK,SAAS;YAAE,OAAO,CAAC,CAAC;QAClC,MAAM,GAAG,GAAG,EAAE;aACX,OAAO,CAAC,mCAAmC,sBAAsB,IAAI,KAAK,EAAE,CAAC;aAC7E,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;QAClB,OAAO,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;IACvC,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;AACH,CAAC"}
|
|
@@ -61,6 +61,7 @@ export interface WebmentionStore {
|
|
|
61
61
|
* target, the later attempt is the one kept.
|
|
62
62
|
*/
|
|
63
63
|
moveSentWebmentions(from: Pick<SentWebmention, 'slug' | 'source'>, to: string): void;
|
|
64
|
+
countFailedWebmentionsSince(since: string): number;
|
|
64
65
|
}
|
|
65
66
|
export declare function openWebmentionStore(db: DatabaseSync, clock: Clock): WebmentionStore;
|
|
66
67
|
//# sourceMappingURL=webmentions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webmentions.d.ts","sourceRoot":"","sources":["../../src/store/webmentions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAI9C,2DAA2D;AAC3D,eAAO,MAAM,wBAAwB,YAAI,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAE5E;;;;;;;;GAQG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7E;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB;IACnB,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,gCAAgC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,8DAA8D;AAC9D,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG;IACpE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC;IAC9D,wEAAwE;IACxE,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAAC;IACpD,2DAA2D;IAC3D,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjF,oEAAoE;IACpE,yBAAyB,IAAI,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC;IACvE;;;;OAIG;IACH,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"webmentions.d.ts","sourceRoot":"","sources":["../../src/store/webmentions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAI9C,2DAA2D;AAC3D,eAAO,MAAM,wBAAwB,YAAI,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;AAE5E;;;;;;;;GAQG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,OAAO,wBAAwB,CAAC,CAAC,MAAM,CAAC,CAAC;AAE7E;;;;;;;;;GASG;AACH,MAAM,WAAW,cAAc;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,oEAAoE;IACpE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,wEAAwE;IACxE,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,8EAA8E;IAC9E,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,mBAAmB;IACnB,QAAQ,CAAC,MAAM,EAAE,oBAAoB,CAAC;IACtC,gCAAgC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,yDAAyD;IACzD,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,8DAA8D;AAC9D,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,cAAc,EAAE,aAAa,CAAC,GAAG;IACpE,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAClC,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B;;;;OAIG;IACH,oBAAoB,CAAC,IAAI,EAAE,iBAAiB,GAAG,cAAc,CAAC;IAC9D,wEAAwE;IACxE,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAAC;IACpD,2DAA2D;IAC3D,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACjF,oEAAoE;IACpE,yBAAyB,IAAI,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC;IACvE;;;;OAIG;IACH,mBAAmB,CAAC,IAAI,EAAE,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,QAAQ,CAAC,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;IACrF,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CACpD;AAED,wBAAgB,mBAAmB,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,KAAK,GAAG,eAAe,CAwFnF"}
|
|
@@ -34,6 +34,9 @@ export function openWebmentionStore(db, clock) {
|
|
|
34
34
|
deleteSentWebmentions: db.prepare('DELETE FROM webmentions_sent WHERE slug = :slug AND source = :source'),
|
|
35
35
|
countSentWebmentionsByStatus: db.prepare(`
|
|
36
36
|
SELECT status, COUNT(*) AS count FROM webmentions_sent WHERE slug = ? GROUP BY status
|
|
37
|
+
`),
|
|
38
|
+
countFailedWebmentionsSince: db.prepare(`
|
|
39
|
+
SELECT COUNT(*) AS count FROM webmentions_sent WHERE status = 'failed' AND attempted_at >= ?
|
|
37
40
|
`),
|
|
38
41
|
};
|
|
39
42
|
return {
|
|
@@ -64,6 +67,9 @@ export function openWebmentionStore(db, clock) {
|
|
|
64
67
|
const rows = statements.countSentWebmentionsByStatus.all(slug);
|
|
65
68
|
return countByStatus(rows, WEBMENTION_SEND_STATUSES, webmentionSendStatus);
|
|
66
69
|
},
|
|
70
|
+
countFailedWebmentionsSince(since) {
|
|
71
|
+
return Number(statements.countFailedWebmentionsSince.get(since)?.['count'] ?? 0);
|
|
72
|
+
},
|
|
67
73
|
};
|
|
68
74
|
}
|
|
69
75
|
function toSentWebmention(row) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webmentions.js","sourceRoot":"","sources":["../../src/store/webmentions.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAE9E,2DAA2D;AAC3D,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"webmentions.js","sourceRoot":"","sources":["../../src/store/webmentions.ts"],"names":[],"mappings":"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"}
|
package/dist/web/env.d.ts
CHANGED
|
@@ -24,6 +24,7 @@ import type { HandleLearner } from '../federation/handles.ts';
|
|
|
24
24
|
import type { WebmentionService } from '../webmention/service.ts';
|
|
25
25
|
import type { ConversationReader } from '../comments/conversation.ts';
|
|
26
26
|
import type { RedirectSource } from '../content/redirects.ts';
|
|
27
|
+
import type { DrawnPageTags } from '../plugins/page-tags.ts';
|
|
27
28
|
import type { Renderer } from './render.ts';
|
|
28
29
|
/**
|
|
29
30
|
* What every Hono handler in the CMS can read off the context, so a route
|
|
@@ -186,6 +187,8 @@ export interface GeekityEnv {
|
|
|
186
187
|
* and with everything they require running.
|
|
187
188
|
*/
|
|
188
189
|
activePlugins: ReadonlySet<string>;
|
|
190
|
+
/** What the running plugins add to the end of `<head>` and `<body>` on this request's pages. */
|
|
191
|
+
pageTags: DrawnPageTags;
|
|
189
192
|
/**
|
|
190
193
|
* What an IndieAuth or Micropub handler adds to the activity log's entry
|
|
191
194
|
* for this request (TASK-221), beyond what its response shows.
|
package/dist/web/env.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/web/env.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"env.d.ts","sourceRoot":"","sources":["../../src/web/env.ts"],"names":[],"mappings":"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"}
|
package/dist/web/feed-item.d.ts
CHANGED
|
@@ -76,8 +76,9 @@ export interface FeedItem {
|
|
|
76
76
|
terms: readonly string[];
|
|
77
77
|
/**
|
|
78
78
|
* What every format prints as the summary: the description the author wrote,
|
|
79
|
-
* else an excerpt of the rendered body
|
|
80
|
-
* where that goes — and empty only for a post
|
|
79
|
+
* else an excerpt of the rendered body, else the photos' alt text. Never the
|
|
80
|
+
* whole post — the content is where that goes — and empty only for a post
|
|
81
|
+
* with nothing to summarise,
|
|
81
82
|
* which is the one case a format leaves the element out.
|
|
82
83
|
*/
|
|
83
84
|
summary: string;
|
|
@@ -164,7 +165,7 @@ export interface FeedItem {
|
|
|
164
165
|
* a comment is not a {@link FeedItem}, and their validator has a label of its
|
|
165
166
|
* own in `commentsFeedResponse`.
|
|
166
167
|
*/
|
|
167
|
-
export declare const FEED_ITEM_REVISION =
|
|
168
|
+
export declare const FEED_ITEM_REVISION = 15;
|
|
168
169
|
/** Where one item's comments are, counted. */
|
|
169
170
|
export interface FeedItemComments {
|
|
170
171
|
/** The page a person reads them on. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-item.d.ts","sourceRoot":"","sources":["../../src/web/feed-item.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAEvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAKzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAG7C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AAMtD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAI5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAGnE;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,WAAW,QAAQ;IACvB;;;;;;OAMG;IACH,EAAE,EAAE,MAAM,CAAC;IACX;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;OAKG;IACH,KAAK,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC3B,+DAA+D;IAC/D,SAAS,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC7B,0DAA0D;IAC1D,OAAO,CAAC,EAAE,IAAI,GAAG,SAAS,CAAC;IAC3B;;;OAGG;IACH,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B;;;;OAIG;IACH,OAAO,EAAE,MAAM,CAAC;IAChB;;;;;;;;;;OAUG;IACH,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB
|
|
1
|
+
{"version":3,"file":"feed-item.d.ts","sourceRoot":"","sources":["../../src/web/feed-item.ts"],"names":[],"mappings":"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"}
|
package/dist/web/feed-item.js
CHANGED
|
@@ -43,7 +43,7 @@ import { feedExcerpt } from '../content/excerpt.js';
|
|
|
43
43
|
* a comment is not a {@link FeedItem}, and their validator has a label of its
|
|
44
44
|
* own in `commentsFeedResponse`.
|
|
45
45
|
*/
|
|
46
|
-
export const FEED_ITEM_REVISION =
|
|
46
|
+
export const FEED_ITEM_REVISION = 15;
|
|
47
47
|
/**
|
|
48
48
|
* One document as the item every format renders.
|
|
49
49
|
*
|
|
@@ -64,7 +64,7 @@ export function feedItem(document, context) {
|
|
|
64
64
|
link,
|
|
65
65
|
terms: [...document.categories, ...document.tags],
|
|
66
66
|
summary: review === undefined || document.description !== undefined
|
|
67
|
-
? excerpt
|
|
67
|
+
? excerpt || photosSummary(photos, context.altTexts ?? new Map())
|
|
68
68
|
: [reviewSummary(review), excerpt].filter((part) => part !== '').join(' '),
|
|
69
69
|
html: citationLines(document, context.replyContext, baseUrl) +
|
|
70
70
|
rsvpLine(rsvpOf(document.extra)) +
|
|
@@ -153,6 +153,12 @@ function photosHtml(photos, library, baseUrl) {
|
|
|
153
153
|
` alt="${escapeXml(photoAlt(photo, library) ?? '')}"></figure>`)
|
|
154
154
|
.join('');
|
|
155
155
|
}
|
|
156
|
+
function photosSummary(photos, library) {
|
|
157
|
+
return photos
|
|
158
|
+
.map((photo) => photoAlt(photo, library) ?? '')
|
|
159
|
+
.filter((alt) => alt !== '')
|
|
160
|
+
.join(' · ');
|
|
161
|
+
}
|
|
156
162
|
function ownImage(document) {
|
|
157
163
|
const image = document.extra['image'];
|
|
158
164
|
return typeof image === 'string' && image.trim() !== '' ? image.trim() : undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed-item.js","sourceRoot":"","sources":["../../src/web/feed-item.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAElG,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAEtD,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAGpE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAElE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"feed-item.js","sourceRoot":"","sources":["../../src/web/feed-item.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listing-pages.d.ts","sourceRoot":"","sources":["../../src/web/listing-pages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAY3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"listing-pages.d.ts","sourceRoot":"","sources":["../../src/web/listing-pages.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAIpC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAE3C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAY3D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAsHrD,iFAAiF;AACjF,wBAAgB,OAAO,CACrB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,OAAO,EAAE,cAAc,EACvB,cAAc,GAAE,cAAc,GAAG,SAAwD,GACxF,QAAQ,CAyCV;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,MAAM,CACpB,CAAC,EAAE,OAAO,CAAC,UAAU,CAAC,EACtB,cAAc,EAAE,cAAc,GAAG,SAAS,GACzC,QAAQ,CAwCV"}
|
|
@@ -5,6 +5,7 @@ import { offsetForPage, paginate } from './pagination.js';
|
|
|
5
5
|
import { conditionalHeaders, drawnForSomebody, notFound, queryFeedFormat, selectFromAccept, wantsFullDocuments, } from './request.js';
|
|
6
6
|
import { searchHref, searchJson, searchPageIndex, searchQuery, SEARCH_PAGE_PARAM, SEARCH_QUERY_PARAM, } from './search.js';
|
|
7
7
|
import { siteView } from './site-view.js';
|
|
8
|
+
import { NO_PAGE_TAGS } from '../plugins/page-tags.js';
|
|
8
9
|
function openPage(c, options) {
|
|
9
10
|
const { pageNumber, hrefForPage, representation } = options;
|
|
10
11
|
const size = c.var.renderer.pageSize();
|
|
@@ -26,7 +27,10 @@ function pagedResponse(c, page, options) {
|
|
|
26
27
|
const { documents } = options;
|
|
27
28
|
const sendsValidators = representation !== 'html' || !c.var.config.watch;
|
|
28
29
|
const fingerprint = options.fingerprint ??
|
|
29
|
-
listingFingerprint(href, pagination, documents, options.full ?? false,
|
|
30
|
+
listingFingerprint(href, pagination, documents, options.full ?? false, {
|
|
31
|
+
devMode: c.var.devMode,
|
|
32
|
+
pageTags: c.var.pageTags,
|
|
33
|
+
});
|
|
30
34
|
return representationResponse({
|
|
31
35
|
body: options.body,
|
|
32
36
|
representation,
|
|
@@ -50,10 +54,11 @@ function pagedResponse(c, page, options) {
|
|
|
50
54
|
* differently sized archive are a different page, and a summary is not the
|
|
51
55
|
* body, so the pagination and the `full` flag are in the fingerprint too.
|
|
52
56
|
*/
|
|
53
|
-
function listingFingerprint(href, pagination, documents, full, devMode) {
|
|
57
|
+
function listingFingerprint(href, pagination, documents, full, { devMode, pageTags }) {
|
|
54
58
|
return [
|
|
55
59
|
href,
|
|
56
60
|
...(devMode ? ['dev mode'] : []),
|
|
61
|
+
...(pageTags === NO_PAGE_TAGS ? [] : [pageTags.headEnd, pageTags.bodyEnd]),
|
|
57
62
|
`${String(pagination.pageNumber)}/${String(pagination.totalPages)}/${String(pagination.total)}`,
|
|
58
63
|
full ? 'full' : 'summary',
|
|
59
64
|
...documents.map((document) => document.hash),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"listing-pages.js","sourceRoot":"","sources":["../../src/web/listing-pages.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,YAAY,EACZ,cAAc,EACd,uBAAuB,EACvB,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"listing-pages.js","sourceRoot":"","sources":["../../src/web/listing-pages.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EACL,YAAY,EACZ,cAAc,EACd,uBAAuB,EACvB,WAAW,EACX,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,sBAAsB,GACvB,MAAM,gBAAgB,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE1D,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,UAAU,EACV,UAAU,EACV,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,kBAAkB,GACnB,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAUvD,SAAS,QAAQ,CACf,CAAsB,EACtB,OAMC;IAED,MAAM,EAAE,UAAU,EAAE,WAAW,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;IAC5D,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC;IACvC,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC,CAAC;IACrF,IAAI,UAAU,IAAI,UAAU,CAAC,UAAU;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IAE5D,MAAM,IAAI,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC;IACrC,IAAI,cAAc,KAAK,SAAS;QAAE,OAAO,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,SAAS,CAAC,CAAC;IACxF,OAAO;QACL,UAAU;QACV,IAAI;QACJ,cAAc;QACd,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,EAAE;KACjE,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CACpB,CAAsB,EACtB,IAAc,EACd,OAOC;IAED,MAAM,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,IAAI,CAAC;IAClD,MAAM,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC9B,MAAM,eAAe,GAAG,cAAc,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC;IACzE,MAAM,WAAW,GACf,OAAO,CAAC,WAAW;QACnB,kBAAkB,CAAC,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,OAAO,CAAC,IAAI,IAAI,KAAK,EAAE;YACrE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO;YACtB,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ;SACzB,CAAC,CAAC;IAEL,OAAO,sBAAsB,CAAC;QAC5B,IAAI,EAAE,OAAO,CAAC,IAAI;QAClB,cAAc;QACd,IAAI;QACJ,SAAS,EAAE,OAAO,CAAC,SAAS;QAC5B,GAAG,CAAC,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC;QAChE,GAAG,CAAC,gBAAgB,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACjE,GAAG,CAAC,eAAe;YACjB,CAAC,CAAC;gBACE,IAAI,EAAE,kBAAkB,CAAC,cAAc,EAAE,WAAW,CAAC;gBACrD,YAAY,EAAE,cAAc,CAAC,SAAS,CAAC;aACxC;YACH,CAAC,CAAC,EAAE,CAAC;QACP,WAAW,EAAE,kBAAkB,CAAC,CAAC,CAAC;KACnC,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACH,SAAS,kBAAkB,CACzB,IAAY,EACZ,UAAsB,EACtB,SAA8B,EAC9B,IAAa,EACb,EAAE,OAAO,EAAE,QAAQ,EAAiD;IAEpE,OAAO;QACL,IAAI;QACJ,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChC,GAAG,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,CAAC;QAC1E,GAAG,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;QAC/F,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;QACzB,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;KAC9C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,iFAAiF;AACjF,MAAM,UAAU,OAAO,CACrB,CAAsB,EACtB,OAAuB,EACvB,cAAc,GAA+B,gBAAgB,CAAC,CAAC,EAAE,uBAAuB,CAAC;IAEzF,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;IACnC,MAAM,OAAO,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAExD,6EAA6E;IAC7E,kEAAkE;IAClE,+DAA+D;IAC/D,MAAM,KAAK,GAAG,eAAe,CAAC,CAAC,CAAC,CAAC;IACjC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;IAEzE,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,EAAE;QACvB,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE;QACtB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,WAAW,EAAE,OAAO,CAAC,IAAI;QACzB,cAAc;QACd,SAAS,EAAE,uBAAuB;KACnC,CAAC,CAAC;IACH,IAAI,IAAI,YAAY,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE1C,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IACjD,MAAM,SAAS,GAAG,uBAAuB,CAAC;IAE1C,IAAI,IAAI,CAAC,cAAc,KAAK,UAAU,IAAI,IAAI,CAAC,cAAc,KAAK,MAAM,EAAE,CAAC;QACzE,MAAM,IAAI,GAAG,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;QACxE,OAAO,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;IACnF,CAAC;IAED,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,IAAI,GACR,IAAI,CAAC,cAAc,KAAK,MAAM;QAC5B,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9F,CAAC,CAAC,QAAQ,CAAC,aAAa,CAAC;YACrB,KAAK;YACL,GAAG,EAAE,IAAI,CAAC,IAAI;YACd,SAAS;YACT,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG,OAAO,CAAC,OAAO;SACnB,CAAC,CAAC;IAET,OAAO,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACtE,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,MAAM,CACpB,CAAsB,EACtB,cAA0C;IAE1C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,CAAC;IAC1C,MAAM,KAAK,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAC3D,MAAM,UAAU,GAAG,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACnE,IAAI,UAAU,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEjD,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,EAAE;QACvB,KAAK,EAAE,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC;QAC/B,UAAU;QACV,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC;QAChD,cAAc;QACd,SAAS,EAAE,sBAAsB;KAClC,CAAC,CAAC;IACH,IAAI,IAAI,YAAY,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE1C,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9C,MAAM,IAAI,GAAG,kBAAkB,CAAC,CAAC,CAAC,CAAC;IACnC,MAAM,IAAI,GACR,IAAI,CAAC,cAAc,KAAK,MAAM;QAC5B,CAAC,CAAC,UAAU,CAAC;YACT,KAAK;YACL,IAAI;YACJ,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,IAAI,EAAE,IAAI;SACX,CAAC;QACJ,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAE1F,OAAO,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE;QAC5B,IAAI;QACJ,SAAS,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1C,yEAAyE;QACzE,gEAAgE;QAChE,SAAS,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC;QAChC,KAAK,EAAE,sBAAsB,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAChF,CAAC,KAAK,EAAE,EAAE,CACR,IAAI,UAAU,CAAC,KAAK,EAAE,UAAU,EAAE,KAAK,CAAC,6BAA6B,WAAW,CAAC,KAAK,CAAC,GAAG,CAC7F;QACD,IAAI;KACL,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"page-tags.d.ts","sourceRoot":"","sources":["../../src/web/page-tags.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,MAAM,CAAC;AAM9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI3C,eAAO,MAAM,cAAc,EAAE,iBAAiB,CAAC,UAAU,CA8BxD,CAAC"}
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import { drawPageTags, NO_PAGE_TAGS } from '../plugins/page-tags.js';
|
|
2
|
+
import { ADMIN_PREFIX } from '../site/admin-paths.js';
|
|
3
|
+
import { messageOf } from '../util/errors.js';
|
|
4
|
+
import { drawnWithPageTags } from './render.js';
|
|
5
|
+
import { requestPath } from './request.js';
|
|
6
|
+
export const pluginPageTags = async (c, next) => {
|
|
7
|
+
const pathname = requestPath(c);
|
|
8
|
+
const tagging = [...c.var.activePlugins].flatMap((name) => {
|
|
9
|
+
const read = c.var.plugins.find(name)?.pageTags;
|
|
10
|
+
return read === undefined ? [] : [{ name, read }];
|
|
11
|
+
});
|
|
12
|
+
if (tagging.length === 0 ||
|
|
13
|
+
pathname === ADMIN_PREFIX ||
|
|
14
|
+
pathname.startsWith(`${ADMIN_PREFIX}/`)) {
|
|
15
|
+
c.set('pageTags', NO_PAGE_TAGS);
|
|
16
|
+
return await next();
|
|
17
|
+
}
|
|
18
|
+
const context = { signedIn: c.var.signedIn !== undefined, devMode: c.var.devMode };
|
|
19
|
+
const drawn = [];
|
|
20
|
+
for (const { name, read } of tagging) {
|
|
21
|
+
try {
|
|
22
|
+
drawn.push(drawPageTags(await read(context)));
|
|
23
|
+
}
|
|
24
|
+
catch (error) {
|
|
25
|
+
console.warn(`The ${name} plugin's page tags were left out: ${messageOf(error)}`);
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
const tags = {
|
|
29
|
+
headEnd: joined(drawn.map((entry) => entry.headEnd)),
|
|
30
|
+
bodyEnd: joined(drawn.map((entry) => entry.bodyEnd)),
|
|
31
|
+
};
|
|
32
|
+
c.set('pageTags', tags);
|
|
33
|
+
await drawnWithPageTags(tags, next);
|
|
34
|
+
};
|
|
35
|
+
function joined(parts) {
|
|
36
|
+
const drawn = parts.filter((part) => part !== '');
|
|
37
|
+
return drawn.length === 0 ? '' : `${drawn.join('\n')}\n`;
|
|
38
|
+
}
|
|
39
|
+
//# sourceMappingURL=page-tags.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"page-tags.js","sourceRoot":"","sources":["../../src/web/page-tags.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAErE,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,CAAC,MAAM,cAAc,GAAkC,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE;IAC7E,MAAM,QAAQ,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;IAChC,MAAM,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACxD,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;QAChD,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,CAAC,CAAC,CAAC;IACH,IACE,OAAO,CAAC,MAAM,KAAK,CAAC;QACpB,QAAQ,KAAK,YAAY;QACzB,QAAQ,CAAC,UAAU,CAAC,GAAG,YAAY,GAAG,CAAC,EACvC,CAAC;QACD,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;QAChC,OAAO,MAAM,IAAI,EAAE,CAAC;IACtB,CAAC;IAED,MAAM,OAAO,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,SAAS,EAAE,OAAO,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACnF,MAAM,KAAK,GAAoB,EAAE,CAAC;IAClC,KAAK,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,EAAE,CAAC;QACrC,IAAI,CAAC;YACH,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,OAAO,IAAI,sCAAsC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;QACpF,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAkB;QAC1B,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpD,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;KACrD,CAAC;IACF,CAAC,CAAC,GAAG,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;IACxB,MAAM,iBAAiB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,SAAS,MAAM,CAAC,KAAwB;IACtC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE,CAAC,CAAC;IAClD,OAAO,KAAK,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;AAC3D,CAAC"}
|
package/dist/web/render.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import type { Environment } from 'nunjucks';
|
|
|
2
2
|
import type { ResolvedConfig } from '../config.ts';
|
|
3
3
|
import type { Document } from '../content/document.ts';
|
|
4
4
|
import type { SharedLocation } from '../content/location.ts';
|
|
5
|
+
import type { DrawnPageTags } from '../plugins/page-tags.ts';
|
|
5
6
|
import type { SiteSettings } from '../site/settings.ts';
|
|
6
7
|
import type { DocumentNeighbours, SearchHit } from '../content/store.ts';
|
|
7
8
|
import type { User } from '../site/users.ts';
|
|
@@ -392,5 +393,6 @@ export interface RequestInputs {
|
|
|
392
393
|
readonly site: SiteSettings;
|
|
393
394
|
}
|
|
394
395
|
export declare function drawnWith<T>(inputs: RequestInputs, draw: () => T): T;
|
|
396
|
+
export declare function drawnWithPageTags<T>(tags: DrawnPageTags, draw: () => T): T;
|
|
395
397
|
export declare function createRenderer(options: CreateRendererOptions): Renderer;
|
|
396
398
|
//# sourceMappingURL=render.d.ts.map
|