Changeset 5190152 in Klonkt for src/services/ActivityPubService.js

Timestamp:

07/19/2026 05:38:25 PM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

e9c9ae1

Parents:

feced2c

git-author:

Robin <roboburr@…> (07/19/2026 05:38:00 PM)

git-committer:

Robin <roboburr@…> (07/19/2026 05:38:25 PM)

Message:

Feature: rich editor on the edit forms too (klonkt-demo-c7f, last slice)

Editing a sent reply (Messages + the interact page's manage list) now opens the
same shared editor as new replies, instead of a bare textarea. Prutter stays
plain on purpose (Robin: not part of this).

• reply-editor partial: initialHtml/initialText prefill for edit mode, and a noAttach flag that omits the media UI (an edit never touches attachments). JS grew canAttach guards so the component runs without the attach elements; pasted files are still swallowed there rather than becoming base64 blobs.
• deliverOutboxUpdate(site, id, text, {html, language}): rich path with the same sanitize + enrichment + mention-first-paragraph logic as deliverReply; language updated via COALESCE (bogus codes keep the old one); attachments survive untouched. Plain path unchanged.
• /fediverse/:id/edit passes content + language; listOutbox and the Messages sent-projection carry language so the select preselects correctly.
• The interact page's edit-toggle focuses the rich editor when present.

2 new tests (93 green). Browser-verified on /messages: prefilled editor
(mention-stripped HTML + plain fallback + language preselected, no paperclip),
edit saved -> content replaced with markup, mention re-attached inline,
language nl->en, no console errors.

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

File:

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

src/services/ActivityPubService.js

@@ -513 +513 @@
       items.push({
         type: 'sent', outboxId: m.id, to_handle: m.to_handle, in_reply_to: m.in_reply_to,
-        content: m.content, editable: m.editable, created_at: m.created_at,
+        content: m.content, editable: m.editable, language: m.language, created_at: m.created_at,
       });
     }
@@ -2049 +2049 @@
 }
 export function listOutbox(siteSlug) {
-  return db.prepare('SELECT id, content, to_handle, in_reply_to, created_at FROM ap_outbox WHERE site_slug = ? ORDER BY created_at DESC')
+  return db.prepare('SELECT id, content, to_handle, in_reply_to, language, created_at FROM ap_outbox WHERE site_slug = ? ORDER BY created_at DESC')
     .all(siteSlug).map((r) => { const c = stripLeadingMentions(r.content); return { ...r, content: c, editable: outboxEditableText(c) }; });
 }
@@ -2077 +2077 @@
 // Edit one of our outbound replies: rewrite the stored content (mention re-added + #tags
 // re-linked) and send an Update(Note) so recipients refresh their cached copy.
-export async function deliverOutboxUpdate(site, outboxId, newText) {
+export async function deliverOutboxUpdate(site, outboxId, newText, opts = {}) {
   const row = iStmts().getO.get(outboxId);
   if (!row || row.site_slug !== site.slug) return false;
   const text = String(newText || '').trim();
-  if (!text) return false;
+  // Rich edit: same sanitize + enrichment pipeline as deliverReply.
+  const richClean = opts.html ? HtmlSanitizerService.sanitize(String(opts.html)) : '';
+  const rich = richClean && HtmlSanitizerService.toPlainText(richClean).trim() ? richClean : '';
+  if (!text && !rich) return false;
   const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
   if (!base) return false;
@@ -2091 +2094 @@
   const mention = row.to_actor
     ? `<a href="${escHtml(toProfile)}" class="u-url mention" data-actor="${escHtml(row.to_actor)}">${escHtml(toHandle)}</a> ` : '';
-  const mres = await resolveMentionsInText(base, escHtml(text).replace(/\r?\n/g, '<br>'));
-  const content = `<p>${mention}${linkUrls(linkHashtags(base, mres.html))}</p>`;
-  db.prepare('UPDATE ap_outbox SET content = ? WHERE id = ?').run(content, outboxId);
+  let content;
+  let mres;
+  if (rich) {
+    mres = await resolveMentionsInText(base, rich);
+    const processed = linkUrls(linkHashtags(base, mres.html));
+    if (processed.startsWith('<p>')) content = processed.replace('<p>', `<p>${mention}`);
+    else if (/^<(blockquote|ul|ol|pre|h[1-6]|div|hr)\b/i.test(processed)) content = `<p>${mention}</p>${processed}`;
+    else content = `<p>${mention}${processed}</p>`;
+  } else {
+    mres = await resolveMentionsInText(base, escHtml(text).replace(/\r?\n/g, '<br>'));
+    content = `<p>${mention}${linkUrls(linkHashtags(base, mres.html))}</p>`;
+  }
+  // Language may be updated with the edit; attachments always survive untouched.
+  const newLang = /^[a-z]{2,3}(-[A-Za-z0-9-]+)?$/.test(String(opts.language || '')) ? opts.language : null;
+  db.prepare('UPDATE ap_outbox SET content = ?, language = COALESCE(?, language) WHERE id = ?').run(content, newLang, outboxId);
   const note = buildReplyNote(base, site, iStmts().getO.get(outboxId));
   note.updated = new Date().toISOString();