@geekity/cms 0.51.0 → 0.52.1

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.
Files changed (346) hide show
  1. package/admin/components/badge.njk +1 -0
  2. package/admin/pages/account/forgot.njk +13 -7
  3. package/admin/pages/account/reset.njk +1 -1
  4. package/admin/pages/federation/followers.njk +8 -4
  5. package/admin/pages/federation/resend.njk +2 -2
  6. package/admin/pages/users/edit.njk +36 -4
  7. package/admin/pages/users/new.njk +19 -1
  8. package/admin/static/admin.css +27 -37
  9. package/dist/admin/admin-bar.d.ts.map +1 -1
  10. package/dist/admin/admin-bar.js +11 -10
  11. package/dist/admin/admin-bar.js.map +1 -1
  12. package/dist/admin/autosave.d.ts.map +1 -1
  13. package/dist/admin/autosave.js +1 -2
  14. package/dist/admin/autosave.js.map +1 -1
  15. package/dist/admin/confirm-password.d.ts +19 -1
  16. package/dist/admin/confirm-password.d.ts.map +1 -1
  17. package/dist/admin/confirm-password.js +40 -8
  18. package/dist/admin/confirm-password.js.map +1 -1
  19. package/dist/admin/connected-apps.d.ts.map +1 -1
  20. package/dist/admin/connected-apps.js +1 -0
  21. package/dist/admin/connected-apps.js.map +1 -1
  22. package/dist/admin/credentials.d.ts +0 -1
  23. package/dist/admin/credentials.d.ts.map +1 -1
  24. package/dist/admin/credentials.js +1 -2
  25. package/dist/admin/credentials.js.map +1 -1
  26. package/dist/admin/documents.d.ts +0 -7
  27. package/dist/admin/documents.d.ts.map +1 -1
  28. package/dist/admin/documents.js +1 -15
  29. package/dist/admin/documents.js.map +1 -1
  30. package/dist/admin/export.d.ts +2 -0
  31. package/dist/admin/export.d.ts.map +1 -1
  32. package/dist/admin/export.js +5 -4
  33. package/dist/admin/export.js.map +1 -1
  34. package/dist/admin/federation.d.ts +4 -4
  35. package/dist/admin/federation.d.ts.map +1 -1
  36. package/dist/admin/federation.js +31 -16
  37. package/dist/admin/federation.js.map +1 -1
  38. package/dist/admin/headers.d.ts.map +1 -1
  39. package/dist/admin/headers.js +4 -0
  40. package/dist/admin/headers.js.map +1 -1
  41. package/dist/admin/index.d.ts +7 -7
  42. package/dist/admin/index.d.ts.map +1 -1
  43. package/dist/admin/index.js +5 -5
  44. package/dist/admin/index.js.map +1 -1
  45. package/dist/admin/indieauth-consent.d.ts.map +1 -1
  46. package/dist/admin/indieauth-consent.js +4 -3
  47. package/dist/admin/indieauth-consent.js.map +1 -1
  48. package/dist/admin/legacy-migrations.d.ts.map +1 -1
  49. package/dist/admin/legacy-migrations.js +6 -2
  50. package/dist/admin/legacy-migrations.js.map +1 -1
  51. package/dist/admin/plugins.d.ts +2 -0
  52. package/dist/admin/plugins.d.ts.map +1 -1
  53. package/dist/admin/plugins.js +15 -11
  54. package/dist/admin/plugins.js.map +1 -1
  55. package/dist/admin/recovery.d.ts +7 -4
  56. package/dist/admin/recovery.d.ts.map +1 -1
  57. package/dist/admin/recovery.js +68 -43
  58. package/dist/admin/recovery.js.map +1 -1
  59. package/dist/admin/routes.d.ts.map +1 -1
  60. package/dist/admin/routes.js +99 -76
  61. package/dist/admin/routes.js.map +1 -1
  62. package/dist/admin/taxonomy.d.ts.map +1 -1
  63. package/dist/admin/taxonomy.js +28 -19
  64. package/dist/admin/taxonomy.js.map +1 -1
  65. package/dist/admin/uploads.d.ts +4 -13
  66. package/dist/admin/uploads.d.ts.map +1 -1
  67. package/dist/admin/uploads.js +9 -28
  68. package/dist/admin/uploads.js.map +1 -1
  69. package/dist/admin/users.d.ts +7 -0
  70. package/dist/admin/users.d.ts.map +1 -1
  71. package/dist/admin/users.js +166 -43
  72. package/dist/admin/users.js.map +1 -1
  73. package/dist/cli/commands.d.ts.map +1 -1
  74. package/dist/cli/commands.js +13 -2
  75. package/dist/cli/commands.js.map +1 -1
  76. package/dist/cli/help.d.ts.map +1 -1
  77. package/dist/cli/help.js +5 -4
  78. package/dist/cli/help.js.map +1 -1
  79. package/dist/cli/password.js +3 -3
  80. package/dist/cli/password.js.map +1 -1
  81. package/dist/cli/resend.d.ts.map +1 -1
  82. package/dist/cli/resend.js +26 -5
  83. package/dist/cli/resend.js.map +1 -1
  84. package/dist/cli/run-job.d.ts +1 -1
  85. package/dist/cli/run-job.d.ts.map +1 -1
  86. package/dist/cli/run-job.js +2 -2
  87. package/dist/cli/run-job.js.map +1 -1
  88. package/dist/cli/serve.d.ts.map +1 -1
  89. package/dist/cli/serve.js +17 -0
  90. package/dist/cli/serve.js.map +1 -1
  91. package/dist/cli/user.d.ts +1 -1
  92. package/dist/cli/user.d.ts.map +1 -1
  93. package/dist/cli/user.js +79 -12
  94. package/dist/cli/user.js.map +1 -1
  95. package/dist/cms/services.d.ts.map +1 -1
  96. package/dist/cms/services.js +36 -14
  97. package/dist/cms/services.js.map +1 -1
  98. package/dist/config.d.ts +16 -4
  99. package/dist/config.d.ts.map +1 -1
  100. package/dist/config.js +6 -1
  101. package/dist/config.js.map +1 -1
  102. package/dist/content/authors.d.ts +6 -0
  103. package/dist/content/authors.d.ts.map +1 -1
  104. package/dist/content/authors.js +9 -0
  105. package/dist/content/authors.js.map +1 -1
  106. package/dist/content/reconcile.d.ts.map +1 -1
  107. package/dist/content/reconcile.js +20 -14
  108. package/dist/content/reconcile.js.map +1 -1
  109. package/dist/content/save.d.ts +33 -0
  110. package/dist/content/save.d.ts.map +1 -1
  111. package/dist/content/save.js +84 -5
  112. package/dist/content/save.js.map +1 -1
  113. package/dist/content/schedule.d.ts.map +1 -1
  114. package/dist/content/schedule.js +30 -6
  115. package/dist/content/schedule.js.map +1 -1
  116. package/dist/content/sync.d.ts +7 -0
  117. package/dist/content/sync.d.ts.map +1 -1
  118. package/dist/content/sync.js +41 -9
  119. package/dist/content/sync.js.map +1 -1
  120. package/dist/content/trash.d.ts.map +1 -1
  121. package/dist/content/trash.js +24 -17
  122. package/dist/content/trash.js.map +1 -1
  123. package/dist/content/write.d.ts.map +1 -1
  124. package/dist/content/write.js +64 -41
  125. package/dist/content/write.js.map +1 -1
  126. package/dist/federation/actor.d.ts.map +1 -1
  127. package/dist/federation/actor.js +9 -5
  128. package/dist/federation/actor.js.map +1 -1
  129. package/dist/federation/article.d.ts +27 -13
  130. package/dist/federation/article.d.ts.map +1 -1
  131. package/dist/federation/article.js +44 -33
  132. package/dist/federation/article.js.map +1 -1
  133. package/dist/federation/backfill.d.ts.map +1 -1
  134. package/dist/federation/backfill.js +3 -3
  135. package/dist/federation/backfill.js.map +1 -1
  136. package/dist/federation/citations.d.ts +1 -1
  137. package/dist/federation/citations.d.ts.map +1 -1
  138. package/dist/federation/citations.js +74 -19
  139. package/dist/federation/citations.js.map +1 -1
  140. package/dist/federation/delivery-plan.d.ts +17 -2
  141. package/dist/federation/delivery-plan.d.ts.map +1 -1
  142. package/dist/federation/delivery-plan.js +66 -6
  143. package/dist/federation/delivery-plan.js.map +1 -1
  144. package/dist/federation/delivery.d.ts +22 -19
  145. package/dist/federation/delivery.d.ts.map +1 -1
  146. package/dist/federation/delivery.js +186 -120
  147. package/dist/federation/delivery.js.map +1 -1
  148. package/dist/federation/federation.d.ts.map +1 -1
  149. package/dist/federation/federation.js +1 -3
  150. package/dist/federation/federation.js.map +1 -1
  151. package/dist/federation/handles.d.ts.map +1 -1
  152. package/dist/federation/handles.js +22 -1
  153. package/dist/federation/handles.js.map +1 -1
  154. package/dist/federation/keys.d.ts +5 -0
  155. package/dist/federation/keys.d.ts.map +1 -1
  156. package/dist/federation/keys.js +32 -16
  157. package/dist/federation/keys.js.map +1 -1
  158. package/dist/federation/object-ids.d.ts.map +1 -1
  159. package/dist/federation/object-ids.js +32 -13
  160. package/dist/federation/object-ids.js.map +1 -1
  161. package/dist/federation/ordered-queue.d.ts +16 -0
  162. package/dist/federation/ordered-queue.d.ts.map +1 -0
  163. package/dist/federation/ordered-queue.js +77 -0
  164. package/dist/federation/ordered-queue.js.map +1 -0
  165. package/dist/federation/outbox-observer.d.ts +3 -1
  166. package/dist/federation/outbox-observer.d.ts.map +1 -1
  167. package/dist/federation/outbox-observer.js +18 -6
  168. package/dist/federation/outbox-observer.js.map +1 -1
  169. package/dist/federation/paths.d.ts +3 -4
  170. package/dist/federation/paths.d.ts.map +1 -1
  171. package/dist/federation/paths.js +3 -4
  172. package/dist/federation/paths.js.map +1 -1
  173. package/dist/federation/profiles.d.ts.map +1 -1
  174. package/dist/federation/profiles.js +5 -4
  175. package/dist/federation/profiles.js.map +1 -1
  176. package/dist/federation/queue.d.ts +9 -4
  177. package/dist/federation/queue.d.ts.map +1 -1
  178. package/dist/federation/queue.js +12 -6
  179. package/dist/federation/queue.js.map +1 -1
  180. package/dist/federation/records.d.ts.map +1 -1
  181. package/dist/federation/records.js +17 -1
  182. package/dist/federation/records.js.map +1 -1
  183. package/dist/federation/relays.d.ts +20 -11
  184. package/dist/federation/relays.d.ts.map +1 -1
  185. package/dist/federation/relays.js +108 -83
  186. package/dist/federation/relays.js.map +1 -1
  187. package/dist/federation/reply-targets.d.ts +5 -2
  188. package/dist/federation/reply-targets.d.ts.map +1 -1
  189. package/dist/federation/reply-targets.js +24 -14
  190. package/dist/federation/reply-targets.js.map +1 -1
  191. package/dist/federation/resend-job.d.ts +10 -4
  192. package/dist/federation/resend-job.d.ts.map +1 -1
  193. package/dist/federation/resend-job.js +27 -19
  194. package/dist/federation/resend-job.js.map +1 -1
  195. package/dist/federation/retry-job.d.ts +26 -8
  196. package/dist/federation/retry-job.d.ts.map +1 -1
  197. package/dist/federation/retry-job.js +114 -45
  198. package/dist/federation/retry-job.js.map +1 -1
  199. package/dist/federation/send-deadline.d.ts +13 -0
  200. package/dist/federation/send-deadline.d.ts.map +1 -0
  201. package/dist/federation/send-deadline.js +30 -0
  202. package/dist/federation/send-deadline.js.map +1 -0
  203. package/dist/files/atomic.d.ts +7 -1
  204. package/dist/files/atomic.d.ts.map +1 -1
  205. package/dist/files/atomic.js +75 -14
  206. package/dist/files/atomic.js.map +1 -1
  207. package/dist/files/data-files.d.ts +12 -0
  208. package/dist/files/data-files.d.ts.map +1 -1
  209. package/dist/files/data-files.js +24 -0
  210. package/dist/files/data-files.js.map +1 -1
  211. package/dist/files/lock-file.d.ts.map +1 -0
  212. package/dist/{jobs → files}/lock-file.js +1 -1
  213. package/dist/files/lock-file.js.map +1 -0
  214. package/dist/gemini/certificate.d.ts.map +1 -1
  215. package/dist/gemini/certificate.js +15 -12
  216. package/dist/gemini/certificate.js.map +1 -1
  217. package/dist/indieauth/grants.d.ts +1 -0
  218. package/dist/indieauth/grants.d.ts.map +1 -1
  219. package/dist/indieauth/grants.js.map +1 -1
  220. package/dist/indieauth/tokens.d.ts +4 -1
  221. package/dist/indieauth/tokens.d.ts.map +1 -1
  222. package/dist/indieauth/tokens.js +7 -3
  223. package/dist/indieauth/tokens.js.map +1 -1
  224. package/dist/jobs/file-records.js +1 -1
  225. package/dist/jobs/file-records.js.map +1 -1
  226. package/dist/jobs/processes.d.ts +0 -1
  227. package/dist/jobs/processes.d.ts.map +1 -1
  228. package/dist/jobs/processes.js +1 -9
  229. package/dist/jobs/processes.js.map +1 -1
  230. package/dist/jobs/queue.d.ts.map +1 -1
  231. package/dist/jobs/queue.js +5 -4
  232. package/dist/jobs/queue.js.map +1 -1
  233. package/dist/jobs/types.d.ts +8 -2
  234. package/dist/jobs/types.d.ts.map +1 -1
  235. package/dist/jobs/types.js.map +1 -1
  236. package/dist/mcp/authoring/shared.d.ts.map +1 -1
  237. package/dist/mcp/authoring/shared.js +2 -3
  238. package/dist/mcp/authoring/shared.js.map +1 -1
  239. package/dist/mcp/repair/resend.js +1 -1
  240. package/dist/mcp/repair/resend.js.map +1 -1
  241. package/dist/mcp/repair/retry.d.ts.map +1 -1
  242. package/dist/mcp/repair/retry.js +20 -8
  243. package/dist/mcp/repair/retry.js.map +1 -1
  244. package/dist/micropub/endpoint.d.ts.map +1 -1
  245. package/dist/micropub/endpoint.js +3 -6
  246. package/dist/micropub/endpoint.js.map +1 -1
  247. package/dist/notifications/mail-service.d.ts.map +1 -1
  248. package/dist/notifications/mail-service.js +16 -1
  249. package/dist/notifications/mail-service.js.map +1 -1
  250. package/dist/plugin.d.ts +3 -2
  251. package/dist/plugin.d.ts.map +1 -1
  252. package/dist/plugin.js.map +1 -1
  253. package/dist/plugins/site.d.ts.map +1 -1
  254. package/dist/plugins/site.js +1 -1
  255. package/dist/plugins/site.js.map +1 -1
  256. package/dist/privacy/retention.d.ts.map +1 -1
  257. package/dist/privacy/retention.js +9 -0
  258. package/dist/privacy/retention.js.map +1 -1
  259. package/dist/site/admin-paths.d.ts +7 -0
  260. package/dist/site/admin-paths.d.ts.map +1 -1
  261. package/dist/site/admin-paths.js +18 -0
  262. package/dist/site/admin-paths.js.map +1 -1
  263. package/dist/site/passwords.d.ts +9 -2
  264. package/dist/site/passwords.d.ts.map +1 -1
  265. package/dist/site/passwords.js +45 -14
  266. package/dist/site/passwords.js.map +1 -1
  267. package/dist/site/setting-values.d.ts +3 -2
  268. package/dist/site/setting-values.d.ts.map +1 -1
  269. package/dist/site/setting-values.js +7 -4
  270. package/dist/site/setting-values.js.map +1 -1
  271. package/dist/site/users.d.ts +85 -11
  272. package/dist/site/users.d.ts.map +1 -1
  273. package/dist/site/users.js +237 -37
  274. package/dist/site/users.js.map +1 -1
  275. package/dist/store/deliveries.d.ts +24 -5
  276. package/dist/store/deliveries.d.ts.map +1 -1
  277. package/dist/store/deliveries.js +86 -31
  278. package/dist/store/deliveries.js.map +1 -1
  279. package/dist/store/queue-database.d.ts +19 -2
  280. package/dist/store/queue-database.d.ts.map +1 -1
  281. package/dist/store/queue-database.js +69 -4
  282. package/dist/store/queue-database.js.map +1 -1
  283. package/dist/store/queue-order.d.ts +17 -0
  284. package/dist/store/queue-order.d.ts.map +1 -0
  285. package/dist/store/queue-order.js +33 -0
  286. package/dist/store/queue-order.js.map +1 -0
  287. package/dist/store/relays.d.ts +5 -3
  288. package/dist/store/relays.d.ts.map +1 -1
  289. package/dist/store/relays.js +1 -1
  290. package/dist/store/relays.js.map +1 -1
  291. package/dist/store/schema.d.ts.map +1 -1
  292. package/dist/store/schema.js +23 -0
  293. package/dist/store/schema.js.map +1 -1
  294. package/dist/store/sessions.d.ts +3 -0
  295. package/dist/store/sessions.d.ts.map +1 -1
  296. package/dist/store/sessions.js +27 -18
  297. package/dist/store/sessions.js.map +1 -1
  298. package/dist/store/tokens.d.ts +4 -2
  299. package/dist/store/tokens.d.ts.map +1 -1
  300. package/dist/store/tokens.js +16 -10
  301. package/dist/store/tokens.js.map +1 -1
  302. package/dist/util/errors.d.ts +6 -0
  303. package/dist/util/errors.d.ts.map +1 -1
  304. package/dist/util/errors.js +11 -0
  305. package/dist/util/errors.js.map +1 -1
  306. package/dist/util/html-tree.d.ts +4 -0
  307. package/dist/util/html-tree.d.ts.map +1 -1
  308. package/dist/util/html-tree.js +34 -0
  309. package/dist/util/html-tree.js.map +1 -1
  310. package/dist/util/process-alive.d.ts +3 -0
  311. package/dist/util/process-alive.d.ts.map +1 -0
  312. package/dist/util/process-alive.js +11 -0
  313. package/dist/util/process-alive.js.map +1 -0
  314. package/dist/web/compression.js +2 -3
  315. package/dist/web/compression.js.map +1 -1
  316. package/dist/web/indieauth-bearer.js +2 -2
  317. package/dist/web/indieauth-bearer.js.map +1 -1
  318. package/dist/web/indieauth-token.js +3 -3
  319. package/dist/web/indieauth-token.js.map +1 -1
  320. package/dist/web/session.d.ts +6 -1
  321. package/dist/web/session.d.ts.map +1 -1
  322. package/dist/web/session.js +21 -3
  323. package/dist/web/session.js.map +1 -1
  324. package/dist/web/signed-in.d.ts.map +1 -1
  325. package/dist/web/signed-in.js +6 -2
  326. package/dist/web/signed-in.js.map +1 -1
  327. package/dist/web/throttle.d.ts +26 -18
  328. package/dist/web/throttle.d.ts.map +1 -1
  329. package/dist/web/throttle.js +130 -24
  330. package/dist/web/throttle.js.map +1 -1
  331. package/dist/webmention/service.d.ts +2 -2
  332. package/dist/webmention/service.d.ts.map +1 -1
  333. package/dist/webmention/service.js +3 -16
  334. package/dist/webmention/service.js.map +1 -1
  335. package/package.json +11 -11
  336. package/templates/site/gitignore +4 -0
  337. package/themes/default/mail/email-changed.html.njk +17 -0
  338. package/themes/default/mail/email-changed.subject.njk +1 -0
  339. package/themes/default/mail/email-changed.txt.njk +14 -0
  340. package/themes/default/mail/password-changed.html.njk +1 -1
  341. package/themes/default/mail/password-changed.txt.njk +2 -1
  342. package/themes/default/partials/jsonld.njk +1 -1
  343. package/themes/default/static/style.css +8 -8
  344. package/dist/jobs/lock-file.d.ts.map +0 -1
  345. package/dist/jobs/lock-file.js.map +0 -1
  346. /package/dist/{jobs → files}/lock-file.d.ts +0 -0
