Changeset af5b79b in Klonkt

Timestamp:

07/25/2026 08:37:24 AM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

2b4252c

Parents:

8f520e0

Message:

FEP-633c §2.2: shaer:hasGuardians (outbound stempelen, inbound registreren)

Objecten van een ward krijgen nu de advies-hint shaer:hasGuardians, zodat een
remote server interacties met de post naar de guardians kan routen zonder eerst
de actor op te halen. Veilig te negeren door wie geen shaer spreekt.

Outbound: elke Note die een ward publiceert wordt gestempeld (alle drie de
buildNote-paden: gewone post, paid-teaser, reply/direct), dus ook via buildCreate
in de outbox. Inbound: de hint wordt alleen GEREGISTREERD op het opgeslagen object
(ap_timeline.has_guardians / ap_mentions.has_guardians), nog geen actie. Wordt
later bekendgemaakt bij reddings-boei / escalatie-routing (Robins besluit).

Changed files:
src/services/guardianship/notes.js

• hasGuardiansProps(slug) (stempel als de site guardians heeft) + objectHasGuardians(o)

src/services/guardianship/index.js

• beide geexporteerd

src/services/ActivityPubService.js

• buildNote stempelt in alle drie de return-paden; inbound zet has_guardians op timeline + mention

src/config/database.js

• ap_timeline.has_guardians + ap_mentions.has_guardians

test/has-guardians.test.js

• ward stempelt wel, free niet; objectHasGuardians leest de hint

remarks: npm test 170/170. Alleen ward-objecten dragen de hint; niks acteert er nog
op (register-only). Daemon heeft de constante al (dead_code); wiren kan later.

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

Files:

• src/config/database.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (5 diffs)
• src/services/guardianship/index.js (modified) (1 diff)
• src/services/guardianship/notes.js (modified) (2 diffs)
• test/has-guardians.test.js (added)

src/config/database.js

@@ -563 +563 @@
   ensureColumn('ap_outbox', 'wave', 'INTEGER');    // FEP-633c shaer:wave (guardian -> ward nudge)
   ensureColumn('ap_mentions', 'wave', 'INTEGER');  // inbound guardian wave
+  // FEP-633c §2.2: object hint that the author is a ward. Register-only for now;
+  // used later at reddings-boei / escalation routing.
+  ensureColumn('ap_timeline', 'has_guardians', 'INTEGER');
+  ensureColumn('ap_mentions', 'has_guardians', 'INTEGER');
   ensureColumn('ap_followers', 'name', 'TEXT');    // cached display name (shaer-aa3)
   ensureColumn('ap_followers', 'handle', 'TEXT');  // @user@host

src/services/ActivityPubService.js

@@ -278 +278 @@
       ...Guardianship.helpRequestProps(post),
       ...Guardianship.waveProps(post),
+      // FEP-633c §2.2: object hint that the author is a ward.
+      ...Guardianship.hasGuardiansProps(site.slug),
       tag: [
         ...mentionTags(post.content),
@@ -312 +314 @@
       tag: [...hashtagTags(base, post.content)],
       replies: `${id}/replies`,
+      ...Guardianship.hasGuardiansProps(site.slug),
     };
   }
@@ -488 +491 @@
     sensitive: !!post.nsfw,
   };
+  // FEP-633c §2.2: object hint that the author is a ward (safely ignorable).
+  Object.assign(note, Guardianship.hasGuardiansProps(site.slug));
   if (post.nsfw) note.summary = post.content_warning || 'Gevoelige inhoud';
   if (attachment.length) note.attachment = attachment;
@@ -1504 +1509 @@
         for (const s of subs) {
           tlStmts().ins.run(o.id, s.slug, actorUri, ai.name, ai.handle, ai.icon, ai.url, html, o.url || null, o.published || null, media, o.sensitive ? 1 : 0, o.summary || null);
+          // FEP-633c §2.2: register the ward hint on the stored object (no action yet).
+          if (Guardianship.objectHasGuardians(o)) { try { db.prepare('UPDATE ap_timeline SET has_guardians = 1 WHERE id = ? AND slug = ?').run(o.id, s.slug); } catch { /* ignore */ } }
           if (poll) { try { db.prepare('UPDATE ap_timeline SET poll_json = ? WHERE id = ? AND slug = ?').run(JSON.stringify(poll), o.id, s.slug); } catch { /* ignore */ } }
         }
@@ -1522 +1529 @@
         const help = Guardianship.isHelpRequest(o);
         const wave = Guardianship.isWave(o);
+        const hasG = Guardianship.objectHasGuardians(o);   // §2.2 hint, register-only
         for (const slug of slugs) {
           try {
-            const r = db.prepare('INSERT OR IGNORE INTO ap_mentions (slug, object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, published, help_request, wave, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)')
-              .run(slug, o.id, safeUrl(o.url) || null, actorUri, ai.name, ai.handle, ai.icon, ai.url, html, o.published || null, help ? 1 : 0, wave ? 1 : 0);
+            const r = db.prepare('INSERT OR IGNORE INTO ap_mentions (slug, object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, published, help_request, wave, has_guardians, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)')
+              .run(slug, o.id, safeUrl(o.url) || null, actorUri, ai.name, ai.handle, ai.icon, ai.url, html, o.published || null, help ? 1 : 0, wave ? 1 : 0, hasG ? 1 : 0);
             if (r.changes) {
               console.log('[AP] mention', actorUri, '→', slug, help ? '(help request)' : '');

src/services/guardianship/index.js

@@ -16 +16 @@
  */
 export { SHAER_CONTEXT, GUARDIAN_RELATIONSHIP, GUARDIAN_RELATIONSHIP_COMPACT, isGuardianRelationship } from './context.js';
-export { helpRequestProps, isHelpRequest, waveProps, isWave } from './notes.js';
+export { helpRequestProps, isHelpRequest, waveProps, isWave, hasGuardiansProps, objectHasGuardians } from './notes.js';
 export { wireDelivery, c2sVisibility, deliverDirectNote } from './delivery.js';
 export { wireHandshake, handleOutbox as handleGuardianshipOutbox, handleInbox as handleGuardianshipInbox, parseRelationship } from './handshake.js';

src/services/guardianship/notes.js

@@ -5 +5 @@
  * on direct notes. Everyone who does not speak shaer can ignore it.
  */
+import { listGuardians } from './relations.js';
+
+/**
+ * shaer:hasGuardians (§2.2): an advisory OBJECT hint that the author is a ward,
+ * so a remote server can route interactions to the guardians WITHOUT fetching
+ * the actor. Stamped on every object a ward publishes; MUST be safely ignorable.
+ */
+export function hasGuardiansProps(slug) {
+  try { return (slug && listGuardians(slug).length) ? { 'shaer:hasGuardians': true } : {}; }
+  catch { return {}; }
+}
+
+/** True when an incoming object carries the ward hint (§2.2). Register-only for
+ *  now; acted on later at reddings-boei / escalation routing. */
+export function objectHasGuardians(o) {
+  return !!o && (o['shaer:hasGuardians'] === true || o.hasGuardians === true);
+}
 
 /** Extra JSON-LD properties for an outgoing note built from an ap_outbox row. */
@@ -31 +48 @@
 }
 
-export default { helpRequestProps, isHelpRequest, waveProps, isWave };
+export default { helpRequestProps, isHelpRequest, waveProps, isWave, hasGuardiansProps, objectHasGuardians };