@geekity/cms 0.56.0 → 0.57.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/tools/export.njk +6 -0
- package/admin/pages/tools/personal-data.njk +9 -0
- package/admin/static/admin.css +812 -1406
- package/admin/static/editor.js +26 -26
- 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/indieauth-consent.js +1 -1
- package/dist/admin/indieauth-consent.js.map +1 -1
- package/dist/admin/personal-data.d.ts.map +1 -1
- package/dist/admin/personal-data.js +11 -2
- package/dist/admin/personal-data.js.map +1 -1
- package/dist/cli/export.d.ts.map +1 -1
- package/dist/cli/export.js +5 -1
- package/dist/cli/export.js.map +1 -1
- package/dist/cms/services.d.ts.map +1 -1
- package/dist/cms/services.js +12 -1
- package/dist/cms/services.js.map +1 -1
- package/dist/comments/conversation.d.ts +4 -3
- package/dist/comments/conversation.d.ts.map +1 -1
- package/dist/comments/intake.d.ts +19 -12
- package/dist/comments/intake.d.ts.map +1 -1
- package/dist/comments/intake.js +46 -16
- package/dist/comments/intake.js.map +1 -1
- package/dist/comments/migrations.d.ts.map +1 -1
- package/dist/comments/migrations.js +16 -2
- package/dist/comments/migrations.js.map +1 -1
- package/dist/comments/records.d.ts +24 -11
- package/dist/comments/records.d.ts.map +1 -1
- package/dist/comments/records.js +168 -63
- package/dist/comments/records.js.map +1 -1
- package/dist/config-entry.d.ts +1 -1
- package/dist/config-entry.d.ts.map +1 -1
- package/dist/config.d.ts +47 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +16 -2
- package/dist/config.js.map +1 -1
- package/dist/content/image-tags.js +2 -2
- package/dist/content/image-tags.js.map +1 -1
- package/dist/content/sanitize.d.ts.map +1 -1
- package/dist/content/sanitize.js +27 -13
- package/dist/content/sanitize.js.map +1 -1
- package/dist/content/search.d.ts.map +1 -1
- package/dist/content/search.js +1 -28
- package/dist/content/search.js.map +1 -1
- package/dist/content/sqlite/catalog.js +3 -0
- package/dist/content/sqlite/catalog.js.map +1 -1
- package/dist/content/sqlite/schema.d.ts.map +1 -1
- package/dist/content/sqlite/schema.js +13 -0
- package/dist/content/sqlite/schema.js.map +1 -1
- package/dist/content/store.d.ts +2 -0
- package/dist/content/store.d.ts.map +1 -1
- package/dist/content/store.js.map +1 -1
- package/dist/export/site-export.d.ts +1 -0
- package/dist/export/site-export.d.ts.map +1 -1
- package/dist/export/site-export.js +2 -0
- package/dist/export/site-export.js.map +1 -1
- package/dist/export/site-import.d.ts.map +1 -1
- package/dist/export/site-import.js +1 -0
- package/dist/export/site-import.js.map +1 -1
- package/dist/exports.d.ts +1 -1
- package/dist/exports.d.ts.map +1 -1
- package/dist/exports.js.map +1 -1
- package/dist/federation/federation.d.ts +3 -0
- package/dist/federation/federation.d.ts.map +1 -1
- package/dist/federation/federation.js +5 -2
- package/dist/federation/federation.js.map +1 -1
- package/dist/federation/profiles.d.ts.map +1 -1
- package/dist/federation/profiles.js +5 -1
- package/dist/federation/profiles.js.map +1 -1
- package/dist/federation/public-loaders.d.ts +14 -0
- package/dist/federation/public-loaders.d.ts.map +1 -0
- package/dist/federation/public-loaders.js +41 -0
- package/dist/federation/public-loaders.js.map +1 -0
- 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/following/list.d.ts.map +1 -1
- package/dist/following/list.js +4 -3
- package/dist/following/list.js.map +1 -1
- package/dist/forms/protection.d.ts +8 -0
- package/dist/forms/protection.d.ts.map +1 -1
- package/dist/forms/protection.js +8 -0
- package/dist/forms/protection.js.map +1 -1
- package/dist/indieauth/client.js +2 -2
- package/dist/indieauth/client.js.map +1 -1
- package/dist/mcp/endpoint.d.ts.map +1 -1
- package/dist/mcp/endpoint.js +3 -0
- package/dist/mcp/endpoint.js.map +1 -1
- package/dist/mcp/inspect/remote.js +2 -2
- package/dist/mcp/inspect/remote.js.map +1 -1
- package/dist/mcp/profile.d.ts +3 -0
- package/dist/mcp/profile.d.ts.map +1 -0
- package/dist/mcp/profile.js +143 -0
- package/dist/mcp/profile.js.map +1 -0
- package/dist/mcp/tools.d.ts +1 -1
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js.map +1 -1
- package/dist/notifications/comments.d.ts +3 -2
- package/dist/notifications/comments.d.ts.map +1 -1
- package/dist/notifications/comments.js +10 -7
- package/dist/notifications/comments.js.map +1 -1
- package/dist/privacy/erase.d.ts +6 -1
- package/dist/privacy/erase.d.ts.map +1 -1
- package/dist/privacy/erase.js +24 -9
- package/dist/privacy/erase.js.map +1 -1
- package/dist/privacy/retention.d.ts.map +1 -1
- package/dist/privacy/retention.js +7 -2
- package/dist/privacy/retention.js.map +1 -1
- package/dist/site/users.d.ts +14 -0
- package/dist/site/users.d.ts.map +1 -1
- package/dist/site/users.js +23 -1
- package/dist/site/users.js.map +1 -1
- package/dist/store/admin-store.d.ts +1 -1
- package/dist/store/admin-store.d.ts.map +1 -1
- package/dist/store/admin-store.js +1 -1
- package/dist/store/admin-store.js.map +1 -1
- package/dist/store/comments.d.ts +14 -0
- package/dist/store/comments.d.ts.map +1 -1
- package/dist/store/comments.js +40 -2
- package/dist/store/comments.js.map +1 -1
- package/dist/store/schema.d.ts.map +1 -1
- package/dist/store/schema.js +4 -0
- package/dist/store/schema.js.map +1 -1
- package/dist/util/html-entities.d.ts +5 -0
- package/dist/util/html-entities.d.ts.map +1 -0
- package/dist/util/html-entities.js +2239 -0
- package/dist/util/html-entities.js.map +1 -0
- package/dist/util/html-tree.d.ts +13 -6
- package/dist/util/html-tree.d.ts.map +1 -1
- package/dist/util/html-tree.js +171 -44
- package/dist/util/html-tree.js.map +1 -1
- package/dist/util/html.d.ts +7 -0
- package/dist/util/html.d.ts.map +1 -1
- package/dist/util/html.js +68 -19
- package/dist/util/html.js.map +1 -1
- package/dist/util/public-address.d.ts +11 -2
- package/dist/util/public-address.d.ts.map +1 -1
- package/dist/util/public-address.js +86 -13
- package/dist/util/public-address.js.map +1 -1
- package/dist/util/queue.d.ts +5 -0
- package/dist/util/queue.d.ts.map +1 -1
- package/dist/util/queue.js +18 -0
- package/dist/util/queue.js.map +1 -1
- package/dist/util/url.d.ts +11 -0
- package/dist/util/url.d.ts.map +1 -1
- package/dist/util/url.js +23 -0
- package/dist/util/url.js.map +1 -1
- package/dist/web/activity-folding.d.ts.map +1 -1
- package/dist/web/activity-folding.js +7 -3
- package/dist/web/activity-folding.js.map +1 -1
- package/dist/web/bounded-body.d.ts +12 -0
- package/dist/web/bounded-body.d.ts.map +1 -0
- package/dist/web/bounded-body.js +55 -0
- package/dist/web/bounded-body.js.map +1 -0
- package/dist/web/comment-routes.d.ts.map +1 -1
- package/dist/web/comment-routes.js +8 -2
- package/dist/web/comment-routes.js.map +1 -1
- package/dist/web/contact-routes.d.ts.map +1 -1
- package/dist/web/contact-routes.js +7 -1
- package/dist/web/contact-routes.js.map +1 -1
- package/dist/web/conversation.d.ts.map +1 -1
- package/dist/web/conversation.js +15 -7
- package/dist/web/conversation.js.map +1 -1
- package/dist/web/pingback-routes.d.ts +2 -1
- package/dist/web/pingback-routes.d.ts.map +1 -1
- package/dist/web/pingback-routes.js +59 -34
- package/dist/web/pingback-routes.js.map +1 -1
- package/dist/web/request.d.ts +0 -5
- package/dist/web/request.d.ts.map +1 -1
- package/dist/web/request.js +2 -13
- package/dist/web/request.js.map +1 -1
- package/dist/web/routes.d.ts.map +1 -1
- package/dist/web/routes.js +5 -3
- package/dist/web/routes.js.map +1 -1
- package/dist/web/site-view.d.ts +15 -0
- package/dist/web/site-view.d.ts.map +1 -1
- package/dist/web/site-view.js +1 -1
- package/dist/web/site-view.js.map +1 -1
- package/dist/web/social-profile.d.ts.map +1 -1
- package/dist/web/social-profile.js +3 -3
- package/dist/web/social-profile.js.map +1 -1
- package/dist/web/throttle.d.ts +6 -0
- package/dist/web/throttle.d.ts.map +1 -1
- package/dist/web/throttle.js +1 -1
- package/dist/web/throttle.js.map +1 -1
- package/dist/web/webmention-routes.d.ts +14 -2
- package/dist/web/webmention-routes.d.ts.map +1 -1
- package/dist/web/webmention-routes.js +65 -19
- package/dist/web/webmention-routes.js.map +1 -1
- package/dist/webmention/checks.d.ts +43 -0
- package/dist/webmention/checks.d.ts.map +1 -0
- package/dist/webmention/checks.js +103 -0
- package/dist/webmention/checks.js.map +1 -0
- package/dist/webmention/discovery.js +2 -2
- package/dist/webmention/discovery.js.map +1 -1
- package/dist/webmention/endpoint.d.ts +2 -0
- package/dist/webmention/endpoint.d.ts.map +1 -1
- package/dist/webmention/endpoint.js +2 -0
- package/dist/webmention/endpoint.js.map +1 -1
- package/dist/webmention/fetch-public.d.ts +5 -0
- package/dist/webmention/fetch-public.d.ts.map +1 -1
- package/dist/webmention/fetch-public.js +19 -1
- package/dist/webmention/fetch-public.js.map +1 -1
- package/dist/webmention/index.d.ts +2 -1
- package/dist/webmention/index.d.ts.map +1 -1
- package/dist/webmention/index.js.map +1 -1
- package/dist/webmention/links.d.ts.map +1 -1
- package/dist/webmention/links.js +4 -11
- package/dist/webmention/links.js.map +1 -1
- package/dist/webmention/microformats.d.ts +32 -9
- package/dist/webmention/microformats.d.ts.map +1 -1
- package/dist/webmention/microformats.js +341 -110
- package/dist/webmention/microformats.js.map +1 -1
- package/dist/webmention/pingback.d.ts +7 -0
- package/dist/webmention/pingback.d.ts.map +1 -1
- package/dist/webmention/pingback.js +108 -34
- package/dist/webmention/pingback.js.map +1 -1
- package/dist/webmention/receive.d.ts +28 -21
- package/dist/webmention/receive.d.ts.map +1 -1
- package/dist/webmention/receive.js +286 -65
- package/dist/webmention/receive.js.map +1 -1
- package/dist/webmention/reply-context/feed.js +2 -2
- package/dist/webmention/reply-context/feed.js.map +1 -1
- package/dist/webmention/reply-context/page.js +2 -2
- package/dist/webmention/reply-context/page.js.map +1 -1
- package/dist/webmention/service.d.ts +51 -12
- package/dist/webmention/service.d.ts.map +1 -1
- package/dist/webmention/service.js +202 -38
- package/dist/webmention/service.js.map +1 -1
- package/dist/webmention/syndication.d.ts +2 -0
- package/dist/webmention/syndication.d.ts.map +1 -1
- package/dist/webmention/syndication.js +57 -20
- package/dist/webmention/syndication.js.map +1 -1
- package/package.json +5 -5
- package/themes/default/mail/comment-digest.txt.njk +1 -1
- package/themes/default/mail/comment-pending.html.njk +20 -0
- package/themes/default/mail/comment-pending.txt.njk +31 -4
- package/themes/default/mail/comment-reply.txt.njk +1 -1
- package/themes/default/mail/contact-message.txt.njk +4 -2
- package/themes/default/mail/password-changed.txt.njk +1 -1
- package/themes/default/mail/password-reset.txt.njk +1 -1
- package/themes/default/mail/test.txt.njk +1 -1
package/dist/comments/intake.js
CHANGED
|
@@ -2,7 +2,7 @@ import { hashClientAddress } from '../forms/protection.js';
|
|
|
2
2
|
import { messageOf } from '../util/errors.js';
|
|
3
3
|
import { absoluteUrl } from '../util/url.js';
|
|
4
4
|
import { webmentionKey } from '../content/guids.js';
|
|
5
|
-
import { addComment, deleteComment, updateComment } from './records.js';
|
|
5
|
+
import { addComment, deleteComment, isCarried, updateComment } from './records.js';
|
|
6
6
|
/**
|
|
7
7
|
* The one door into `content/_data/comments/`.
|
|
8
8
|
*
|
|
@@ -29,17 +29,19 @@ import { addComment, deleteComment, updateComment } from './records.js';
|
|
|
29
29
|
* | `ham` | Approved. | The moderator's decision stands. |
|
|
30
30
|
* | `unknown` | Where the site would have put it. | The moderator's decision stands. |
|
|
31
31
|
*
|
|
32
|
-
* A source re-sending its webmention must not
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
32
|
+
* A source re-sending its webmention must not quietly let a spam one out, and
|
|
33
|
+
* a checker that has changed its mind to `spam` is the one thing that moves a
|
|
34
|
+
* held entry, because that is a new fact about the content. An approved entry
|
|
35
|
+
* keeps its approval only while it says the same thing: one whose kind,
|
|
36
|
+
* author or words have changed is decided as a new one would be, because a
|
|
37
|
+
* moderator approved the old words and not these.
|
|
36
38
|
*
|
|
37
39
|
* **Who hears about it.** A new entry that is waiting sends the moderation
|
|
38
|
-
* notice, once
|
|
39
|
-
*
|
|
40
|
-
* and neither does one that was approved or filed as spam, because
|
|
41
|
-
* waiting for anybody. A new comment that is approved instead
|
|
42
|
-
* answers, when they asked to be told.
|
|
40
|
+
* notice, once, and so does an approved one sent back to wait. A webmention
|
|
41
|
+
* that was merely rewritten sends nothing — the moderators heard the first
|
|
42
|
+
* time — and neither does one that was approved or filed as spam, because
|
|
43
|
+
* neither is waiting for anybody. A new comment that is approved instead
|
|
44
|
+
* tells whoever it answers, when they asked to be told.
|
|
43
45
|
*/
|
|
44
46
|
export async function intakeComment(options) {
|
|
45
47
|
const { records, origin, comment } = options;
|
|
@@ -51,21 +53,36 @@ export async function intakeComment(options) {
|
|
|
51
53
|
addressHash: hashClientAddress(options.dataDir, options.address),
|
|
52
54
|
};
|
|
53
55
|
const held = origin === 'webmention' ? heldWebmention(records, comment.slug, comment.url) : undefined;
|
|
54
|
-
|
|
56
|
+
if (held !== undefined && isCarried(comment) && held.via !== comment.via) {
|
|
57
|
+
return { kind: 'stored', comment: held, created: false };
|
|
58
|
+
}
|
|
59
|
+
const verdict = options.verdict ?? (await ask(options, proposed));
|
|
55
60
|
if (verdict === 'discard') {
|
|
56
61
|
if (held === undefined)
|
|
57
62
|
return { kind: 'discarded', removed: false };
|
|
58
63
|
await deleteComment(records, held.id);
|
|
59
64
|
return { kind: 'discarded', removed: true };
|
|
60
65
|
}
|
|
61
|
-
const
|
|
66
|
+
const fresh = held !== undefined && decisionLapses(held, comment);
|
|
67
|
+
const status = options.challenge === 'fail'
|
|
68
|
+
? 'spam'
|
|
69
|
+
: statusFor(verdict, proposed.status, fresh ? undefined : held);
|
|
62
70
|
if (held !== undefined) {
|
|
71
|
+
// A moderator who moved it while the checker was answering decided after
|
|
72
|
+
// the read above, so that decision stands unless the new words are spam.
|
|
73
|
+
let overruled = false;
|
|
74
|
+
const decided = (current) => {
|
|
75
|
+
if (status === 'spam' || current === held.status)
|
|
76
|
+
return status;
|
|
77
|
+
overruled = true;
|
|
78
|
+
return current;
|
|
79
|
+
};
|
|
63
80
|
// Its id, its post and its source never move: that is what makes it the
|
|
64
81
|
// same comment. What the page now says about itself replaces what it said,
|
|
65
82
|
// what it answers included.
|
|
66
83
|
const moved = await updateComment(records, held.id, {
|
|
67
84
|
kind: comment.kind,
|
|
68
|
-
status,
|
|
85
|
+
status: (current) => decided(current.status),
|
|
69
86
|
author: comment.author,
|
|
70
87
|
content: comment.content,
|
|
71
88
|
submitted: comment.submitted,
|
|
@@ -73,9 +90,11 @@ export async function intakeComment(options) {
|
|
|
73
90
|
rsvp: comment.rsvp ?? null,
|
|
74
91
|
via: comment.via ?? null,
|
|
75
92
|
});
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
93
|
+
if (moved === undefined)
|
|
94
|
+
return { kind: 'gone' };
|
|
95
|
+
if (fresh && !overruled && moved.status === 'pending')
|
|
96
|
+
announce(options.notices, moved);
|
|
97
|
+
return { kind: 'stored', comment: moved, created: false };
|
|
79
98
|
}
|
|
80
99
|
const stored = await addComment(records, {
|
|
81
100
|
...proposed,
|
|
@@ -100,6 +119,17 @@ export function heldWebmention(records, slug, source) {
|
|
|
100
119
|
.listCommentsFor(slug)
|
|
101
120
|
.find((comment) => comment.source === 'webmention' && comment.url === source);
|
|
102
121
|
}
|
|
122
|
+
function decisionLapses(held, comment) {
|
|
123
|
+
const handedOver = isCarried(held) && !isCarried(comment);
|
|
124
|
+
return handedOver || (held.status === 'approved' && saysSomethingElse(held, comment));
|
|
125
|
+
}
|
|
126
|
+
function saysSomethingElse(held, comment) {
|
|
127
|
+
return (held.kind !== comment.kind ||
|
|
128
|
+
held.author.name !== comment.author.name ||
|
|
129
|
+
held.author.url !== comment.author.url ||
|
|
130
|
+
held.author.avatar !== comment.author.avatar ||
|
|
131
|
+
held.content.html !== comment.content.html);
|
|
132
|
+
}
|
|
103
133
|
/** Where this site's own rules put a comment, before a checker has spoken. */
|
|
104
134
|
function siteStatusFor(origin, records, comment) {
|
|
105
135
|
if (origin === 'webmention')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"intake.js","sourceRoot":"","sources":["../../src/comments/intake.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"intake.js","sourceRoot":"","sources":["../../src/comments/intake.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../src/comments/migrations.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrations.d.ts","sourceRoot":"","sources":["../../src/comments/migrations.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAkB,cAAc,EAAE,MAAM,cAAc,CAAC;AAEnE,wDAAwD;AACxD,MAAM,WAAW,2BAA2B;IAC1C,6CAA6C;IAC7C,KAAK,EAAE,MAAM,CAAC;CACf;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GACtD,2BAA2B,CA8C7B;AAED,oDAAoD;AACpD,MAAM,WAAW,yBAAyB;IACxC,0CAA0C;IAC1C,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,SAAS,CAAC,GACtD,yBAAyB,CAoE3B"}
|
|
@@ -2,6 +2,7 @@ import { readdirSync, readFileSync } from 'node:fs';
|
|
|
2
2
|
import path from 'node:path';
|
|
3
3
|
import { COMMENT_PAGE_PREFIX, commentPageHref, repliesKey, isKey } from '../content/guids.js';
|
|
4
4
|
import { readFileIfPresentSync, writeFileAtomicallySync } from '../files/atomic.js';
|
|
5
|
+
import { messageOf } from '../util/errors.js';
|
|
5
6
|
import { nonEmptyStringOrNull } from '../util/forms.js';
|
|
6
7
|
import { isRecord } from '../util/guards.js';
|
|
7
8
|
import { COMMENT_EMAILS_FILE_MODE, commentEmailsFile, commentSlugs, commentsFile, contactsIn, contactsJson, } from './records.js';
|
|
@@ -55,7 +56,9 @@ export function migrateCommentEmails(records) {
|
|
|
55
56
|
if (!stripped)
|
|
56
57
|
continue;
|
|
57
58
|
const privateFile = commentEmailsFile(records.dataDir, slug);
|
|
58
|
-
const contacts =
|
|
59
|
+
const contacts = contactsOrSkip(privateFile);
|
|
60
|
+
if (contacts === undefined)
|
|
61
|
+
continue;
|
|
59
62
|
for (const [id, contact] of found)
|
|
60
63
|
if (!contacts.has(id))
|
|
61
64
|
contacts.set(id, contact);
|
|
@@ -125,7 +128,9 @@ export function migrateCommentKeys(records) {
|
|
|
125
128
|
});
|
|
126
129
|
const changed = JSON.stringify(rekeyed) !== JSON.stringify(entries);
|
|
127
130
|
const privateFile = commentEmailsFile(records.dataDir, slug);
|
|
128
|
-
const contacts =
|
|
131
|
+
const contacts = contactsOrSkip(privateFile);
|
|
132
|
+
if (contacts === undefined)
|
|
133
|
+
continue;
|
|
129
134
|
const keyed = new Map();
|
|
130
135
|
for (const [id, contact] of contacts) {
|
|
131
136
|
const key = isKey(id) ? id : repliesKey(id);
|
|
@@ -148,6 +153,15 @@ export function migrateCommentKeys(records) {
|
|
|
148
153
|
}
|
|
149
154
|
return { comments: keys.size };
|
|
150
155
|
}
|
|
156
|
+
function contactsOrSkip(privateFile) {
|
|
157
|
+
try {
|
|
158
|
+
return contactsIn(privateFile);
|
|
159
|
+
}
|
|
160
|
+
catch (error) {
|
|
161
|
+
console.warn(`Comment emails not migrated: ${messageOf(error)}`);
|
|
162
|
+
return undefined;
|
|
163
|
+
}
|
|
164
|
+
}
|
|
151
165
|
/**
|
|
152
166
|
* Text with every old comment page and anchor in it naming the comment by its
|
|
153
167
|
* key. The longest ids go first, so an id that begins another cannot take a
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../src/comments/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAC9F,OAAO,EAAE,qBAAqB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EACL,wBAAwB,EACxB,iBAAiB,EACjB,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,YAAY,GACb,MAAM,cAAc,CAAC;AAStB;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,oBAAoB,CAClC,OAAuD;IAEvD,IAAI,KAAK,GAAG,CAAC,CAAC;IAEd,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;QACpD,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QACpD,IAAI,MAAe,CAAC;QACpB,IAAI,CAAC;YACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACzD,CAAC;QAAC,MAAM,CAAC;YACP,SAAS;QACX,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;YAAE,SAAS;QAEtE,MAAM,KAAK,GAAG,IAAI,GAAG,EAA0B,CAAC;QAChD,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,KAAc,EAAE,EAAE;YACxD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,CAAC;YACnC,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YACvE,IAAI,CAAC,CAAC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,SAAS,IAAI,OAAO,IAAI,MAAM,CAAC;gBAAE,OAAO,KAAK,CAAC;YAEvF,QAAQ,GAAG,IAAI,CAAC;YAChB,MAAM,KAAK,GAAG,oBAAoB,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YACtD,MAAM,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;YACvB,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAI,EAAE,KAAK,EAAE,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;gBAC1D,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC7D,CAAC;YACD,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;YACtC,IAAI,MAAM,KAAK,SAAS;gBAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YACpE,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ;YAAE,SAAS;QAExB,MAAM,WAAW,GAAG,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC7D,MAAM,QAAQ,GAAG,
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../../src/comments/migrations.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { AdminStore, CommentRecord, PostComment } from '../store/admin-store.ts';
|
|
1
|
+
import type { AdminStore, CommentRecord, CommentStatus, PostComment } from '../store/admin-store.ts';
|
|
2
2
|
import type { Document } from '../content/document.ts';
|
|
3
3
|
import type { RsvpValue } from '../content/rsvp.ts';
|
|
4
4
|
import type { DocumentLookup } from '../content/store.ts';
|
|
@@ -83,16 +83,22 @@ export interface CommentRecords {
|
|
|
83
83
|
/**
|
|
84
84
|
* One post's comments, as its files say them, oldest first.
|
|
85
85
|
*
|
|
86
|
-
* A missing file is no comments, which is what almost every post has.
|
|
87
|
-
*
|
|
88
|
-
*
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
* cannot be read is one nobody could have shown either way.
|
|
86
|
+
* A missing file is no comments, which is what almost every post has. An
|
|
87
|
+
* entry without an id or a name is left out, and every write puts it back as
|
|
88
|
+
* it was. A file that does not parse throws, naming it: every writer reads
|
|
89
|
+
* before it writes, and a file read as empty would be written back holding
|
|
90
|
+
* only the new comment.
|
|
92
91
|
*/
|
|
93
92
|
export declare function readComments(records: Pick<CommentRecords, 'contentDir' | 'dataDir'>, slug: string): CommentRecord[];
|
|
94
|
-
|
|
95
|
-
|
|
93
|
+
export declare function isCarried(comment: {
|
|
94
|
+
readonly via?: string | null | undefined;
|
|
95
|
+
}): boolean;
|
|
96
|
+
/**
|
|
97
|
+
* The emails a private file holds, by comment id. A missing file holds none; one
|
|
98
|
+
* that is not JSON of that shape throws, naming the file, so nothing writes
|
|
99
|
+
* over or removes emails that cannot be read back from anywhere else.
|
|
100
|
+
*/
|
|
101
|
+
export declare function contactsIn(file: string): Map<string, CommentContact>;
|
|
96
102
|
/** A private file's contents: indented, newline ended. */
|
|
97
103
|
export declare function contactsJson(contacts: ReadonlyMap<string, CommentContact>): string;
|
|
98
104
|
/**
|
|
@@ -103,7 +109,7 @@ export declare function contactsJson(contacts: ReadonlyMap<string, CommentContac
|
|
|
103
109
|
* holding the same content directory are never given the same name.
|
|
104
110
|
*/
|
|
105
111
|
export declare function addComment(records: CommentRecords, comment: NewComment): Promise<PostComment>;
|
|
106
|
-
export declare function putComments(records: CommentRecords, slug: string, permalink: string,
|
|
112
|
+
export declare function putComments(records: CommentRecords, slug: string, permalink: string, given: readonly CommentRecord[]): Promise<void>;
|
|
107
113
|
/**
|
|
108
114
|
* Give comments on one post new ids: each one `renames` maps keeps its place
|
|
109
115
|
* under its new id, its email in `data/` follows it, and every reply naming
|
|
@@ -124,11 +130,18 @@ export declare function renameComments(records: CommentRecords, slug: string, re
|
|
|
124
130
|
* such comment. The index is what says which post's file to open, which is the
|
|
125
131
|
* one thing an id alone does not carry.
|
|
126
132
|
*/
|
|
127
|
-
export declare function updateComment(records: CommentRecords, id: string, change: Partial<Pick<CommentRecord, '
|
|
133
|
+
export declare function updateComment(records: CommentRecords, id: string, change: Partial<Pick<CommentRecord, 'content' | 'author' | 'kind' | 'submitted' | 'inReplyTo'>> & {
|
|
134
|
+
/**
|
|
135
|
+
* Where it stands now, or how to decide that from the entry as the file
|
|
136
|
+
* holds it, read inside the lock so a moderator's move is never written over.
|
|
137
|
+
*/
|
|
138
|
+
readonly status?: CommentStatus | ((current: CommentRecord) => CommentStatus);
|
|
128
139
|
/** What the comment now says it is going to, or `null` when it no longer says. */
|
|
129
140
|
readonly rsvp?: RsvpValue | null;
|
|
130
141
|
/** The page now carrying it, or `null` once it is sent on its own. */
|
|
131
142
|
readonly via?: string | null;
|
|
143
|
+
/** Every page carrying it now, `via` among them. */
|
|
144
|
+
readonly carriers?: readonly string[] | null;
|
|
132
145
|
}): Promise<PostComment | undefined>;
|
|
133
146
|
/**
|
|
134
147
|
* Forget a comment altogether.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../src/comments/records.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"records.d.ts","sourceRoot":"","sources":["../../src/comments/records.ts"],"names":[],"mappings":"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"}
|