@@ -4,16 +4,19 @@
4
4
  * post, a bookmark included, federates as the `Note` or `Article` it is, whose
5
5
  * content links the page it cites.
6
6
  */
7
+ import { FetchError } from '@fedify/fedify';
7
8
  import { Announce, isActor, Like, PUBLIC_COLLECTION, Undo } from '@fedify/vocab';
8
9
  import { citationOf } from '../content/citation.js';
9
10
  import { postTypeOf, replyTarget } from '../content/post-type.js';
11
+ import { visibilityOf } from '../content/visibility.js';
12
+ import { messageOf } from '../util/errors.js';
10
13
  import { actorId, senderKeyPairs } from './actor.js';
11
14
  import { articleObjectId, documentAuthor, toInstant } from './article.js';
12
- import { recordReplyTarget } from './reply-targets.js';
15
+ import { recordResolvedTarget, resolvedTarget } from './reply-targets.js';
13
16
  /**
14
17
  * The `Like` or `Announce` a post sends, or `undefined` for a post that is no
15
18
  * like or repost, or whose target is not a fediverse object this site can
16
- * fetch ({@link lookupCited}).
19
+ * fetch ({@link resolveCited}).
17
20
  *
18
21
  * The activity id carries the object's id, so a like moved to another target
19
22
  * is a second activity rather than one a peer has already seen.
@@ -26,7 +29,7 @@ export async function citingActivity(context, document) {
26
29
  const user = documentAuthor(context, document);
27
30
  if (target === undefined || user === undefined)
28
31
  return undefined;
29
- const object = await lookupCited(context, user, target);
32
+ const object = await resolveCited(context, user, target);
30
33
  if (object === undefined)
31
34
  return undefined;
32
35
  const { author } = object;
@@ -40,19 +43,19 @@ export async function citingActivity(context, document) {
40
43
  published: toInstant(document.date) ?? null,
41
44
  };
42
45
  const of = encodeURIComponent(object.id.href);
43
- // A repost is public, as a boost is; a like is addressed to the one who
44
- // wrote what it likes, and copied to the followers as every activity is.
46
+ const authorIds = authorId === undefined ? [] : [authorId];
45
47
  const activity = postType === 'repost'
46
48
  ? new Announce({
47
49
  ...common,
48
50
  id: new URL(`${postId.href}#announce/${of}`),
49
- to: PUBLIC_COLLECTION,
50
- ccs: authorId === undefined ? [followers] : [followers, authorId],
51
+ ...(visibilityOf(document) === 'unlisted'
52
+ ? { tos: [followers], ccs: [PUBLIC_COLLECTION, ...authorIds] }
53
+ : { tos: [PUBLIC_COLLECTION], ccs: [followers, ...authorIds] }),
51
54
  })
52
55
  : new Like({
53
56
  ...common,
54
57
  id: new URL(`${postId.href}#like/${of}`),
55
- tos: authorId === undefined ? [] : [authorId],
58
+ tos: authorIds,
56
59
  cc: followers,
57
60
  });
58
61
  return { activity, author };
@@ -64,9 +67,26 @@ export async function repliedTo(context, document) {
64
67
  return undefined;
65
68
  if (new URL(target).origin === new URL(context.data.config.baseUrl).origin)
66
69
  return undefined;
67
- const cited = await lookupCited(context, user, target);
68
- await recordReplyTarget(context.data.config.contentDir, target, cited?.id.href ?? null);
69
- return cited;
70
+ return await resolveCited(context, user, target);
71
+ }
72
+ /**
73
+ * An unreachable server is no answer, because the answer decides which
74
+ * activity a post sends: the answer last recorded stands in, and with none the
75
+ * delivery fails rather than send what may be the wrong activity.
76
+ */
77
+ async function resolveCited(context, user, target) {
78
+ const { contentDir } = context.data.config;
79
+ const looked = await lookupCited(context, user, target);
80
+ if (looked.kind === 'unreachable') {
81
+ const recorded = resolvedTarget(contentDir, target);
82
+ if (recorded === undefined) {
83
+ throw new Error(`${target} could not be looked up (${messageOf(looked.error)}), so nothing was sent ` +
84
+ 'for the post that cites it. Save or resend the post once it answers.');
85
+ }
86
+ return recorded === null ? undefined : { id: new URL(recorded), author: undefined };
87
+ }
88
+ await recordResolvedTarget(contentDir, target, looked.object?.id.href ?? null);
89
+ return looked.object;
70
90
  }
