Changeset 8240e80 in Klonkt for src/services/ActivityPubService.js

Timestamp:

07/22/2026 07:12:11 AM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

96c714f

Parents:

053bf51

git-author:

Robin <roboburr@…> (07/22/2026 07:09:32 AM)

git-committer:

Robin <roboburr@…> (07/22/2026 07:12:11 AM)

Message:

Feature: web push slice 3, real triggers from the S2S inbox

The owner now gets a push when something actually happens: new follower,
reply on a post, mention, like, boost, or a private message. All four
trigger points sit right after the existing inbox writes and are
fire-and-forget (pushEvent catches everything): a notification can never
block or break federation processing.

Privacy rule from the design doc: private (followers/direct) replies and
mentions push as a plain "Nieuw bericht van X" WITHOUT the message text,
so the browser push service never carries private content. Public replies
and mentions carry a short plain-text snippet; likes/boosts carry the post
title. URLs are hub-aware (/user/<slug> prefix when tenancy is hub).

Per-type preferences from slice 2 are honoured by notifySite (follow/reply
/dm on by default, like/boost off).

Changed files:
src/services/ActivityPubService.js

• pushEvent/pushPrefix/pushPostCtx helpers above handleInbox
• Follow: "Nieuwe volger" → /connect
• reply: public snippet → post#fediverse; private → dm ping → /messages
• mention: same split, "Vermelding" → /messages
• Like/Announce: "Nieuwe waardering"/"Geboost" with the post title

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

File:

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

src/services/ActivityPubService.js

@@ -22 +22 @@
 import HtmlSanitizerService from './HtmlSanitizerService.js';
 import AudioEmbedService from './AudioEmbedService.js';
+import Push from './PushService.js';
+import { getTenancy } from './SettingsService.js';
 
 const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
@@ -1262 +1264 @@
 }
 
+// ── Web push to the owner (docs/webpush-design.md, slice 3) ─────────
+// Fire-and-forget: a notification must never block or break inbox processing.
+function pushEvent(slug, event) {
+  try { Push.notifySite(slug, event).catch(() => {}); } catch { /* never throw */ }
+}
+// Hub-aware path prefix for a site's pages ('' in solo).
+function pushPrefix(slug) {
+  try { return getTenancy() === 'hub' ? `/user/${slug}` : ''; } catch { return ''; }
+}
+// Site slug, target URL and title for a post-scoped notification.
+function pushPostCtx(postId) {
+  try {
+    const r = db.prepare('SELECT p.slug AS post, p.title, s.slug AS site FROM posts p JOIN sites s ON s.id = p.site_id WHERE p.id = ?').get(postId);
+    if (!r) return null;
+    return { site: r.site, title: r.title || r.post, url: `${pushPrefix(r.site)}/${r.post}#fediverse` };
+  } catch { return null; }
+}
+
 // Handle an incoming inbox POST. slugParam = null for the shared /ap/inbox.
 export async function handleInbox(req, slugParam) {
@@ -1323 +1343 @@
     fStmts().ins.run(slug, who, remote.inbox, sharedInbox, fi.name, fi.handle, fi.icon);
     try { _updFDisp.run(fi.name, fi.handle, fi.icon, slug, who); } catch { /* best effort */ }
+    pushEvent(slug, { type: 'follow', title: 'Nieuwe volger', body: `${fi.name || fi.handle || 'Iemand'} volgt je nu`, url: `${pushPrefix(slug)}/connect` });
     const me = actorId(base, slug);
     const keys = getOrCreateKeys(slug);
@@ -1385 +1406 @@
       iStmts().ins.run('reply', tgt.post_id, o.id || '', actorUri, ai.name, ai.handle, ai.url, ai.icon, html, o.published || null, tgt.parent_uri, noteVisibility(o));
       console.log('[AP] reply', actorUri, '→', tgt.post_id);
+      {
+        // Private (followers/direct) replies push as a DM ping WITHOUT content
+        // (the push service should never carry private text, design decision);
+        // public replies carry a short snippet.
+        const ctx = pushPostCtx(tgt.post_id);
+        const vis = noteVisibility(o);
+        const priv = vis === 'direct' || vis === 'followers';
+        const who = ai.name || ai.handle || 'Iemand';
+        if (ctx) {
+          if (priv) pushEvent(ctx.site, { type: 'dm', title: 'Privébericht', body: `Nieuw bericht van ${who}`, url: `${pushPrefix(ctx.site)}/messages` });
+          else pushEvent(ctx.site, { type: 'reply', title: `Reactie op "${ctx.title}"`, body: `${who}: ${HtmlSanitizerService.toPlainText(html).slice(0, 90)}`, url: ctx.url });
+        }
+      }
       return 202;
     }
@@ -1427 +1461 @@
             const r = db.prepare('INSERT OR IGNORE INTO ap_mentions (slug, object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, published, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)')
               .run(slug, o.id, safeUrl(o.url) || null, actorUri, ai.name, ai.handle, ai.icon, ai.url, html, o.published || null);
-            if (r.changes) console.log('[AP] mention', actorUri, '→', slug);
+            if (r.changes) {
+              console.log('[AP] mention', actorUri, '→', slug);
+              const vis = noteVisibility(o);
+              const priv = vis === 'direct' || vis === 'followers';
+              const who = ai.name || ai.handle || 'Iemand';
+              // Same privacy rule as replies: private mentions push without content.
+              if (priv) pushEvent(slug, { type: 'dm', title: 'Privébericht', body: `Nieuw bericht van ${who}`, url: `${pushPrefix(slug)}/messages` });
+              else pushEvent(slug, { type: 'reply', title: 'Vermelding', body: `${who}: ${HtmlSanitizerService.toPlainText(html).slice(0, 90)}`, url: `${pushPrefix(slug)}/messages` });
+            }
           } catch { /* ignore */ }
         }
@@ -1482 +1524 @@
       iStmts().ins.run(type.toLowerCase(), pid, '', actorUri, ai.name, ai.handle, ai.url, ai.icon, null, null, null, noteVisibility(act));
       console.log('[AP]', type === 'Like' ? 'like' : 'boost', actorUri, '→', pid);
+      {
+        const ctx = pushPostCtx(pid);
+        const who = ai.name || ai.handle || 'Iemand';
+        if (ctx) {
+          if (type === 'Like') pushEvent(ctx.site, { type: 'like', title: 'Nieuwe waardering', body: `${who} waardeerde "${ctx.title}"`, url: ctx.url });
+          else pushEvent(ctx.site, { type: 'boost', title: 'Geboost', body: `${who} boostte "${ctx.title}"`, url: ctx.url });
+        }
+      }
     } else if (type === 'Announce' && objUrl && actorUri && !isLocalActor) {
       // A boost FROM an account we follow, of a REMOTE post → show it in the News feed.