Changeset 2d6a9c3 in Klonkt

Timestamp:

07/16/2026 12:20:51 PM (8 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

af21002

Parents:

8878814

git-author:

Robin <roboburr@…> (07/13/2026 05:21:50 AM)

git-committer:

Robin <roboburr@…> (07/16/2026 12:20:51 PM)

Message:

Spoor A step 1: bake post display HTML at save (ActivityPub source model)

Introduce the source/rendered split: posts.content stays the raw source (what
the editor round-trips), a new content_rendered column holds the baked display
HTML. bakePostContent() runs the linkify pipeline once at create/edit and
caches it; the render route serves content_rendered (falling back to an
on-the-fly bake for not-yet-baked posts) and no longer re-linkifies every view.
Verified: baked and fallback paths render byte-identically and a baked lone URL
still becomes an embed. This is the seam for step 2 (resolve @mentions once at
save instead of per page view) and removes the per-render linkify cost.

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

Location:

src

Files:

• config/database.js (modified) (1 diff)
• routes/posts.js (modified) (5 diffs)
• services/ActivityPubService.js (modified) (2 diffs)

src/config/database.js

@@ -387 +387 @@
   ensureColumn('ap_followers', 'last_delivery_at', 'DATETIME'); // last SUCCESSFUL delivery to this follower's inbox
   ensureColumn('ap_followers', 'last_error_at', 'DATETIME');    // last time a delivery to it gave up (max retries)
+
+  // ActivityPub `source` model: content_rendered = baked display HTML (#hashtags / URLs /
+  // @mentions linkified once at save). `content` stays the raw source used for editing and
+  // re-rendering. NULL on old posts → the render route bakes on the fly as a fallback.
+  ensureColumn('posts', 'content_rendered', 'TEXT');
 }
 

src/routes/posts.js

@@ -238 +238 @@
 }
 
+// Bake + cache a post's display HTML (ActivityPub `source` model): `content` stays the raw
+// source (used by the editor + re-rendering), content_rendered holds the linkified render the
+// page serves. Called after every create/edit. Non-fatal: the render route falls back to
+// baking on the fly if this ever fails.
+function cacheRenderedContent(postId, rawContent) {
+  try {
+    db.prepare('UPDATE posts SET content_rendered = ? WHERE id = ?')
+      .run(ActivityPubService.bakePostContent(rawContent || ''), postId);
+  } catch (e) { /* fallback bake in the render route keeps display correct */ }
+}
+
 router.post('/posts/create', requireAuth, (req, res) => {
   const site = res.locals.site;
@@ -299 +310 @@
     now, now, publishedAt
   );
+  cacheRenderedContent(postId, cleanContent); // bake display HTML (ActivityPub `source` model)
 
   // Per-post "share audio on the fediverse" → set fedi_open on this post's hosted tracks
@@ -439 +451 @@
     finalSlug, publishedAt, now, post.id
   );
+  cacheRenderedContent(post.id, cleanContent); // re-bake display HTML on edit (ActivityPub `source` model)
 
   // Per-post "share audio on the fediverse" → set fedi_open on this post's hosted tracks
@@ -994 +1007 @@
   if (post.status === 'published') recordPostView(post, req);
 
-  // Render content. Content is now user-authored HTML (already sanitized on
-  // save). The pipeline still adds autoembed iframes and shortcode embeds:
-  //   stored HTML → autoembed → [[track]]/[[album]]/[[playlist]] → response
-  let html = post.content || '';
+  // Render content. Base = the pre-rendered ("baked") display HTML: #hashtags/URLs (and, later,
+  // @mentions) linkified once at SAVE and cached in content_rendered — the ActivityPub `source`
+  // model (content = raw source, kept for editing). Old posts with no baked copy fall back to
+  // baking on the fly (cheap, no network). The dynamic layer (autoembed + [[track/album/
+  // playlist]] + signed audio URLs) stays per-render on top, since it can't be cached.
+  let html = (post.content_rendered != null && post.content_rendered !== '')
+    ? post.content_rendered
+    : ActivityPubService.bakePostContent(post.content || '');
   if (audioEnabled()) {
   if (site.enable_audio_player !== 0) {
@@ -1092 +1109 @@
     html = html.replace(/\[\[(track|album|playlist):[^\]]+\]\]/gi, '');
   }
-  // Linkify inline #hashtags and bare URLs for on-site display — same rules as the
-  // federated copy (buildNote). Was: only the Mastodon copy got links; the website
-  // showed raw "#tag"/URL text. Idempotent, so editor links + embeds are untouched.
-  html = ActivityPubService.linkifyBody('', html);
+  // (linkify is baked into content_rendered at save now, not re-run here.)
   post.content_html = html;
 

src/services/ActivityPubService.js

@@ -1464 +1464 @@
 }
 
+// Bake a post's raw source into its display HTML (the ActivityPub `source` model): done ONCE
+// at save and cached in posts.content_rendered, so page views serve it statically instead of
+// re-linkifying every render. Step 1 = #hashtags + bare URLs (cheap, no network). Step 2 will
+// resolve @mentions here too (webfinger once at save instead of per page view).
+export function bakePostContent(source) {
+  return linkifyBody('', source || '');
+}
+
 // Extract the AP Hashtag tag objects from already-linked reply content.
 function hashtagTags(base, content) {
@@ -2463 +2471 @@
   deliverWithRetry, enqueueDelivery, processDeliveryQueue, startDeliveryWorker,
   getReplyUris, markNotificationsSeen, countUnseenNotifications, hasPlayableAudio,
-  linkifyBody, listFollowers, removeFollower,
+  linkifyBody, bakePostContent, listFollowers, removeFollower,
 };