Changeset 5a93ac0 in Klonkt

Timestamp:

06/24/2026 11:16:28 AM (3 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

eb852c5

Parents:

065452a

Message:

feat(activitypub): federate images as attachments

Cover image + inline <img> are emitted as AP attachment (Document) with absolute
URLs + mediaType; <img> stripped from content (Mastodon strips it anyway). Outbox
+ post-create delivery now include cover_image_url.

Co-Authored-By: Claude <noreply@…>

Location:

src

Files:

• routes/activitypub.js (modified) (1 diff)
• routes/posts.js (modified) (1 diff)
• services/ActivityPubService.js (modified) (2 diffs)

src/routes/activitypub.js

@@ -54 +54 @@
   if (!site) return res.status(404).end();
   const posts = db.prepare(
-    `SELECT id, slug, title, content, published_at, created_at
+    `SELECT id, slug, title, content, cover_image_url, 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`

src/routes/posts.js

@@ -236 +236 @@
       ActivityPubService.deliverCreate(site, {
         id: postId, slug: finalSlug, title: title || finalSlug,
-        content: cleanContent, published_at: publishedAt, created_at: now,
+        content: cleanContent, cover_image_url: cover_image_url || null,
+        published_at: publishedAt, created_at: now,
       }).catch(() => { /* best-effort */ });
     }

src/services/ActivityPubService.js

@@ -106 +106 @@
   const escTitle = String(post.title || '').replace(/[<>&]/g, (c) => ({ '<': '&lt;', '>': '&gt;', '&': '&amp;' }[c]));
   const titleHtml = post.title ? `<p><strong>${escTitle}</strong></p>` : '';
-  const html = titleHtml + (post.content || '');
-  return {
+
+  // Images travel as AP `attachment` (Mastodon strips <img> from content). Collect
+  // the cover + any inline <img>, make absolute, then strip <img> from the content
+  // to avoid duplicate rendering on clients that DO keep them.
+  const abs = (u) => !u ? null : (/^https?:/i.test(u) ? u : `${base}${u.startsWith('/') ? '' : '/'}${u}`);
+  const mediaType = (u) => {
+    const e = ((u || '').split('?')[0].match(/\.(\w+)$/) || [])[1];
+    return ({ jpg: 'image/jpeg', jpeg: 'image/jpeg', png: 'image/png', gif: 'image/gif', webp: 'image/webp', avif: 'image/avif' })[(e || '').toLowerCase()] || 'image/jpeg';
+  };
+  const urls = [];
+  if (post.cover_image_url) urls.push(abs(post.cover_image_url));
+  let body = post.content || '';
+  for (const m of body.matchAll(/<img\b[^>]*\bsrc="([^"]+)"[^>]*>/gi)) urls.push(abs(m[1]));
+  body = body.replace(/<img\b[^>]*>/gi, '');
+  const seen = new Set();
+  const attachment = urls.filter(Boolean)
+    .filter((u) => { if (seen.has(u)) return false; seen.add(u); return true; })
+    .map((u) => ({ type: 'Document', mediaType: mediaType(u), url: u }));
+
+  const note = {
     id,
     type: 'Note',
     attributedTo: aId,
-    content: html,
+    content: titleHtml + body,
     url: human,
     published: new Date(post.published_at || post.created_at || Date.now()).toISOString(),
@@ -118 +136 @@
     tag: Array.isArray(post.tags) ? post.tags.map((t) => ({ type: 'Hashtag', name: '#' + String(t).replace(/\s+/g, '') })) : [],
   };
+  if (attachment.length) note.attachment = attachment;
+  return note;
 }