Changeset ffa53cc in Klonkt

Timestamp:

06/24/2026 01:56:06 PM (3 months ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

c73ac64

Parents:

de3d24b

Message:

fix(activitypub): no self-duplicate when replying on your own post

deliverReply never delivers to our own inbox, and the inbox ignores activities
from our own actors (already stored via ap_outbox). Fixes a reply appearing
twice (once as You, once as the site actor) on the owner's own post.

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

File:

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

src/services/ActivityPubService.js

@@ -386 +386 @@
   const actorUri = typeof act.actor === 'string' ? act.actor : (act.actor && act.actor.id);
   const resolveActor = async (uri) => ((verified && verified.id === uri) ? verified : await fetchActor(uri).catch(() => null));
+  // Activities from our OWN actors are already stored via ap_outbox — don't re-store.
+  const isLocalActor = !!(base && actorUri && actorUri.startsWith(`${base}/ap/users/`));
 
   // Inbound reply: a Create whose object replies to one of our notes (post OR comment).
@@ -391 +393 @@
     const o = act.object;
     const tgt = findThreadTarget(o.inReplyTo, base);
-    if (tgt && actorUri) {
+    if (tgt && actorUri && !isLocalActor) {
       const ai = actorInfo(await resolveActor(actorUri), actorUri);
       const html = HtmlSanitizerService.sanitize(o.content || '');
@@ -402 +404 @@
     const tgt = act.object;
     const pid = postIdFromNoteUrl(typeof tgt === 'string' ? tgt : (tgt && tgt.id), base);
-    if (pid && actorUri && localPostExists(pid)) {
+    if (pid && actorUri && !isLocalActor && localPostExists(pid)) {
       const ai = actorInfo(await resolveActor(actorUri), actorUri);
       iStmts().ins.run(type.toLowerCase(), pid, '', actorUri, ai.name, ai.handle, ai.url, ai.icon, null, null, null);
@@ -518 +520 @@
   if (parent.threadInbox) inboxes.add(parent.threadInbox); // post author's server (nesting)
   for (const f of fStmts().list.all(site.slug)) inboxes.add(f.shared_inbox || f.inbox);
+  inboxes.delete(`${me}/inbox`);       // never deliver to ourselves (already in ap_outbox)
+  inboxes.delete(`${base}/ap/inbox`);  // (our own shared inbox) → avoids a self-duplicate
   let delivered = 0;
   for (const inbox of [...inboxes].filter(Boolean)) {