71
91
  /**
72
92
  * The object is named by the id its server gives it, not by the URL the post
@@ -75,28 +95,63 @@ export async function repliedTo(context, document) {
75
95
  */
76
96
  async function lookupCited(context, user, target) {
77
97
  const [key] = await senderKeyPairs(context, user);
78
- const loaders = {
79
- documentLoader: key === undefined ? context.documentLoader : context.getDocumentLoader(key),
80
- contextLoader: context.contextLoader,
98
+ const load = key === undefined ? context.documentLoader : context.getDocumentLoader(key);
99
+ // `lookupObject` answers `null` for a fetch that failed however it failed,
100
+ // so the failure is caught on its way through the loader.
101
+ let failure;
102
+ const documentLoader = async (url, options) => {
103
+ try {
104
+ return await load(url, options);
105
+ }
106
+ catch (error) {
107
+ if (!answersNoObject(error))
108
+ failure ??= { error };
109
+ throw error;
110
+ }
81
111
  };
112
+ const loaders = { documentLoader, contextLoader: context.contextLoader };
82
113
  let object;
83
114
  try {
84
115
  object = await context.lookupObject(target, loaders);
85
116
  }
86
117
  catch {
87
- return undefined;
118
+ object = null;
119
+ }
120
+ if (object === null && failure !== undefined)
121
+ return { kind: 'unreachable', ...failure };
122
+ if (object === null || isActor(object) || object.id === null) {
123
+ return { kind: 'answered', object: undefined };
124
+ }
125
+ if (!attributedOnOwnOrigin(object.attributionId, object.id)) {
126
+ return { kind: 'answered', object: { id: object.id, author: undefined } };
88
127
  }
89
- if (object === null || isActor(object) || object.id === null)
90
- return undefined;
91
128
  try {
92
129
  const attributed = await object.getAttribution(loaders);
93
130
  const author = isActor(attributed) && attributed.inboxId !== null ? attributed : undefined;
94
- return { id: object.id, author };
131
+ return { kind: 'answered', object: { id: object.id, author } };
95
132
  }
96
133
  catch {
97
- return { id: object.id, author: undefined };
134
+ return { kind: 'answered', object: { id: object.id, author: undefined } };
98
135
  }
99
136
  }
137
+ /** A server speaks only for its own accounts, so an author on another host is ignored. */
138
+ function attributedOnOwnOrigin(attributionId, objectId) {
139
+ return attributionId?.origin === objectId.origin;
140
+ }
141
+ /**
142
+ * Whether a failed fetch is the server's settled answer that there is no
143
+ * ActivityPub document there: a 404, a 410, or a 2xx, which Fedify's loader
144
+ * throws for an HTML page with no ActivityPub alternate link. A timeout, a
145
+ * refusal, a rate limit or a server error says nothing either way.
146
+ */
147
+ function answersNoObject(error) {
148
+ if (error instanceof SyntaxError)
149
+ return true;
150
+ if (!(error instanceof FetchError) || error.response === undefined)
151
+ return false;
152
+ const { status } = error.response;
153
+ return status === 404 || status === 410 || (status >= 200 && status < 300);
154
+ }
100
155
  /**
101
156
  * The `Undo` that takes a like or a repost back, addressed as the activity
102
157
  * it undoes was. `revision` is the moment, as a `Delete`'s is, since a post
@@ -1 +1 @@
1
- {"version":3,"file":"citations.js","sourceRoot":"","sources":["../../src/federation/citations.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"citations.js","sourceRoot":"","sources":["../../src/federation/citations.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,iBAAiB,EAAE,IAAI,EAAE,MAAM,eAAe,CAAC;AAGjF,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAEpD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExD,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE1E,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAW1E;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,OAAuC,EACvC,QAAkB;IAElB,MAAM,QAAQ,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IACtC,IAAI,QAAQ,KAAK,MAAM,IAAI,QAAQ,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAC;IACnE,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,QAAQ,KAAK,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC;IACnF,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACzD,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC;IAE1B,MAAM,KAAK,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,eAAe,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACzD,MAAM,QAAQ,GAAG,MAAM,EAAE,EAAE,IAAI,SAAS,CAAC;IACzC,MAAM,MAAM,GAAG,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAClD,MAAM,MAAM,GAAG;QACb,KAAK;QACL,MAAM,EAAE,MAAM,CAAC,EAAE;QACjB,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,IAAI;KAC5C,CAAC;IACF,MAAM,EAAE,GAAG,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,SAAS,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;IAC3D,MAAM,QAAQ,GACZ,QAAQ,KAAK,QAAQ;QACnB,CAAC,CAAC,IAAI,QAAQ,CAAC;YACX,GAAG,MAAM;YACT,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,aAAa,EAAE,EAAE,CAAC;YAC5C,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,UAAU;gBACvC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC,iBAAiB,EAAE,GAAG,SAAS,CAAC,EAAE;gBAC9D,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,iBAAiB,CAAC,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,GAAG,SAAS,CAAC,EAAE,CAAC;SAClE,CAAC;QACJ,CAAC,CAAC,IAAI,IAAI,CAAC;YACP,GAAG,MAAM;YACT,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,IAAI,SAAS,EAAE,EAAE,CAAC;YACxC,GAAG,EAAE,SAAS;YACd,EAAE,EAAE,SAAS;SACd,CAAC,CAAC;IACT,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;AAC9B,CAAC;AAOD,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,OAAuC,EACvC,QAAkB;IAElB,MAAM,MAAM,GAAG,WAAW,CAAC,QAAQ,CAAC,CAAC;IACrC,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/C,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IACjE,IAAI,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC7F,OAAO,MAAM,YAAY,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;AACnD,CAAC;AAED;;;;GAIG;AACH,KAAK,UAAU,YAAY,CACzB,OAAuC,EACvC,IAAU,EACV,MAAc;IAEd,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC;IAC3C,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACxD,IAAI,MAAM,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QAClC,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACpD,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CACb,GAAG,MAAM,4BAA4B,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB;gBACnF,sEAAsE,CACzE,CAAC;QACJ,CAAC;QACD,OAAO,QAAQ,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IACtF,CAAC;IACD,MAAM,oBAAoB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,IAAI,IAAI,CAAC,CAAC;IAC/E,OAAO,MAAM,CAAC,MAAM,CAAC;AACvB,CAAC;AAMD;;;;GAIG;AACH,KAAK,UAAU,WAAW,CACxB,OAAuC,EACvC,IAAU,EACV,MAAc;IAEd,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;IACzF,2EAA2E;IAC3E,0DAA0D;IAC1D,IAAI,OAAgD,CAAC;IACrD,MAAM,cAAc,GAAmB,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE;QAC5D,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAClC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC;gBAAE,OAAO,KAAK,EAAE,KAAK,EAAE,CAAC;YACnD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,EAAE,cAAc,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,CAAC;IACzE,IAAI,MAAM,CAAC;IACX,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACvD,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,GAAG,IAAI,CAAC;IAChB,CAAC;IACD,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS;QAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,OAAO,EAAE,CAAC;IACzF,IAAI,MAAM,KAAK,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,EAAE,KAAK,IAAI,EAAE,CAAC;QAC7D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;IACjD,CAAC;IACD,IAAI,CAAC,qBAAqB,CAAC,MAAM,CAAC,aAAa,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;QAC5D,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;IAC5E,CAAC;IAED,IAAI,CAAC;QACH,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,UAAU,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;QAC3F,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC;IACjE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,CAAC;IAC5E,CAAC;AACH,CAAC;AAED,0FAA0F;AAC1F,SAAS,qBAAqB,CAAC,aAAyB,EAAE,QAAa;IACrE,OAAO,aAAa,EAAE,MAAM,KAAK,QAAQ,CAAC,MAAM,CAAC;AACnD,CAAC;AAED;;;;;GAKG;AACH,SAAS,eAAe,CAAC,KAAc;IACrC,IAAI,KAAK,YAAY,WAAW;QAAE,OAAO,IAAI,CAAC;IAC9C,IAAI,CAAC,CAAC,KAAK,YAAY,UAAU,CAAC,IAAI,KAAK,CAAC,QAAQ,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACjF,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC;IAClC,OAAO,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,CAAC,CAAC;AAC7E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,QAAwB,EAAE,QAAgB;IACrE,IAAI,QAAQ,CAAC,EAAE,KAAK,IAAI,IAAI,QAAQ,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;QACtD,MAAM,IAAI,SAAS,CAAC,yDAAyD,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,IAAI,IAAI,CAAC;QACd,EAAE,EAAE,IAAI,GAAG,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,SAAS,kBAAkB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3F,KAAK,EAAE,QAAQ,CAAC,OAAO;QACvB,MAAM,EAAE,QAAQ;QAChB,GAAG,EAAE,QAAQ,CAAC,KAAK;QACnB,GAAG,EAAE,QAAQ,CAAC,KAAK;KACpB,CAAC,CAAC;AACL,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import type { Actor, Recipient } from '@fedify/vocab';
2
- import type { DeliveryStatus, Follower, NewDelivery, Relay } from '../store/admin-store.ts';
2
+ import type { Delivery, DeliveryStatus, Follower, NewDelivery, Relay } from '../store/admin-store.ts';
3
3
  import type { Document } from '../content/document.ts';
4
4
  import type { DocumentChange } from '../content/sync.ts';
5
5
  import type { Citing, CitedObject } from './citations.ts';
@@ -30,17 +30,21 @@ export interface ActivityAbout {
30
30
  /**
31
31
  * What a version of a post is to a peer, and the id that names
32
32
  * it: the post's object id, or its `Like` or `Announce`'s activity id, which
33
- * carries the id of what it cites.
33
+ * carries the id of what it cites. `actor` is the username it is sent as: a
34
+ * peer files a status under the actor that created it, and takes an `Update`
35
+ * or `Delete` of it from that actor alone.
34
36
  */
35
37
  export type Shape = ObjectShape | CitingShape;
36
38
  export interface ObjectShape {
37
39
  readonly kind: 'object';
38
40
  readonly id: string;
41
+ readonly actor: string;
39
42
  readonly replyTo: CitedObject | undefined;
40
43
  }
41
44
  export interface CitingShape {
42
45
  readonly kind: 'citing';
43
46
  readonly id: string;
47
+ readonly actor: string;
44
48
  readonly citing: Citing;
45
49
  }
46
50
  /**
@@ -50,7 +54,18 @@ export interface CitingShape {
50
54
  export declare function groupByInbox(followers: readonly Follower[]): Map<string, Follower[]>;
51
55
  export declare function followerTargets(followers: readonly Follower[]): DeliveryTarget[];
52
56
  export declare function relayTargets(relays: readonly Relay[]): DeliveryTarget[];
57
+ /**
58
+ * The followers' targets and the relays', one per inbox: a relay listed at an
59
+ * instance's shared inbox takes one POST, and both outcomes are written.
60
+ */
61
+ export declare function audienceTargets(followers: readonly Follower[], relays: readonly Relay[]): DeliveryTarget[];
53
62
  export declare function fanOutTargets(targets: readonly DeliveryTarget[], also: readonly DeliveryTarget[]): DeliveryTarget[];
63
+ /**
64
+ * Addressed to the inbox each actor was recorded at, not looked up afresh:
65
+ * that inbox holds the copy, and an unfollowed actor or a relay has no record
66
+ * left to look up.
67
+ */
68
+ export declare function earlierTargets(newestFirst: readonly Delivery[], current: readonly DeliveryTarget[]): DeliveryTarget[];
54
69
  /** The author of what a post likes, reposts or replies to, as one more inbox to tell. */
55
70
  export declare function citedAuthor(author: Actor | undefined): DeliveryTarget[];
56
71
  export declare function objectTargets(replyAuthor: Actor | undefined, mentioned: readonly MentionedAccount[]): DeliveryTarget[];
@@ -1 +1 @@
1
- {"version":3,"file":"delivery-plan.d.ts","sourceRoot":"","sources":["../../src/federation/delivery-plan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delivery-plan.d.ts","sourceRoot":"","sources":["../../src/federation/delivery-plan.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
1
  import { isMigrated } from '../content/migrated.js';
2
2
  import { pinnedAt } from '../content/pinned.js';
3
3
  import { isFederatedDocument } from '../content/served.js';
4
+ import { DEFAULT_TIMEZONE, toUtcInstant } from '../content/time.js';
4
5
  import { followerRecipient } from './followers.js';
5
6
  import { relayRecipient } from './relays.js';
6
7
  /**
@@ -36,10 +37,62 @@ export function relayTargets(relays) {
36
37
  actorIds: [relay.actorId ?? relay.inboxId],
37
38
  }));
38
39
  }
40
+ /**
41
+ * The followers' targets and the relays', one per inbox: a relay listed at an
42
+ * instance's shared inbox takes one POST, and both outcomes are written.
43
+ */
44
+ export function audienceTargets(followers, relays) {
45
+ const byInbox = new Map();
46
+ for (const target of [...followerTargets(followers), ...relayTargets(relays)]) {
47
+ const reached = byInbox.get(target.inboxId);
48
+ byInbox.set(target.inboxId, reached === undefined
49
+ ? target
50
+ : {
51
+ inboxId: target.inboxId,
52
+ recipients: [...reached.recipients, ...target.recipients],
53
+ actorIds: [...reached.actorIds, ...target.actorIds],
54
+ });
55
+ }
56
+ return [...byInbox.values()];
57
+ }
39
58
  export function fanOutTargets(targets, also) {
40
59
  // One POST to an inbox the followers already share is enough.
41
60
  const reached = new Set(targets.map((target) => target.inboxId));
42
- return [...targets, ...also.filter((target) => !reached.has(target.inboxId))];
61
+ const added = also.filter((target) => {
62
+ if (reached.has(target.inboxId))
63
+ return false;
64
+ reached.add(target.inboxId);
65
+ return true;
66
+ });
67
+ return [...targets, ...added];
68
+ }
69
+ /**
70
+ * Addressed to the inbox each actor was recorded at, not looked up afresh:
71
+ * that inbox holds the copy, and an unfollowed actor or a relay has no record
72
+ * left to look up.
73
+ */
74
+ export function earlierTargets(newestFirst, current) {
75
+ const reached = new Set(current.flatMap((target) => target.actorIds));
76
+ const byInbox = new Map();
77
+ for (const { actorId, inboxId } of newestFirst) {
78
+ if (reached.has(actorId))
79
+ continue;
80
+ reached.add(actorId);
81
+ const actors = byInbox.get(inboxId);
82
+ if (actors === undefined)
83
+ byInbox.set(inboxId, [actorId]);
84
+ else
85
+ actors.push(actorId);
86
+ }
87
+ return [...byInbox].map(([inboxId, actorIds]) => ({
88
+ inboxId,
89
+ recipients: actorIds.map((actorId) => ({
90
+ id: new URL(actorId),
91
+ inboxId: new URL(inboxId),
92
+ endpoints: null,
93
+ })),
94
+ actorIds,
95
+ }));
43
96
  }
44
97
  /** The author of what a post likes, reposts or replies to, as one more inbox to tell. */
45
98
  export function citedAuthor(author) {
@@ -90,9 +143,12 @@ export function deliveryRows(about, target, outcome) {
90
143
  }));
91
144
  }
92
145
  export function stampFor(document, now) {
93
- const existing = document.activitypub?.published;
94
- const published = existing ?? document.date ?? now.toISOString();
95
- return existing === published ? undefined : published;
146
+ if (document.activitypub?.published !== undefined)
147
+ return undefined;
148
+ // Read as the Create's `published` reads the date, so the stamp names the
149
+ // instant the followers were told.
150
+ const announced = new Date(document.date ?? now);
151
+ return toUtcInstant(Number.isNaN(announced.getTime()) ? now : announced, DEFAULT_TIMEZONE);
96
152
  }
97
153
  export function wasAnnounced(document) {
98
154
  return (document.activitypub?.published ?? '') !== '';
@@ -110,7 +166,10 @@ export function deliveryChange(change, now) {
110
166
  if (after === undefined) {
111
167
  return before === undefined ? undefined : { kind: 'withdraw', before, subject };
112
168
  }
113
- return { kind: 'publish', before, after, subject };
169
+ // A post the scan indexed was served without being announced, so its first
170
+ // edit is the first time any follower hears of it.
171
+ const told = before !== undefined && (wasAnnounced(before) || isMigrated(subject));
172
+ return { kind: 'publish', before: told ? before : undefined, after, subject };
114
173
  }
115
174
  function editsACopyFollowersHold(subject, before) {
116
175
  return wasAnnounced(subject) && before !== undefined;
@@ -121,8 +180,9 @@ function federatedOrUndefined(document, now) {
121
180
  return isFederatedDocument(document, now) ? document : undefined;
122
181
  }
123
182
  export function revisionStep(was, is) {
124
- if (was.kind !== is.kind || was.id !== is.id)
183
+ if (was.kind !== is.kind || was.id !== is.id || was.actor !== is.actor) {
125
184
  return { kind: 'replace' };
185
+ }
126
186
  return is.kind === 'citing' ? { kind: 'none' } : { kind: 'revise', shape: is };
127
187
  }
128
188
  export function pinChange(featured, before, after, now) {
@@ -1 +1 @@
1
- {"version":3,"file":"delivery-plan.js","sourceRoot":"","sources":["../../src/federation/delivery-plan.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delivery-plan.js","sourceRoot":"","sources":["../../src/federation/delivery-plan.ts"],"names":[],"mappings":"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"}
@@ -3,8 +3,7 @@ import type { ResolvedConfig } from '../config.ts';
3
3
  import type { SettingsRegistry } from '../settings/types.ts';
4
4
  import type { CitedPage, CitedPageReader } from '../content/citation.ts';
5
5
  import type { ConversationSite } from '../comments/conversation.ts';
6
- import type { Document } from '../content/document.ts';
7
- import type { CatalogReader, DocumentLookup, IndexWriter } from '../content/store.ts';
6
+ import type { IndexWriter } from '../content/store.ts';
8
7
  import type { DocumentChange } from '../content/sync.ts';
9
8
  import type { User } from '../site/users.ts';
10
9
  import type { FederationContextData, SiteFederation } from './federation.ts';
@@ -65,9 +64,9 @@ export interface CreateDeliveryServiceOptions {
65
64
  */
66
65
  export interface DeliveryService {
67
66
  /**
68
- * Consider one index change, and deliver whatever it implies. Resolves once
69
- * the change has been recorded in the file — not once the activity has been
70
- * delivered, which is what {@link DeliveryService.settled} is for.
67
+ * Consider one index change, and queue whatever it implies. Resolves once
68
+ * the activity is queued, not once it has been delivered or the post has
69
+ * been stamped, which is what {@link DeliveryService.settled} is for.
71
70
  */
72
71
  handle(change: DocumentChange): Promise<void>;
73
72
  /**
@@ -80,12 +79,20 @@ export interface DeliveryService {
80
79
  * cached profile anywhere to refresh.
81
80
  */
82
81
  updateActor(user: User): Promise<DeliveryReport | undefined>;
82
+ /**
83
+ * Tell a deleted user's followers and the site's relays that the account is
84
+ * gone: a `Delete` of the actor, signed with its key, which their servers
85
+ * take as a reason to drop the account and the copies of its posts. Called
86
+ * just before the user is removed. `undefined` when there is nobody to tell.
87
+ */
88
+ deleteActor(user: User): Promise<DeliveryReport | undefined>;
83
89
  /**
84
90
  * Send one post as it now reads to every follower and every accepted relay
85
91
  * the site has.
86
92
  *
87
- * Not "send that activity again": the activity is built from the file at the
88
- * moment this is called, so a follower whose server was down
93
+ * Not "send that activity again": the activity is built from the post as it
94
+ * stands when the resend's turn in the delivery queue comes, so a follower
95
+ * whose server was down
89
96
  * ends up holding the post as it stands rather than the revision that failed
90
97
  * to reach it. Which activity that is follows the same rule a save does — a
91
98
  * published post no follower has been told about is a `Create` and is
@@ -93,7 +100,7 @@ export interface DeliveryService {
93
100
  * one is a `Delete` of a `Tombstone` — so a resend and an ordinary publish
94
101
  * produce the same shapes.
95
102
  *
96
- * `undefined` when there is nothing to send: no post answers to that slug,
103
+ * `undefined` when there is nothing to send: no post is at that content path,
97
104
  * or the post is one nobody outside the site has ever been told about and is
98
105
  * not published now, so there is neither a copy to withdraw nor anything to
99
106
  * announce.
@@ -101,7 +108,13 @@ export interface DeliveryService {
101
108
  * Recipients in `to` that missed the announcement are sent it again rather
102
109
  * than an `Update`, which a peer drops for a post it never stored.
103
110
  */
104
- resend(slug: string, to?: ResendRecipients): Promise<DeliveryReport | undefined>;
111
+ resend(path: string, to?: ResendRecipients): Promise<DeliveryReport | undefined>;
112
+ /**
113
+ * Send `actors` the pin change for one post as it now stands: the `Add` to
114
+ * its author's featured collection when it is pinned, the `Remove` when it
115
+ * is not. `undefined` when no published post is at that content path.
116
+ */
117
+ resendPin(path: string, actors: ReadonlySet<string>): Promise<DeliveryReport | undefined>;
105
118
  /**
106
119
  * Bring the followers' copies of the posts that cite a page up to date with
107
120
  * its newly stored context: an `Update` for each served, announced post
@@ -137,14 +150,4 @@ export declare function createDeliveryService(options: CreateDeliveryServiceOpti
137
150
  export declare function deliveryTargets(admin: AdminStore, username: string, { relays }?: {
138
151
  relays?: boolean;
139
152
  }): DeliveryTarget[];
140
- /**
141
- * The post a slug names, the trash included, or `undefined`.
142
- *
143
- * The index's slug lookup answers across both kinds and both states and takes
144
- * the newest, which is the post nine times out of ten. The federated list is
145
- * the fallback for the tenth — a page, or a live post of the same name,
146
- * standing in front of a trashed one — and it is the right fallback because a
147
- * post that was never announced is not one a resend has anything to say about.
148
- */
149
- export declare function postBySlug(store: DocumentLookup & CatalogReader, slug: string): Document | undefined;
150
153
  //# sourceMappingURL=delivery.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/federation/delivery.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"delivery.d.ts","sourceRoot":"","sources":["../../src/federation/delivery.ts"],"names":[],"mappings":"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"}