Changeset 7922694 in Klonkt

Timestamp:

07/20/2026 11:03:52 PM (7 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

5143ccf

Parents:

155c24e

git-author:

Robin <roboburr@…> (07/20/2026 11:03:51 PM)

git-committer:

Robin <roboburr@…> (07/20/2026 11:03:52 PM)

Message:

Feature: owner followers/following carry name + avatar (shaer-aa3)

The C2S owner view of followers and following returned bare actor
URIs, so a client could only show ids. Each entry is now an AS2 actor
reference { id, type: Person, name, preferredUsername, icon } built
from the best cached display Klonkt already holds: the follower's own
row (now cached at Follow time), then ap_following, interactions,
timeline, mentions, falling back to a handle derived from the URI.
Priority is the set display name, then the chosen username, then the
id. ap_followers gains name/handle/icon, populated when an inbound
Follow is accepted (fetchActor already runs there).

Changed files:
src/config/database.js

• additive columns ap_followers.name/handle/icon

src/services/ActivityPubService.js

• cache follower display on inbound Follow
• actorDisplay(slug, uri): best cached display across the caches
• buildActorRef(slug, uri): AS2 actor reference with display

src/routes/activitypub.js

• owner followers/following map URIs through buildActorRef

New file:
test/c2s-contacts.test.js

• name/username/id priority + interaction-cache fallback

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

Files:

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

src/config/database.js

@@ -444 +444 @@
   ensureColumn('ap_outbox', 'to_actors', 'TEXT');   // JSON array of recipient actor URIs for direct notes
   ensureColumn('ap_outbox', 'help_request', 'INTEGER'); // FEP-633c shaer:helpRequest (ward's call for help)
+  ensureColumn('ap_followers', 'name', 'TEXT');    // cached display name (shaer-aa3)
+  ensureColumn('ap_followers', 'handle', 'TEXT');  // @user@host
+  ensureColumn('ap_followers', 'icon', 'TEXT');    // avatar URL
 }
 

src/routes/activitypub.js

@@ -175 +175 @@
   if (!site) return res.status(404).end();
   if (owner) {
-    const items = db.prepare('SELECT actor_uri FROM ap_followers WHERE slug = ? ORDER BY created_at').all(site.slug).map((r) => r.actor_uri);
+    const uris = db.prepare('SELECT actor_uri FROM ap_followers WHERE slug = ? ORDER BY created_at').all(site.slug).map((r) => r.actor_uri);
+    const items = uris.map((u) => AP.buildActorRef(site.slug, u));   // name + avatar (shaer-aa3)
     return AP.sendAP(res, AP.buildFollowers(baseUrl(req), site, items.length, items));
   }
@@ -190 +191 @@
   if (owner) {
     let items = [];
-    try { items = db.prepare("SELECT actor_uri FROM ap_following WHERE slug = ? AND status = 'accepted' ORDER BY created_at").all(site.slug).map((r) => r.actor_uri); } catch { /* table may not exist */ }
+    try { items = db.prepare("SELECT actor_uri FROM ap_following WHERE slug = ? AND status = 'accepted' ORDER BY created_at").all(site.slug).map((r) => AP.buildActorRef(site.slug, r.actor_uri)); } catch { /* table may not exist */ }
     return AP.sendAP(res, AP.buildFollowing(baseUrl(req), site, items.length, items));
   }

src/services/ActivityPubService.js

@@ -621 +621 @@
 
 // ── followers store (lazy stmts) ──────────────────────────────────
