@geekity/cms 0.56.1 → 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/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
|
@@ -1,14 +1,20 @@
|
|
|
1
|
-
import { rsvpField } from '../store/admin-store.js';
|
|
1
|
+
import { carriersOf, rsvpField } from '../store/admin-store.js';
|
|
2
2
|
import { heldWebmention, intakeComment } from '../comments/intake.js';
|
|
3
|
-
import { deleteComment } from '../comments/records.js';
|
|
3
|
+
import { deleteComment, isCarried, updateComment } from '../comments/records.js';
|
|
4
|
+
import { MAXIMUM_NAME_LENGTH, MAXIMUM_URL_LENGTH } from '../comments/submission.js';
|
|
5
|
+
import { publicDocumentAt } from '../content/permalinks.js';
|
|
6
|
+
import { findQueryRedirect, sortedQuery } from '../content/redirects.js';
|
|
7
|
+
import { landing, siteLinkKey } from '../content/site-links.js';
|
|
4
8
|
import { postLabel } from '../content/post-type.js';
|
|
5
9
|
import { escapeText } from '../util/html.js';
|
|
6
10
|
import { commentKeyAt } from '../comments/conversation.js';
|
|
7
11
|
import { sanitizeCommentHtml } from '../content/sanitize.js';
|
|
8
12
|
import { DISCOVERY_MAX_BYTES } from './discovery.js';
|
|
9
|
-
import { fetchPublic } from './fetch-public.js';
|
|
10
|
-
import { linksTo, sourceEntry } from './microformats.js';
|
|
13
|
+
import { decodeBody, fetchPublic } from './fetch-public.js';
|
|
14
|
+
import { linksIn, linksTo, readSourcePage, sourceEntry } from './microformats.js';
|
|
15
|
+
import { handSyndicationOf, syndicationCopies } from './syndication.js';
|
|
11
16
|
import { isPrivateHost } from '../util/public-address.js';
|
|
17
|
+
import { decodedPath, isOnSite } from '../util/url.js';
|
|
12
18
|
/**
|
|
13
19
|
* Taking a webmention somebody sent this site.
|
|
14
20
|
*
|
|
@@ -59,30 +65,75 @@ export function checkWebmentionRequest(source, target, options) {
|
|
|
59
65
|
return refuse('source', 'The source is not an http or https URL.');
|
|
60
66
|
if (to === undefined)
|
|
61
67
|
return refuse('target', 'The target is not an http or https URL.');
|
|
68
|
+
from.hash = '';
|
|
69
|
+
to.hash = '';
|
|
62
70
|
if (from.href === to.href) {
|
|
63
71
|
return refuse('same', 'The source and the target are the same page.');
|
|
64
72
|
}
|
|
65
73
|
if (isPrivateHost(from.hostname))
|
|
66
74
|
return refuse('source', 'The source is not a public URL.');
|
|
75
|
+
if (!onDefaultPort(from)) {
|
|
76
|
+
return refuse('source', 'The source is not on the default port for http or https.');
|
|
77
|
+
}
|
|
67
78
|
const site = webUrl(options.baseUrl);
|
|
68
|
-
if (site
|
|
79
|
+
if (site !== undefined && isOnSite(from, site)) {
|
|
80
|
+
return refuse('source', 'The source is a page on this site.');
|
|
81
|
+
}
|
|
82
|
+
if (site === undefined || !isOnSite(to, site)) {
|
|
69
83
|
const original = options.syndicatedAt?.(to.href);
|
|
70
84
|
if (original !== undefined) {
|
|
71
85
|
return { ok: true, source: from.href, target: to.href, document: original };
|
|
72
86
|
}
|
|
73
87
|
return refuse('elsewhere', 'The target is not a page on this site.');
|
|
74
88
|
}
|
|
75
|
-
|
|
76
|
-
// post it is under.
|
|
77
|
-
const key = commentKeyAt(to.pathname);
|
|
78
|
-
const pathname = key === undefined
|
|
79
|
-
? to.pathname
|
|
80
|
-
: options.conversation.comment(key, options.site)?.post.permalink;
|
|
81
|
-
const document = pathname === undefined ? undefined : options.documentAt(pathname);
|
|
89
|
+
const document = documentLandedAt(to, options);
|
|
82
90
|
if (document === undefined)
|
|
83
91
|
return refuse('target', 'There is no page here at that address.');
|
|
84
92
|
return { ok: true, source: from.href, target: to.href, document };
|
|
85
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* The post a URL on this site leads to once the site's own redirects are
|
|
96
|
+
* followed, as a request for it would follow them: the other spelling of its
|
|
97
|
+
* trailing slash, a former permalink, and a declared redirect, `/?p=123`
|
|
98
|
+
* included. A query names a post only through a redirect declared for it.
|
|
99
|
+
*/
|
|
100
|
+
function documentLandedAt(to, options) {
|
|
101
|
+
const { redirects } = options;
|
|
102
|
+
const path = siteLinkKey(decodedPath(to.pathname));
|
|
103
|
+
const query = sortedQuery(to.search);
|
|
104
|
+
if (query !== '' &&
|
|
105
|
+
findQueryRedirect(redirects, path, to.search) === undefined &&
|
|
106
|
+
findQueryRedirect(redirects, `${path}/`, to.search) === undefined) {
|
|
107
|
+
return undefined;
|
|
108
|
+
}
|
|
109
|
+
const landed = landing(redirects, { path, query }, (at) => documentAt(at, options) !== undefined);
|
|
110
|
+
return landed === undefined ? undefined : documentAt(landed, options);
|
|
111
|
+
}
|
|
112
|
+
/**
|
|
113
|
+
* The post a path of this site is, was, or is a comment's page on: what is
|
|
114
|
+
* said to a comment's page is said on the post it is under.
|
|
115
|
+
*/
|
|
116
|
+
function documentAt(path, options) {
|
|
117
|
+
if (path === '/' && options.home !== undefined)
|
|
118
|
+
return options.home;
|
|
119
|
+
const spellings = path.endsWith('/') ? [path] : [path, `${path}/`];
|
|
120
|
+
for (const spelled of spellings) {
|
|
121
|
+
const key = commentKeyAt(spelled);
|
|
122
|
+
const permalink = key === undefined ? spelled : options.conversation.comment(key, options.site)?.post.permalink;
|
|
123
|
+
const document = permalink === undefined ? undefined : publicDocumentAt(options.store, permalink);
|
|
124
|
+
if (document !== undefined)
|
|
125
|
+
return document;
|
|
126
|
+
}
|
|
127
|
+
for (const spelled of spellings) {
|
|
128
|
+
const moved = options.store.getByFormerPermalink(spelled);
|
|
129
|
+
if (moved !== undefined)
|
|
130
|
+
return moved;
|
|
131
|
+
}
|
|
132
|
+
return undefined;
|
|
133
|
+
}
|
|
134
|
+
function onDefaultPort(url) {
|
|
135
|
+
return url.port === '';
|
|
136
|
+
}
|
|
86
137
|
/**
|
|
87
138
|
* Go and look at the source, and put what it says in the queue.
|
|
88
139
|
*
|
|
@@ -95,6 +146,28 @@ export function checkWebmentionRequest(source, target, options) {
|
|
|
95
146
|
* server having a bad afternoon must not delete what it said last week.
|
|
96
147
|
*/
|
|
97
148
|
export async function verifyWebmention(options) {
|
|
149
|
+
const told = options.notices;
|
|
150
|
+
if (told === undefined)
|
|
151
|
+
return await verifyAndStore(options);
|
|
152
|
+
const waiting = [];
|
|
153
|
+
try {
|
|
154
|
+
return await verifyAndStore({
|
|
155
|
+
...options,
|
|
156
|
+
notices: {
|
|
157
|
+
pending: (comment) => waiting.push(comment),
|
|
158
|
+
replyApproved: (reply) => {
|
|
159
|
+
told.replyApproved(reply);
|
|
160
|
+
},
|
|
161
|
+
},
|
|
162
|
+
});
|
|
163
|
+
}
|
|
164
|
+
finally {
|
|
165
|
+
const [first, ...carried] = waiting;
|
|
166
|
+
if (first !== undefined)
|
|
167
|
+
told.pending(first, carried);
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
async function verifyAndStore(options) {
|
|
98
171
|
const { incoming, records, now } = options;
|
|
99
172
|
const held = heldWebmention(records, incoming.document.slug, incoming.source);
|
|
100
173
|
const fetched = await readSource(incoming.source, options.lookup);
|
|
@@ -102,34 +175,42 @@ export async function verifyWebmention(options) {
|
|
|
102
175
|
options.logger.warn(`Could not read ${incoming.source} to verify a webmention: ${fetched.reason}`);
|
|
103
176
|
return { kind: 'unreachable', reason: fetched.reason };
|
|
104
177
|
}
|
|
178
|
+
if (fetched.kind === 'read' && fetched.truncated && !mentions(fetched, incoming)) {
|
|
179
|
+
const reason = 'the link was not in the part of the page that was read';
|
|
180
|
+
options.logger.warn(`Could not read all of ${incoming.source} to verify a webmention`);
|
|
181
|
+
return { kind: 'unreachable', reason };
|
|
182
|
+
}
|
|
105
183
|
if (fetched.kind === 'gone' || !mentions(fetched, incoming)) {
|
|
184
|
+
if (fetched.kind === 'read' && namesThePost(fetched, options)) {
|
|
185
|
+
return { kind: 'ignored', why: 'unlinked' };
|
|
186
|
+
}
|
|
106
187
|
const why = fetched.kind === 'gone' ? 'gone' : 'unlinked';
|
|
107
|
-
|
|
108
|
-
|
|
188
|
+
// A source that has gone says nothing about whether it was withdrawn,
|
|
189
|
+
// and whoever sends it again need not be its sender, so what was brought
|
|
190
|
+
// over from the old site is kept.
|
|
191
|
+
if (fetched.kind === 'gone' && held?.migrated === true)
|
|
192
|
+
return { kind: 'ignored', why };
|
|
193
|
+
await dropCarried(options, new Set());
|
|
194
|
+
if (held === undefined || isCarried(held))
|
|
109
195
|
return { kind: 'ignored', why };
|
|
110
196
|
await deleteComment(records, held.id);
|
|
111
197
|
return { kind: 'deleted', why };
|
|
112
198
|
}
|
|
113
|
-
const
|
|
114
|
-
|
|
199
|
+
const isUrlOfPost = urlOfPost(options);
|
|
200
|
+
const entry = fetched.format === 'html'
|
|
201
|
+
? sourceEntry(fetched.page, (url) => url === incoming.target || isUrlOfPost(url), now)
|
|
115
202
|
: // A source that is not HTML — plain text, JSON, anything — has no
|
|
116
203
|
// microformats to read, so all that can be said about it is that it
|
|
117
204
|
// links here.
|
|
118
205
|
undefined;
|
|
206
|
+
if (held !== undefined && isCarried(held) && !isOwnPage(incoming.source, fetched.url, entry)) {
|
|
207
|
+
return { kind: 'stored', comment: held, created: false };
|
|
208
|
+
}
|
|
119
209
|
// The first of the things it answers that is a reply on this post. A source
|
|
120
210
|
// answering one is a reply here even when it never names the post itself.
|
|
121
|
-
const inReplyTo = entry?.inReplyTo
|
|
122
|
-
.map((url) => options.conversation.replyNamed(incoming.document, url, options.site)?.id)
|
|
123
|
-
.find((id) => id !== undefined) ?? null;
|
|
211
|
+
const inReplyTo = answered(options, entry?.inReplyTo ?? []);
|
|
124
212
|
const kind = inReplyTo === null ? (entry?.kind ?? 'mention') : 'reply';
|
|
125
|
-
const author =
|
|
126
|
-
name: entry?.author.name !== undefined && entry.author.name !== ''
|
|
127
|
-
? entry.author.name
|
|
128
|
-
: hostOf(incoming.source),
|
|
129
|
-
url: entry?.author.url ?? null,
|
|
130
|
-
email: null,
|
|
131
|
-
avatar: entry?.author.photo ?? null,
|
|
132
|
-
};
|
|
213
|
+
const author = authorOf(entry?.author, incoming.source);
|
|
133
214
|
// A like and a repost say nothing: the page's title is a title, not a
|
|
134
215
|
// comment, and printing it under a post as though somebody wrote it would be
|
|
135
216
|
// putting words in their mouth.
|
|
@@ -147,7 +228,7 @@ export async function verifyWebmention(options) {
|
|
|
147
228
|
kind,
|
|
148
229
|
author,
|
|
149
230
|
content: { markdown: text, html },
|
|
150
|
-
submitted: entry?.published ?? now.toISOString(),
|
|
231
|
+
submitted: entry?.published ?? held?.submitted ?? now.toISOString(),
|
|
151
232
|
inReplyTo,
|
|
152
233
|
// The URL it was sent from rather than the entry's own `u-url`: this is
|
|
153
234
|
// the identity a later webmention is matched against, and the sender is
|
|
@@ -177,21 +258,38 @@ export async function verifyWebmention(options) {
|
|
|
177
258
|
await keepCarried(options, outcome.comment, entry?.replies ?? []);
|
|
178
259
|
return { kind: 'stored', comment: outcome.comment, created: outcome.created };
|
|
179
260
|
}
|
|
180
|
-
await dropCarried(
|
|
261
|
+
await dropCarried(options, new Set());
|
|
181
262
|
// A source nobody was holding anything from leaves nothing behind, and one
|
|
182
263
|
// whose entry went while this was deciding has already been dealt with.
|
|
183
264
|
return outcome.kind === 'discarded' && outcome.removed
|
|
184
265
|
? { kind: 'deleted', why: 'discarded' }
|
|
185
266
|
: { kind: 'ignored', why: 'discarded' };
|
|
186
267
|
}
|
|
268
|
+
function answered(options, urls) {
|
|
269
|
+
if (urls.length === 0)
|
|
270
|
+
return null;
|
|
271
|
+
const named = options.conversation.replyFinder(options.incoming.document, options.site);
|
|
272
|
+
for (const url of urls) {
|
|
273
|
+
const reply = named(url);
|
|
274
|
+
if (reply !== undefined)
|
|
275
|
+
return reply.id;
|
|
276
|
+
}
|
|
277
|
+
return null;
|
|
278
|
+
}
|
|
279
|
+
/** Whether `source` (which has no fragment by now) is the reply's own page. */
|
|
280
|
+
function isOwnPage(source, fetchedUrl, entry) {
|
|
281
|
+
return fetchedUrl === source || entry?.url === source;
|
|
282
|
+
}
|
|
187
283
|
/**
|
|
188
284
|
* Bring the replies a source carries in its h-entry into the thread under it
|
|
189
285
|
* (a salmention), and take away the ones it carried before and
|
|
190
286
|
* carries no longer.
|
|
191
287
|
*
|
|
192
|
-
* Each is a webmention of its own as far as the thread
|
|
193
|
-
*
|
|
194
|
-
*
|
|
288
|
+
* Each is a webmention of its own as far as the thread is concerned, put
|
|
289
|
+
* through the same intake with its own page as its `url`, and `via` naming
|
|
290
|
+
* the source, which is what lets the source take it away again. The checker
|
|
291
|
+
* is not asked about each: the replies a spam source carries are spam, and the
|
|
292
|
+
* rest wait for a moderator.
|
|
195
293
|
* One this site already has some other way is not copied: a page of this
|
|
196
294
|
* site's, a reply post or a comment's page, or a reply the conversation
|
|
197
295
|
* already names that this source did not bring, such as one held from its own
|
|
@@ -199,14 +297,24 @@ export async function verifyWebmention(options) {
|
|
|
199
297
|
*/
|
|
200
298
|
async function keepCarried(options, carrier, replies) {
|
|
201
299
|
const { incoming, records } = options;
|
|
202
|
-
const site = new URL(options.baseUrl)
|
|
300
|
+
const site = new URL(options.baseUrl);
|
|
203
301
|
const kept = new Set();
|
|
302
|
+
const replyNamed = options.conversation.replyFinder(incoming.document, options.site);
|
|
303
|
+
const verdict = carrier.status === 'spam' ? 'spam' : 'unknown';
|
|
204
304
|
const bring = async (nested, parent) => {
|
|
205
305
|
for (const reply of nested) {
|
|
206
|
-
const named =
|
|
207
|
-
const
|
|
306
|
+
const named = replyNamed(reply.url)?.id;
|
|
307
|
+
const held = named === undefined ? undefined : records.admin.getComment(named);
|
|
308
|
+
const theirs = held?.via === incoming.source;
|
|
208
309
|
let id = named;
|
|
209
|
-
if (
|
|
310
|
+
if (held !== undefined && isCarried(held) && !theirs) {
|
|
311
|
+
const carriers = carriersOf(held);
|
|
312
|
+
if (!carriers.includes(incoming.source)) {
|
|
313
|
+
await updateComment(records, held.id, { carriers: [...carriers, incoming.source] });
|
|
314
|
+
}
|
|
315
|
+
kept.add(held.id);
|
|
316
|
+
}
|
|
317
|
+
else if (!isOnSite(new URL(reply.url), site) && (named === undefined || theirs)) {
|
|
210
318
|
const outcome = await intakeComment({
|
|
211
319
|
records,
|
|
212
320
|
origin: 'webmention',
|
|
@@ -214,7 +322,7 @@ async function keepCarried(options, carrier, replies) {
|
|
|
214
322
|
post: { title: postLabel(incoming.document), url: incoming.target },
|
|
215
323
|
dataDir: options.dataDir,
|
|
216
324
|
baseUrl: options.baseUrl,
|
|
217
|
-
|
|
325
|
+
verdict,
|
|
218
326
|
notices: options.notices,
|
|
219
327
|
address: incoming.address,
|
|
220
328
|
userAgent: incoming.userAgent,
|
|
@@ -230,14 +338,37 @@ async function keepCarried(options, carrier, replies) {
|
|
|
230
338
|
}
|
|
231
339
|
};
|
|
232
340
|
await bring(replies, carrier.id);
|
|
233
|
-
await dropCarried(
|
|
341
|
+
await dropCarried(options, kept);
|
|
234
342
|
}
|
|
235
|
-
/**
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
343
|
+
/**
|
|
344
|
+
* Take away what a source carried, but for the ones in `kept`. One that
|
|
345
|
+
* another page still carries stays: when the source was the page it is shown
|
|
346
|
+
* under, it passes to the next page carrying it, approval and all, and
|
|
347
|
+
* threads under that page's own entry.
|
|
348
|
+
*/
|
|
349
|
+
async function dropCarried(options, kept) {
|
|
350
|
+
const { records, incoming } = options;
|
|
351
|
+
const slug = incoming.document.slug;
|
|
352
|
+
for (const comment of records.admin.listCommentsFor(slug)) {
|
|
353
|
+
const carriers = carriersOf(comment);
|
|
354
|
+
if (kept.has(comment.id) || !carriers.includes(incoming.source))
|
|
355
|
+
continue;
|
|
356
|
+
const others = carriers.filter((page) => page !== incoming.source);
|
|
357
|
+
const [heir] = others;
|
|
358
|
+
if (heir === undefined) {
|
|
239
359
|
await deleteComment(records, comment.id);
|
|
240
360
|
}
|
|
361
|
+
else if (comment.via === incoming.source) {
|
|
362
|
+
const parent = heldWebmention(records, slug, heir)?.id ?? comment.inReplyTo;
|
|
363
|
+
await updateComment(records, comment.id, {
|
|
364
|
+
via: heir,
|
|
365
|
+
carriers: others,
|
|
366
|
+
inReplyTo: parent,
|
|
367
|
+
});
|
|
368
|
+
}
|
|
369
|
+
else {
|
|
370
|
+
await updateComment(records, comment.id, { carriers: others });
|
|
371
|
+
}
|
|
241
372
|
}
|
|
242
373
|
}
|
|
243
374
|
/** One nested reply as the comment it is proposed as. */
|
|
@@ -248,19 +379,16 @@ function carriedComment(options, reply, parent) {
|
|
|
248
379
|
permalink: incoming.document.permalink,
|
|
249
380
|
source: 'webmention',
|
|
250
381
|
kind: 'reply',
|
|
251
|
-
author:
|
|
252
|
-
name: reply.author.name === '' ? hostOf(reply.url) : reply.author.name,
|
|
253
|
-
url: reply.author.url,
|
|
254
|
-
email: null,
|
|
255
|
-
avatar: reply.author.photo,
|
|
256
|
-
},
|
|
382
|
+
author: authorOf(reply.author, reply.url),
|
|
257
383
|
content: {
|
|
258
384
|
markdown: reply.content.text,
|
|
259
385
|
html: reply.content.html === ''
|
|
260
386
|
? paragraph(reply.content.text)
|
|
261
387
|
: sanitizeCommentHtml(reply.content.html),
|
|
262
388
|
},
|
|
263
|
-
submitted: reply.published ??
|
|
389
|
+
submitted: reply.published ??
|
|
390
|
+
heldWebmention(options.records, incoming.document.slug, reply.url)?.submitted ??
|
|
391
|
+
options.now.toISOString(),
|
|
264
392
|
inReplyTo: parent,
|
|
265
393
|
url: reply.url,
|
|
266
394
|
via: incoming.source,
|
|
@@ -276,34 +404,105 @@ async function readSource(source, lookup) {
|
|
|
276
404
|
overflow: 'truncate',
|
|
277
405
|
accept: 'text/html, */*;q=0.8',
|
|
278
406
|
contentType: { pattern: /^/, name: 'anything' },
|
|
407
|
+
allowed: onDefaultPort,
|
|
279
408
|
});
|
|
280
409
|
if (!fetched.ok) {
|
|
281
|
-
|
|
282
|
-
// A server that is broken is a different thing and takes nothing with it.
|
|
283
|
-
if (fetched.status !== undefined && fetched.status >= 400 && fetched.status < 500) {
|
|
410
|
+
if (fetched.status === 404 || fetched.status === 410)
|
|
284
411
|
return { kind: 'gone' };
|
|
285
|
-
}
|
|
286
412
|
return { kind: 'unreachable', reason: fetched.reason };
|
|
287
413
|
}
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
|
|
414
|
+
const body = decodeBody(fetched.body, fetched.type);
|
|
415
|
+
const read = { kind: 'read', url: fetched.url, truncated: fetched.truncated };
|
|
416
|
+
if (/^\s*(text\/html|application\/xhtml\+xml)/i.test(fetched.type)) {
|
|
417
|
+
return { ...read, format: 'html', page: readSourcePage(body, fetched.url) };
|
|
418
|
+
}
|
|
419
|
+
const json = /^\s*application\/([\w.-]+\+)?json\s*(;|$)/i.test(fetched.type);
|
|
420
|
+
return { ...read, format: json ? 'json' : 'text', body };
|
|
294
421
|
}
|
|
295
422
|
/**
|
|
296
423
|
* Whether what was read really links to the target.
|
|
297
424
|
*
|
|
298
425
|
* HTML is parsed, because a link is a link and the target written out in the
|
|
299
|
-
* prose is not one. Anything else
|
|
300
|
-
*
|
|
301
|
-
* with no links can offer and what the spec asks for.
|
|
426
|
+
* prose is not one. Anything else has no links, so it is read for the URLs it
|
|
427
|
+
* names, as {@link urlsNamedIn} finds them.
|
|
302
428
|
*/
|
|
303
429
|
function mentions(fetched, incoming) {
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
430
|
+
if (fetched.format === 'html')
|
|
431
|
+
return linksTo(fetched.page, incoming.target);
|
|
432
|
+
const wanted = webUrl(incoming.target);
|
|
433
|
+
return wanted !== undefined && urlsNamedIn(fetched).has(wanted.href);
|
|
434
|
+
}
|
|
435
|
+
function namesThePost(fetched, options) {
|
|
436
|
+
const named = fetched.format === 'html' ? linksIn(fetched.page) : urlsNamedIn(fetched);
|
|
437
|
+
return [...named].some(urlOfPost(options));
|
|
438
|
+
}
|
|
439
|
+
/**
|
|
440
|
+
* The URLs a source that is not HTML names, normalised and less any fragment.
|
|
441
|
+
*
|
|
442
|
+
* A JSON value names a URL only when the whole string is one, so an endpoint
|
|
443
|
+
* that echoes a longer URL back names nothing. Plain text, and JSON too broken
|
|
444
|
+
* to parse, names a URL that stands on its own between spaces, quotes or
|
|
445
|
+
* brackets, less any full stop or comma that ends the sentence.
|
|
446
|
+
*/
|
|
447
|
+
function urlsNamedIn(fetched) {
|
|
448
|
+
const candidates = (fetched.format === 'json' ? jsonStrings(fetched.body) : undefined) ??
|
|
449
|
+
(fetched.body.match(/https?:\/\/[^\s"'`<>()\\]+/gi) ?? []).map((url) => url.replace(/[.,;:!?]+$/, ''));
|
|
450
|
+
const named = new Set();
|
|
451
|
+
for (const candidate of candidates) {
|
|
452
|
+
const url = webUrl(candidate);
|
|
453
|
+
if (url === undefined)
|
|
454
|
+
continue;
|
|
455
|
+
url.hash = '';
|
|
456
|
+
named.add(url.href);
|
|
457
|
+
}
|
|
458
|
+
return named;
|
|
459
|
+
}
|
|
460
|
+
/** Every string value in a JSON document, or `undefined` when it does not parse. */
|
|
461
|
+
function jsonStrings(body) {
|
|
462
|
+
let parsed;
|
|
463
|
+
try {
|
|
464
|
+
parsed = JSON.parse(body);
|
|
465
|
+
}
|
|
466
|
+
catch {
|
|
467
|
+
return undefined;
|
|
468
|
+
}
|
|
469
|
+
const strings = [];
|
|
470
|
+
const pending = [parsed];
|
|
471
|
+
while (pending.length > 0) {
|
|
472
|
+
const value = pending.pop();
|
|
473
|
+
if (typeof value === 'string')
|
|
474
|
+
strings.push(value);
|
|
475
|
+
else if (typeof value === 'object' && value !== null) {
|
|
476
|
+
for (const inner of Object.values(value))
|
|
477
|
+
pending.push(inner);
|
|
478
|
+
}
|
|
479
|
+
}
|
|
480
|
+
return strings;
|
|
481
|
+
}
|
|
482
|
+
/**
|
|
483
|
+
* Whether a URL is one the site leads to the post (its page, a former one, a
|
|
484
|
+
* comment page on it, or a redirect to it), or a syndicated copy. The copies
|
|
485
|
+
* are read once, however many URLs are asked about.
|
|
486
|
+
*/
|
|
487
|
+
function urlOfPost(options) {
|
|
488
|
+
const { document } = options.incoming;
|
|
489
|
+
const site = new URL(options.baseUrl);
|
|
490
|
+
let copies;
|
|
491
|
+
return (href) => {
|
|
492
|
+
const url = webUrl(href);
|
|
493
|
+
if (url === undefined)
|
|
494
|
+
return false;
|
|
495
|
+
url.hash = '';
|
|
496
|
+
if (isOnSite(url, site)) {
|
|
497
|
+
const landed = documentLandedAt(url, options);
|
|
498
|
+
return landed !== undefined && landed.path === document.path;
|
|
499
|
+
}
|
|
500
|
+
copies ??= [
|
|
501
|
+
...handSyndicationOf(document.extra),
|
|
502
|
+
...Object.values(syndicationCopies(options.records.contentDir).read(document.permalink)),
|
|
503
|
+
];
|
|
504
|
+
return copies.includes(url.href);
|
|
505
|
+
};
|
|
307
506
|
}
|
|
308
507
|
/** A URL, when it is an http or https one, and `undefined` otherwise. */
|
|
309
508
|
function webUrl(value) {
|
|
@@ -320,6 +519,28 @@ function webUrl(value) {
|
|
|
320
519
|
return undefined;
|
|
321
520
|
return url;
|
|
322
521
|
}
|
|
522
|
+
/**
|
|
523
|
+
* Who a source says wrote it, kept to what the comment form takes: a name on
|
|
524
|
+
* one line and no longer than a form's, the host it is on when it gives none,
|
|
525
|
+
* and no link or photo too long for a form to have taken.
|
|
526
|
+
*/
|
|
527
|
+
function authorOf(author, page) {
|
|
528
|
+
const name = (author?.name ?? '')
|
|
529
|
+
.replace(/\s+/g, ' ')
|
|
530
|
+
.trim()
|
|
531
|
+
.slice(0, MAXIMUM_NAME_LENGTH)
|
|
532
|
+
.replace(/[\uD800-\uDBFF]$/, '')
|
|
533
|
+
.trimEnd();
|
|
534
|
+
return {
|
|
535
|
+
name: name === '' ? hostOf(page) : name,
|
|
536
|
+
url: formLength(author?.url ?? null),
|
|
537
|
+
email: null,
|
|
538
|
+
avatar: formLength(author?.photo ?? null),
|
|
539
|
+
};
|
|
540
|
+
}
|
|
541
|
+
function formLength(url) {
|
|
542
|
+
return url !== null && url.length <= MAXIMUM_URL_LENGTH ? url : null;
|
|
543
|
+
}
|
|
323
544
|
/** The host a source is on, for a page that never says who wrote it. */
|
|
324
545
|
function hostOf(source) {
|
|
325
546
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../src/webmention/receive.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"receive.js","sourceRoot":"","sources":["../../src/webmention/receive.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import sax from 'sax';
|
|
2
2
|
import { elementsIn, hasRel } from '../../util/html-tree.js';
|
|
3
|
-
import { fetchPublic, webUrl } from '../fetch-public.js';
|
|
3
|
+
import { decodeBody, fetchPublic, webUrl } from '../fetch-public.js';
|
|
4
4
|
import { canonicalLink } from './page.js';
|
|
5
5
|
import { resolved, withoutDirectionControls } from './source.js';
|
|
6
6
|
const RSS_TYPE = /^\s*application\/rss\+xml\s*(;|$)/i;
|
|
@@ -25,7 +25,7 @@ export async function answeredFeed(page, target, limits) {
|
|
|
25
25
|
if (!fetched.ok)
|
|
26
26
|
return undefined;
|
|
27
27
|
const names = new Set([target, page.url, canonicalLink(page.root, page.url)].filter((url) => url !== undefined));
|
|
28
|
-
return feedHolding(
|
|
28
|
+
return feedHolding(decodeBody(fetched.body, fetched.type), fetched.url, names);
|
|
29
29
|
}
|
|
30
30
|
function advertisedFeed(page) {
|
|
31
31
|
for (const element of elementsIn(page.root)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../../src/webmention/reply-context/feed.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,KAAK,CAAC;AAEtB,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"feed.js","sourceRoot":"","sources":["../../../src/webmention/reply-context/feed.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { discoverPostType } from '../../content/post-type.js';
|
|
2
2
|
import { elementsIn, hasRel, parseHtml, textOf } from '../../util/html-tree.js';
|
|
3
|
-
import { fetchPublic, webUrl } from '../fetch-public.js';
|
|
3
|
+
import { decodeBody, fetchPublic, webUrl } from '../fetch-public.js';
|
|
4
4
|
import { citedEntry, citedEvent } from '../microformats.js';
|
|
5
5
|
import { NAMELESS_NOTE, resolved, withoutDirectionControls } from './source.js';
|
|
6
6
|
const IMAGE_TYPE = /^\s*image\//i;
|
|
@@ -23,7 +23,7 @@ export async function readPage(url, limits) {
|
|
|
23
23
|
return { ok: false, reason: fetched.reason };
|
|
24
24
|
if (fetched.read === 'headers')
|
|
25
25
|
return { ok: true, image: fetched.url };
|
|
26
|
-
const root = parseHtml(
|
|
26
|
+
const root = parseHtml(decodeBody(fetched.body, fetched.type));
|
|
27
27
|
const entry = fetched.truncated ? undefined : citedEntry(root, fetched.url);
|
|
28
28
|
const event = fetched.truncated ? undefined : citedEvent(root, fetched.url);
|
|
29
29
|
return { ok: true, page: { url: fetched.url, root, entry, event } };
|