Changeset 443f982 in Klonkt

Timestamp:

06/30/2026 02:37:32 PM (2 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

1a0b007

Parents:

28b59e7

Message:

feat(federation): let Mastodon card external embeds — drop image attachments when a post has an embed

Mastodon shows EITHER media attachments OR a link preview card, never both. A post with an
external embed (Spotify/YouTube/SoundCloud/Vimeo/Bandcamp/Apple) plus a cover therefore showed the
cover and rendered the embed link as plain text — no player. Now, when the post has an embed link,
buildNote skips the image attachments so Mastodon renders the embed's player card. Klonkt's own
rendering is unchanged (cover + embed player still show on-site). Detection reuses
AudioEmbedService.detectProvider (single source of truth, covers all 6 providers).

• src/services/ActivityPubService.js — buildNote suppresses image attachments when an embed is present

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

File:

• src/services/ActivityPubService.js (modified) (3 diffs)

src/services/ActivityPubService.js

@@ -21 +21 @@
 import db from '../config/database.js';
 import HtmlSanitizerService from './HtmlSanitizerService.js';
+import AudioEmbedService from './AudioEmbedService.js';
 
 const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
@@ -225 +226 @@
   const hadAudio = /\[\[(track|album|playlist):/i.test(post.content || '');
   const playable = hasPlayableAudio(post.content || '', site && site.id);
+  // A post with an external embed (Spotify/YouTube/SoundCloud/Vimeo/Bandcamp/Apple) should let
+  // Mastodon render the embed's player CARD. Mastodon shows EITHER media attachments OR a link
+  // card, never both — so when the post has an embed link we skip the image attachments so the
+  // card wins. (On Klonkt nothing changes: the cover + the embed player still render.)
+  const hasEmbed = (() => {
+    const c = post.content || '';
+    if (/\[\[embed:/i.test(c)) return true;
+    for (const m of c.matchAll(/https?:\/\/[^\s"'<>]+/gi)) if (AudioEmbedService.detectProvider(m[0])) return true;
+    return false;
+  })();
+  const noImages = playable || hasEmbed; // suppress image attachments → let the player/embed card show
   const urls = [];
   // Posts with PLAYABLE hosted audio suppress image attachments so Mastodon renders
@@ -230 +242 @@
   // link/player card are mutually exclusive on Mastodon. Link-only audio (external)
   // keeps its cover (no player card to show).
-  if (post.cover_image_url && !playable) urls.push(abs(post.cover_image_url));
+  if (post.cover_image_url && !noImages) urls.push(abs(post.cover_image_url));
   let body = post.content || '';
   // Only federate inline images we can actually serve: absolute http(s) URLs, or our own
   // /media/ uploads. A relative path we don't host (e.g. a stale /images/... ref) would 404
   // and show up as a black tile in Mastodon's attachment grid.
-  if (!playable) for (const m of body.matchAll(/<img\b[^>]*\bsrc="([^"]+)"[^>]*>/gi)) {
+  if (!noImages) for (const m of body.matchAll(/<img\b[^>]*\bsrc="([^"]+)"[^>]*>/gi)) {
     const src = m[1];
     if (/^https?:\/\//i.test(src) || src.startsWith('/media/')) urls.push(abs(src));