-let _insF, _delF, _listF, _cntF;
+let _insF, _updFDisp, _delF, _listF, _cntF;
 function fStmts() {
   if (!_insF) {
-    _insF = db.prepare('INSERT OR IGNORE INTO ap_followers (slug, actor_uri, inbox, shared_inbox, created_at) VALUES (?,?,?,?,CURRENT_TIMESTAMP)');
+    _insF = db.prepare('INSERT OR IGNORE INTO ap_followers (slug, actor_uri, inbox, shared_inbox, name, handle, icon, created_at) VALUES (?,?,?,?,?,?,?,CURRENT_TIMESTAMP)');
+    _updFDisp = db.prepare('UPDATE ap_followers SET name = COALESCE(?, name), handle = COALESCE(?, handle), icon = COALESCE(?, icon) WHERE slug = ? AND actor_uri = ?');
     _delF = db.prepare('DELETE FROM ap_followers WHERE slug = ? AND actor_uri = ?');
     _listF = db.prepare('SELECT inbox, shared_inbox FROM ap_followers WHERE slug = ?');
@@ -646 +647 @@
   const info = db.prepare('DELETE FROM ap_followers WHERE slug = ? AND id = ?').run(slug, id);
   return info.changes > 0;
+}
+
+// Best cached display for an actor URI, across the caches Klonkt already fills:
+// followers (now with name/icon), following, interactions, timeline, mentions.
+// Falls back to a handle derived from the URI. Display info is not sensitive.
+export function actorDisplay(slug, uri) {
+  const ok = (r) => r && (r.name || r.icon);
+  try {
+    let r = db.prepare('SELECT name, handle, icon FROM ap_followers WHERE slug = ? AND actor_uri = ?').get(slug, uri);
+    if (ok(r)) return { name: r.name, handle: r.handle || deriveHandle(uri), icon: r.icon };
+    r = db.prepare('SELECT name, handle, icon FROM ap_following WHERE slug = ? AND actor_uri = ?').get(slug, uri);
+    if (ok(r)) return { name: r.name, handle: r.handle || deriveHandle(uri), icon: r.icon };
+    r = db.prepare('SELECT actor_name AS name, actor_handle AS handle, actor_icon AS icon FROM ap_interactions WHERE actor_uri = ? AND (actor_name IS NOT NULL OR actor_icon IS NOT NULL) ORDER BY created_at DESC LIMIT 1').get(uri);
+    if (ok(r)) return { name: r.name, handle: r.handle || deriveHandle(uri), icon: r.icon };
+    r = db.prepare('SELECT author_name AS name, author_handle AS handle, author_icon AS icon FROM ap_timeline WHERE author_uri = ? AND (author_name IS NOT NULL OR author_icon IS NOT NULL) LIMIT 1').get(uri);
+    if (ok(r)) return { name: r.name, handle: r.handle || deriveHandle(uri), icon: r.icon };
+    r = db.prepare('SELECT actor_name AS name, actor_handle AS handle, actor_icon AS icon FROM ap_mentions WHERE actor_uri = ? AND (actor_name IS NOT NULL OR actor_icon IS NOT NULL) ORDER BY created_at DESC LIMIT 1').get(uri);
+    if (ok(r)) return { name: r.name, handle: r.handle || deriveHandle(uri), icon: r.icon };
+  } catch { /* ignore */ }
+  return { name: null, handle: deriveHandle(uri), icon: null };
+}
+
+// AS2 actor reference with display, for the owner C2S followers/following view.
+// preferredUsername = the local part of the handle; name = the set display name.
+export function buildActorRef(slug, uri) {
+  const d = actorDisplay(slug, uri);
+  const user = d.handle && d.handle[0] === '@' ? d.handle.slice(1).split('@')[0] : null;
+  const out = { id: uri, type: 'Person' };
+  if (d.name) out.name = d.name;
+  if (user) out.preferredUsername = user;
+  if (d.icon) out.icon = { type: 'Image', url: d.icon };
+  return out;
 }
 
@@ -1255 +1288 @@
     if (!remote || !remote.inbox) return 202; // can't reach them → drop quietly
     const sharedInbox = (remote.endpoints && remote.endpoints.sharedInbox) || null;
-    fStmts().ins.run(slug, who, remote.inbox, sharedInbox);
+    const fi = actorInfo(remote, who);   // cache display for the friends list (shaer-aa3)
+    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 */ }
     const me = actorId(base, slug);
     const keys = getOrCreateKeys(slug);
@@ -3035 +3070 @@
   linkifyBody, bakePostContent, bakePostContentWithMentions, listFollowers, removeFollower, listConnections,
   noteVisibility, isRejectedObject, rejectInteraction, interactionReportTarget,
-  getMessages, notificationsSeenAt, ingestOutboxActivity, c2sVisibility,
+  getMessages, notificationsSeenAt, ingestOutboxActivity, c2sVisibility, actorDisplay, buildActorRef,
 };