Changeset a9da2c0 in Klonkt

Timestamp:

07/30/2026 09:32:40 AM (6 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

67f7150

Parents:

d3a1abd

Message:

De outbox vergat de attachments: waarom de Mac speelde en de iPhone niet

De doorbraak zat in koffieengaars eigen outbox: atts: 0, terwijl de content
wel de video-tag droeg. De outbox-SELECT (en die van featured en de
nieuwe-volger-backfill) haalde c2s_attachments niet op, dus buildNote had
niets te federeren. Wie de post via DELIVERY kreeg had het attachment wel
(daarom werkte de Mac); wie hem via de outbox trok (backfill, boiert.eu)
kreeg alleen de content-tag met zijn relatieve, overal dode src: de kapotte
iPhone-speler.

De kolom zit nu in alle drie de smalle SELECTs; de losse-note-route deed al
SELECT * en was al goed.

Changed files:
src/routes/activitypub.js

• outbox- en featured-SELECT dragen c2s_attachments

src/services/ActivityPubService.js

• de nieuwe-volger-backfill-SELECT ook

test/c2s-compose.test.js

• het outbox-contract vastgepind: dezelfde smalle SELECT levert via buildNote het Video-attachment, met schone content

remarks: 342 tests groen. koffieengaar.nl moet hierna bijgewerkt worden,
anders blijft zijn outbox kaal.

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

Files:

• src/routes/activitypub.js (modified) (2 diffs)
• src/services/ActivityPubService.js (modified) (1 diff)
• test/c2s-compose.test.js (modified) (1 diff)

src/routes/activitypub.js

@@ -106 +106 @@
   const fanClause = audience === 'friend' ? '' : "AND (fan_only IS NULL OR fan_only = 0)";
   const posts = db.prepare(
-    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, published_at, created_at
+    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, c2s_attachments, published_at, created_at
      FROM posts WHERE site_id = ? AND status = 'published' ${fanClause}
      ORDER BY COALESCE(published_at, created_at) DESC LIMIT 20`
@@ -410 +410 @@
   // rank 1 last) → Mastodon flips it back to pin-rank ascending on the profile.
   const posts = db.prepare(
-    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, published_at, created_at
+    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, c2s_attachments, published_at, created_at
      FROM posts WHERE site_id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)
        AND pinned IS NOT NULL AND pinned > 0

src/services/ActivityPubService.js

@@ -1921 +1921 @@
   if (!site) return;
   const recent = db.prepare(
-    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, published_at, created_at
+    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, c2s_attachments, published_at, created_at
      FROM posts WHERE site_id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)
      ORDER BY COALESCE(published_at, created_at) DESC LIMIT 20`

test/c2s-compose.test.js

@@ -117 +117 @@
 });
 
+test('the OUTBOX serves the attachment too, not only the delivered Create', async () => {
+  // Root of the broken iPhone player (Robins schermafdrukken, 30-7): the
+  // outbox SELECT did not include c2s_attachments, so a note pulled via the
+  // outbox (backfill, boiert.eu) had NO Video attachment and readers fell
+  // back to the content tag with its relative, dead src. The delivered copy
+  // was fine, which is why one device worked and the other did not. This
+  // locks the outbox contract: the same narrow SELECT, through buildNote,
+  // must carry the attachment.
+  const r = await AP.ingestOutboxActivity(site, user, {
+    type: 'Create',
+    object: {
+      type: 'Note', content: '<p>buiten</p>',
+      to: ['https://test.example/ap/users/kid/followers'],
+      cc: ['https://www.w3.org/ns/activitystreams#Public'],
+      attachment: [{ type: 'Video', url: '/media/reply-media/buiten.mp4', mediaType: 'video/mp4' }],
+    },
+  });
+  const row = db.prepare(
+    `SELECT id, slug, title, content, cover_image_url, cover_video_url, nsfw, content_warning, c2s_attachments, published_at, created_at
+     FROM posts WHERE id = ?`).get(r.id);
+  const note = AP.buildNote('https://test.example', site, row);
+  const vid = (note.attachment || []).find((a) => a.url.endsWith('buiten.mp4'));
+  assert.ok(vid, 'the outbox-shaped row still yields the Video attachment');
+  assert.equal(vid.type, 'Video');
+  assert.ok(!/<video\b/i.test(note.content), 'and the content stays clean');
+});
+
 test('a media-only post is a post, not an empty-note error', async () => {
   const r = await AP.ingestOutboxActivity(site, user, {