Changeset 97bacf2 in Klonkt

Timestamp:

07/25/2026 11:32:44 PM (6 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

8f8b40f

Parents:

f1c50f9

Message:

FEP-9098 emit: Klonkt bewaart + serveert custom-emoji tags (C2S inbox)

De Shaer-client toonde nog :shortcode: omdat de data ontbrak: Klonkt bewaarde de
Emoji-tags van inkomende federatie-posts niet en serveerde geen tag-array op de
C2S inbox-read. Nu: op inbound Create (en backfill) worden de Emoji-tags bewaard
in ap_timeline.emoji_json, en de inbox-read serveert ze als note.tag zodat de
client de shortcode->url map kan bouwen en de emoji inline rendert.

Changed files:
src/config/database.js

• ap_timeline.emoji_json

src/services/ActivityPubService.js

• extractEmojiTags(tag) + timelineEmojis(json); UPDATE emoji_json bij inbound Create + backfill

src/routes/activitypub.js

• inbox-read serveert nu tag: timelineEmojis(t.emoji_json)

New file:
test/custom-emojis.test.js

• extract/round-trip + geen-emoji-geval

remarks: npm test 173/173. Werkt voor NIEUWE inbound posts; bestaande timeline-rijen
hebben nog geen emoji_json (geen backfill). Eigen Klonkt-posts hebben geen custom
emojis (geen picker); losse :tekst: zonder gedefinieerde emoji blijft terecht letterlijk.

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

Files:

• src/config/database.js (modified) (1 diff)
• src/routes/activitypub.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (4 diffs)
• test/custom-emojis.test.js (added)

src/config/database.js

@@ -547 +547 @@
   ensureColumn('ap_timeline', 'nsfw', 'INTEGER DEFAULT 0');  // remote sensitive post → blur in the Cirkel
   ensureColumn('ap_timeline', 'cw', 'TEXT');                 // remote content-warning text
+  ensureColumn('ap_timeline', 'emoji_json', 'TEXT');         // FEP-9098 custom emoji Emoji tags from the inbound note, served back as `tag`
   ensureColumn('ap_timeline', 'reblog_name', 'TEXT');        // a followed account boosted this → "X boosted"
   ensureColumn('ap_timeline', 'reblog_handle', 'TEXT');      //   the booster's @handle

src/routes/activitypub.js

@@ -162 +162 @@
       // client renders their images/audio like own outbox posts.
       attachment: AP.timelineAttachments(t.media_json),
+      // FEP-9098 custom emojis: the note's Emoji tags, so the client can
+      // render :shortcode: as an image instead of literal text.
+      tag: AP.timelineEmojis(t.emoji_json),
     },
   }));

src/services/ActivityPubService.js

@@ -1537 +1537 @@
           // 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 */ } }
+          // FEP-9098: keep the note's custom-emoji tags so the C2S inbox read can serve them.
+          { const ej = extractEmojiTags(o.tag); if (ej) { try { db.prepare('UPDATE ap_timeline SET emoji_json = ? WHERE id = ? AND slug = ?').run(ej, 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 */ } }
         }
@@ -2565 +2567 @@
 }
 
+// FEP-9098 custom emojis. Inbound: keep the note's Emoji tags (as JSON) so we
+// can serve them back. `extractEmojiTags` returns the JSON to store (or null);
+// `timelineEmojis` turns the stored JSON back into an AS2 `tag` array for the
+// C2S inbox read, so a client (Shaer) can render :shortcode: as an image.
+export function extractEmojiTags(tag) {
+  const arr = Array.isArray(tag) ? tag : (tag ? [tag] : []);
+  const emojis = arr.filter((t) => t && (Array.isArray(t.type) ? t.type[0] : t.type) === 'Emoji'
+    && typeof t.name === 'string' && t.icon);
+  return emojis.length ? JSON.stringify(emojis) : null;
+}
+export function timelineEmojis(emojiJson) {
+  try { const arr = emojiJson ? JSON.parse(emojiJson) : null; return (Array.isArray(arr) && arr.length) ? arr : undefined; }
+  catch { return undefined; }
+}
+
 // ── Cirkel = posts from the accounts you auto-boost ("feature an artist") ──
 let _abCount, _cirkelPosts, _cirkelMembers;
@@ -2720 +2737 @@
         const r = tlStmts().ins.run(o.id, slug, actorUri, ai.name, ai.handle, ai.icon, ai.url, html, o.url || null, o.published || null, mediaFromNote(o), o.sensitive ? 1 : 0, o.summary || null);
         if (r && r.changes > 0) added++;
+        // FEP-9098: keep custom-emoji tags from backfilled posts too.
+        { const ej = extractEmojiTags(o.tag); if (ej) { try { db.prepare('UPDATE ap_timeline SET emoji_json = ? WHERE id = ? AND slug = ?').run(ej, o.id, slug); } catch { /* ignore */ } } }
         // Set poll_json if this is a poll and we don't already have it (COALESCE preserves a vote).
         if (poll) { try { db.prepare('UPDATE ap_timeline SET poll_json = COALESCE(poll_json, ?) WHERE id = ? AND slug = ?').run(JSON.stringify(poll), o.id, slug); } catch { /* ignore */ } }
@@ -3357 +3376 @@
   getInteractions, getInteractionById, setInteractionBoosted, setInteractionLiked, setMyReaction, getMyReactions, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote,
   listOutbox, deliverOutboxDelete, deliverOutboxUpdate, deliverDirectNote,
-  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, sendInteraction, voteOnPoll, voteOnRemotePoll,
+  webfingerResolve, followActor, resolveRemoteActor, unfollowActor, listFollowing, setAutoBoost, backfillFromOutbox, getTimeline, timelineAttachments, timelineEmojis, sendInteraction, voteOnPoll, voteOnRemotePoll,
   acceptGatedFollow, rejectGatedFollow, isWardGuardian, sendFollowDecision,
   parseOwnPoll, pollTally, ownPollView, deliverPollUpdate, maybeCrawlThread, sendReport, localMentionSlugs,