Changeset 4c70ecb in Klonkt

Timestamp:

07/21/2026 11:44:49 PM (7 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

8b07c12

Parents:

fb30b5d

Message:

C2S Block and Undo(Block): Shaer's Orbit becomes a real server block

Putting someone "in Orbit" in Shaer was client-side only. The C2S outbox
now accepts Block and Undo(Block), wired onto the same blockTarget/unblock
the web UI uses: the actor lands in ap_blocks, shows up in the Block tab,
and their cached content is purged. Releasing from Orbit undoes it.

Changed files:
src/services/ActivityPubService.js

• ingestOutboxActivity: case 'Block' -> blockTarget(site, uri), 202
• Undo with inner Block -> unblock(site, uri), 202

New file:
test/c2s-block.test.js

• Block lands in ap_blocks, Undo releases, missing object is 400

Changed files:
test/c2s-outbox.test.js

• the unsupported-Undo example was Block; that is real now, the test uses Move instead

151 tests, all green.

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

Files:

• src/services/ActivityPubService.js (modified) (2 diffs)
• test/c2s-block.test.js (added)
• test/c2s-outbox.test.js (modified) (1 diff)

src/services/ActivityPubService.js

@@ -1965 +1965 @@
         return { status: 202, url: actorUri };
       }
+      // Shaer "in Orbit" = a real Block (FEP-c648 client side): lands in
+      // ap_blocks, shows in the Block tab, and purges the actor's cached
+      // content. Client-side filtering becomes a cache of this state.
+      case 'Block': {
+        const targetUri = c2sIdOf(object);
+        if (!targetUri) return { status: 400, error: 'missing_object' };
+        const r = await blockTarget(site, targetUri);
+        if (r && r.error) return { status: 400, error: r.error };
+        return { status: 202, url: targetUri };
+      }
       case 'Undo': {
         const inner = object && typeof object === 'object' ? object : null;
@@ -1971 +1981 @@
         const innerTarget = c2sIdOf(inner && inner.object);
         if (innerType === 'Follow') { await unfollowActor(site, innerTarget); return { status: 202, url: innerTarget }; }
+        if (innerType === 'Block') {
+          if (!innerTarget) return { status: 400, error: 'missing_object' };
+          unblock(site, innerTarget);   // release from Orbit
+          return { status: 202, url: innerTarget };
+        }
         if (innerType === 'Like' || innerType === 'Announce') {
           const kind = innerType === 'Announce' ? 'unboost' : 'unlike';

test/c2s-outbox.test.js

@@ -67 +67 @@
 
 test('Undo of an unknown inner type → 400', async () => {
-  const out = await AP.ingestOutboxActivity(site, user, { type: 'Undo', object: { type: 'Block', object: 'x' } });
+  // Block used to be the unsupported example; it is real now (c2s-block.test).
+  const out = await AP.ingestOutboxActivity(site, user, { type: 'Undo', object: { type: 'Move', object: 'x' } });
   assert.equal(out.status, 400);
   assert.equal(out.error, 'unsupported_undo');