Changeset 2708282 in Klonkt

Timestamp:

07/28/2026 10:45:26 AM (6 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

d9ad6c5

Parents:

65abc85

Message:

De knop deed niets: AP.deliverTo bestond niet

Op Propose link previews drukken gaf geen zichtbaar resultaat. Oorzaak: de route
riep AP.deliverTo aan, maar die naam bestond alleen als sleutel in het
deps-object dat we aan de guardianship-module doorgeven, niet als export. Dus een
TypeError, een 500 uit Express, en de knop die zichzelf netjes weer inschakelde.
Van buiten af: er gebeurt niks.

Mijn fout zat in de aanname: ik zag deliverTo in een grep-treffer staan en nam
aan dat het een export was. Een grep-treffer is geen export. Er staat nu een test
die alle AP-helpers controleert die de guardian-route aanroept, zodat deze klasse
fout niet nog eens stil kan blijven.

Changed files:
src/services/ActivityPubService.js

• deliverToActor geexporteerd (stond alleen in de deps)

src/routes/guardian.js

• gebruikt AP.deliverToActor

test/gated-settings.test.js

• test dat elke AP-helper die de route aanroept ook echt bestaat
• test op de Offer-vorm (ward, feature, value, geadresseerd aan de ward)

remarks: 230 tests groen.

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Files:

• src/routes/guardian.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (2 diffs)
• test/gated-settings.test.js (modified) (1 diff)

src/routes/guardian.js

@@ -317 +317 @@
     return res.json({ ok: true, allow, state: r.state, need: r.need, of: r.of });
   }
-  AP.deliverTo(site, uri, offer).catch(() => { /* queued, best-effort */ });
+  AP.deliverToActor(site, uri, offer).catch(() => { /* queued, best-effort */ });
   res.json({ ok: true, allow, state: 'open', federated: true });
 });

src/services/ActivityPubService.js

@@ -3647 +3647 @@
 // { delivered, inbox }: delivered=false means the account could not be
 // resolved at all (a bad handle) — the offer stays recorded regardless.
-async function deliverToActor(site, actorUri, activity) {
+export async function deliverToActor(site, actorUri, activity) {
   const me = selfActorId(site.slug);
   const keys = getOrCreateKeys(site.slug);
@@ -3708 +3708 @@
   getInteractions, getInteractionById, setInteractionBoosted, setInteractionLiked, setMyReaction, getMyReactions, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote,
   listOutbox, deliverOutboxDelete, deliverOutboxUpdate, deliverDirectNote,
-  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, timelineObjectLinks, timelineQuote, timelineEmbed, applyQuoteProps, sendInteraction, voteOnPoll, voteOnRemotePoll,
+  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, timelineObjectLinks, timelineQuote, timelineEmbed, applyQuoteProps, deliverToActor, sendInteraction, voteOnPoll, voteOnRemotePoll,
   acceptGatedFollow, rejectGatedFollow, isWardGuardian, sendFollowDecision,
   parseOwnPoll, pollTally, ownPollView, deliverPollUpdate, maybeCrawlThread, sendReport, localMentionSlugs,

test/gated-settings.test.js

@@ -61 +61 @@
   assert.equal(featureColumn('external_embeds = 1; DROP TABLE sites'), null);
 });
+
+// Guard against the mistake that made the button do nothing: the route called
+// AP.deliverTo, which existed only as a key in the guardianship deps object and
+// not as an export. It threw a TypeError, Express answered 500, and the button
+// silently reset. A grep hit is not an export.
+test('the guardian route can reach every ActivityPub helper it calls', async () => {
+  const AP = (await import('../src/services/ActivityPubService.js')).default;
+  for (const fn of ['actorId', 'deliverToActor', 'followActor', 'backfillFromOutbox', 'getTimeline']) {
+    assert.equal(typeof AP[fn], 'function', `AP.${fn} must be exported, the guardian route calls it`);
+  }
+});
+
+test('a gated-setting Offer carries ward, feature and value', async () => {
+  const { buildGatedOffer, parseGatedSetting } = await import('../src/services/guardianship/gated.js');
+  const o = buildGatedOffer('https://a/gated/1', 'https://a/g1', 'https://b/ward', 'shaer:externalEmbeds', true);
+  assert.equal(o.type, 'Offer');
+  assert.deepEqual(o.to, ['https://b/ward'], 'addressed to the ward server, which tallies');
+  const parsed = parseGatedSetting(o.object);
+  assert.deepEqual(parsed, { ward: 'https://b/ward', feature: 'shaer:externalEmbeds', value: true });
+  assert.equal(parseGatedSetting({ type: 'Relationship' }), null, 'a different Offer is not ours');
+});