Changeset bfa6fa1 in Klonkt

Timestamp:

07/31/2026 06:02:01 PM (6 weeks ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

72ec6a4

Parents:

0ca7e9a4

Message:

Account-verhuizingen slice 3: het wegwijsbord (movedTo + homepage-link)

Het sluitstuk van shaer-0j2's federatiekant. De oude Klonkt blijft
staan en ZEGT waar hij heen ging, op twee plekken.

Voor servers: het actor-document draagt movedTo zodra moved_to gezet is
(FEP-7628: een verhuisd account moet dat publiceren en geldt als
inactief). Dat is precies waarom de oude actor online blijft: wie de
Move-activity miste (server offline, latere bezoeker) leert de
verhuizing alsnog door ons op te halen. Een kolomwaarde die geen URL is
haalt de draad nooit.

Voor mensen: de homepage opent met een groot wegwijsbord boven de feed,
met de handle van het nieuwe adres als grote link. Boven de posts met
opzet: niemand hoort een dode tijdlijn door te scrollen om te ontdekken
dat we weg zijn.

En de verhuizing zelf vertelt het nu twee keer: naast de Move gaat er
een Update van de actor naar elke volger-inbox, gebouwd uit de VERSE
rij, zodat het bord ook staat als de Move onderweg verdwijnt (FEP-7628
SHOULD).

Changed files:
src/services/ActivityPubService.js

• buildActor: movedTo bij een geldige moved_to
• moveAccount: Update(actor) naast de Move, per inbox

src/routes/posts.js

• home: movedTo + leesbaar label (actorDisplay) naar de view

src/views/pages/home.ejs

• wegwijsbord boven de feed, typeof-guard voor deploy-races

src/assets/css/style.css

• .moved-banner: accentrand, grote link, tekst breekt netjes af

src/services/i18n.js

• phome.moved_lead/_hint in nl/en/de

test/move-actor.test.js

• movedTo aan/uit/rommel; Update draagt het bord naast de Move
• slice-2-test telt nu Moves apart (Update rijdt mee)

remarks: banner visueel gecontroleerd (mobiel en desktop) door het echte
templateblok met de echte CSS te renderen; suite 372 groen.

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

Files:

• src/assets/css/style.css (modified) (1 diff)
• src/routes/posts.js (modified) (1 diff)
• src/services/ActivityPubService.js (modified) (2 diffs)
• src/services/i18n.js (modified) (3 diffs)
• src/views/pages/home.ejs (modified) (1 diff)
• test/move-actor.test.js (modified) (1 diff)

src/assets/css/style.css

@@ -559 +559 @@
 
 .empty { text-align: center; padding: 4rem 1rem; }
+/* Moved account (FEP-7628 slice 3): the signpost above the feed. Loud on
+   purpose — a visitor must not read a stale timeline thinking it is current. */
+.moved-banner {
+    text-align: center;
+    margin: 1.5rem 0 2rem;
+    padding: 1.75rem 1.25rem;
+    border: 2px solid var(--accent, #e8b04b);
+    border-radius: var(--radius, 10px);
+    background: color-mix(in srgb, var(--accent, #e8b04b) 10%, var(--paper-2, var(--paper)));
+}
+.moved-banner-lead { margin: 0 0 .5rem; font-size: 1rem; opacity: .85; }
+.moved-banner-link {
+    display: inline-block;
+    font-family: var(--font-display);
+    font-size: clamp(1.5rem, 5vw, 2.4rem);
+    font-weight: 700;
+    line-height: 1.15;
+    overflow-wrap: anywhere;
+}
+.moved-banner-hint { margin: .75rem 0 0; font-size: .85rem; color: var(--ink-soft); }
 .empty h1 { font-size: 2rem; }
 .empty p { color: var(--ink-muted); }

src/routes/posts.js

@@ -232 +232 @@
   recordPageview(site.id, req);
 
+  // FEP-7628 slice 3: this account moved. A visitor who lands here deserves
+  // the same signpost the fediverse gets — one big link to the new address.
+  const movedTo = site.moved_to && /^https?:\/\//i.test(String(site.moved_to)) ? String(site.moved_to) : null;
   renderPage(req, res, 'pages/home', {
     pinnedPosts,
     posts,
     hasMore, nextOffset: offset + FEED_PAGE, moreBase,
+    movedTo,
+    movedToLabel: movedTo ? (ActivityPubService.actorDisplay(site.slug, movedTo).handle || movedTo) : null,
     pageTitle: site.title,
     socialDescr: site.description || site.tagline || '',

src/services/ActivityPubService.js

@@ -234 +234 @@
     }
   } catch { /* skip malformed ap_aliases */ }
+  // FEP-7628 slice 3: this account moved. The old actor stays online AS A
+  // SIGNPOST — that is the whole point of keeping it: whoever missed the Move
+  // activity (offline server, later visitor) still learns where we went by
+  // fetching us. Per the FEP the moved actor "should be considered inactive",
+  // and publishers should stop delivering here.
+  if (site.moved_to && /^https?:\/\//i.test(String(site.moved_to))) actor.movedTo = String(site.moved_to);
   // Profile links → PropertyValue rows: Mastodon/PeerTube/WordPress-ActivityPub render these as
   // profile metadata (rel=me enables link-back verification). Additive; ignored by simpler receivers.
@@ -3892 +3898 @@
     to: [`${me}/followers`],
   };
+  // FEP-7628: after setting movedTo, notify the followers with an Update of
+  // the actor, so their servers hold the signpost even if the Move itself is
+  // lost. Built from the FRESH row: `site` still carries the pre-move values.
+  const movedSite = db.prepare('SELECT * FROM sites WHERE slug = ?').get(site.slug) || { ...site, moved_to: target.id };
+  const update = {
+    '@context': AP_CONTEXT,
+    id: `${me}#update-${Date.now()}-${rid()}`,
+    type: 'Update', actor: me, to: [PUBLIC], cc: [`${me}/followers`],
+    object: buildActor(base, movedSite),
+    published: new Date().toISOString(),
+  };
   const inboxes = [...new Set(fStmts().list.all(site.slug).map((f) => f.shared_inbox || f.inbox).filter(Boolean))];
+  const send = deliverFn || deliverWithRetry;
   for (const inbox of inboxes) {
-    await (deliverFn || deliverWithRetry)(site.slug, inbox, move, `${me}#main-key`, keys.private_pem);
+    await send(site.slug, inbox, update, `${me}#main-key`, keys.private_pem);
+    await send(site.slug, inbox, move, `${me}#main-key`, keys.private_pem);
   }
   console.log('[AP] MOVE announced:', site.slug, '→', target.id, 'naar', inboxes.length, 'inbox(en)');

src/services/i18n.js

@@ -912 +912 @@
     'vblk.back': 'Terug',
     'vblk.to_home': 'Naar de hoofdpagina',
+    'phome.moved_lead': 'Dit account is verhuisd. Je vindt me nu hier:',
+    'phome.moved_hint': 'Volg je me al? Dan verhuist je server je waarschijnlijk vanzelf mee. Zo niet: volg het nieuwe adres.',
     'phome.empty_title': 'Hier is het nog stil.',
     'phome.empty_sub': 'Nog geen posts. Spannend.',
@@ -1854 +1856 @@
     'vblk.back': 'Back',
     'vblk.to_home': 'Go to the main page',
+    'phome.moved_lead': 'This account has moved. You can find me here now:',
+    'phome.moved_hint': 'Already following me? Your server most likely moves you along by itself. If not: follow the new address.',
     'phome.empty_title': "It's quiet here for now.",
     'phome.empty_sub': 'No posts yet. Exciting.',
@@ -2796 +2800 @@
     'vblk.back': 'Zurück',
     'vblk.to_home': 'Zur Hauptseite',
+    'phome.moved_lead': 'Dieses Konto ist umgezogen. Du findest mich jetzt hier:',
+    'phome.moved_hint': 'Folgst du mir schon? Dann zieht dein Server dich wahrscheinlich automatisch mit. Falls nicht: folge der neuen Adresse.',
     'phome.empty_title': 'Hier ist es noch still.',
     'phome.empty_sub': 'Noch keine Beiträge. Spannend.',

src/views/pages/home.ejs

@@ -17 +17 @@
     #pcms-main) so it survives HTMX swaps and is visible on every
     non-admin page. %>
+
+<%# FEP-7628 slice 3: this account moved. The signpost comes FIRST, before
+    any post: a visitor should not scroll a dead feed to find out we left.
+    typeof-guard because an old route may render this template for one
+    request right after a deploy (view cache fills on first hit). %>
+<% if (typeof movedTo !== 'undefined' && movedTo) { %>
+  <div class="container">
+    <aside class="moved-banner">
+      <p class="moved-banner-lead"><%= t('phome.moved_lead') %></p>
+      <a class="moved-banner-link" href="<%= movedTo %>" rel="me noopener"><%= movedToLabel || movedTo %></a>
+      <p class="moved-banner-hint"><%= t('phome.moved_hint') %></p>
+    </aside>
+  </div>
+<% } %>
 
 <!-- ========== TIMELINE ========== -->

test/move-actor.test.js

@@ -163 +163 @@
   assert.equal(r.target, 'https://elders.example/users/nieuw');
   assert.equal(db.prepare("SELECT moved_to FROM sites WHERE slug = 'radio'").get().moved_to, 'https://elders.example/users/nieuw');
-  assert.equal(delivered.length, 2, 'both follower inboxes');
-  for (const d of delivered) {
-    assert.equal(d.activity.type, 'Move');
+  // Slice 3 added the Update(actor) alongside it, so count the Moves.
+  const moves = delivered.filter((d) => d.activity.type === 'Move');
+  assert.equal(moves.length, 2, 'one Move per follower inbox');
+  for (const d of moves) {
     assert.equal(d.activity.object, ME_RADIO);
     assert.equal(d.activity.target, 'https://elders.example/users/nieuw');
   }
-  assert.ok(delivered.some((d) => d.inbox === 'https://b.example/shared'), 'shared inbox preferred');
-});
+  assert.ok(moves.some((d) => d.inbox === 'https://b.example/shared'), 'shared inbox preferred');
+});
+
+// ── Slice 3: the signpost ──────────────────────────────────────────
+// The old actor stays online and SAYS where it went (FEP-7628 movedTo), and
+// the followers are told with an Update alongside the Move.
+
+test('a moved account carries movedTo on its actor; an unmoved one does not', () => {
+  const fresh = db.prepare("SELECT * FROM sites WHERE slug = 'blog'").get();
+  assert.equal('movedTo' in buildActor('https://test.example', fresh), false, 'no move, no signpost');
+  const moved = { ...fresh, moved_to: 'https://elders.example/users/nieuw' };
+  assert.equal(buildActor('https://test.example', moved).movedTo, 'https://elders.example/users/nieuw');
+  // Junk in the column never reaches the wire.
+  assert.equal('movedTo' in buildActor('https://test.example', { ...fresh, moved_to: 'niet-een-url' }), false);
+});
+
+test('the move tells the followers twice: an Update carrying movedTo, and the Move', async () => {
+  db.prepare("DELETE FROM ap_followers WHERE slug = 'radio'").run();
+  db.prepare("UPDATE sites SET moved_to = NULL WHERE slug = 'radio'").run();
+  db.prepare("INSERT INTO ap_followers (slug, actor_uri, inbox) VALUES ('radio', 'https://c.example/u/c', 'https://c.example/inbox')").run();
+  const sent = [];
+  const r = await moveAccount(radioSite(), 'https://elders.example/users/nieuw', {
+    fetchActorFn: async () => ({ id: 'https://elders.example/users/nieuw', inbox: 'https://elders.example/inbox', alsoKnownAs: [ME_RADIO] }),
+    deliverFn: async (slug, inbox, activity) => { sent.push(activity); },
+  });
+  assert.equal(r.ok, true);
+  const update = sent.find((a) => a.type === 'Update');
+  const move = sent.find((a) => a.type === 'Move');
+  assert.ok(update, 'an Update is sent');
+  assert.ok(move, 'the Move is still sent');
+  assert.equal(update.object.movedTo, 'https://elders.example/users/nieuw', 'the Update carries the signpost');
+  assert.equal(update.object.id, ME_RADIO, 'and it is OUR actor being updated');
+});