Changeset 31680c3 in Klonkt for src/routes

Timestamp:

09/30/2026 08:39:24 AM (5 hours ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

746d98a

Parents:

76bd53c

Message:

[Add to HUB] on the Connect page — the click is the owner's yes

Putting a klonkt on the Klonkt Hub means the hub sends a Follow. With the
owner gate on (the default) that Follow then waits for the owner — the same
person who just asked for it. Without this they would sign up on the hub and
then have to approve their own sign-up on /connect.

The button POSTs to /connect/add-to-hub, which records a one-day invitation
and redirects to the hub's sign-up form with the site's handle filled in
(?add=). A Follow from the hub's host, signed by the hub itself, passes the
owner gate while that invitation holds. It is not used up on the first
Follow: a hub that re-sends after a timeout would otherwise land in the queue
for something already decided.

Narrow on purpose: only the hub's host, only signed by it, only for a day.
Anyone else still waits for the owner, and a WARD's guardians still decide —
their gate sits before this one and this path never reaches it.

If a request from the hub is already waiting (someone signed the klonkt up
earlier), the click is exactly the yes it waits for: it is accepted on the
spot and the button goes to the channel on the hub instead of the form. Once
the hub follows, /connect shows a confirmation instead of the button. Hidden
after a move, where the outgoing side is locked.

KLONKT_HUB_URL lets a self-hoster point the button at another hub; default
​https://hub.klonkt.com.

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

File:

• src/routes/posts.js (modified) (3 diffs)

src/routes/posts.js

@@ -21 +21 @@
 import ActivityPubService from '../services/ActivityPubService.js';
 import * as Guardianship from '../services/guardianship/index.js';
+import * as HubInvite from '../services/hub-invite.js';
 import { premiumUnlocked } from '../services/PatreonService.js';
 import { defaultMinCents as paidDefaultMinCents, patreonUrl as paidPatronUrl } from '../services/PaidPatreonService.js';
@@ -1340 +1341 @@
     connections, myGuardians, followRequests,
     approveFollowers: !!(site && site.approve_followers),
+    // [Add to HUB]: staat hij er al op, dan een bevestiging in plaats van de knop.
+    hub: site ? { url: HubInvite.hubUrl(), onHub: HubInvite.onHub(site.slug), ward: myGuardians.length > 0 } : null,
     // Na een verhuizing staat de uitgaande kant op slot. Dat hoort te blijken
     // VOORDAT je op een knop drukt, niet daarna uit een foutmelding.
@@ -1369 +1372 @@
   }
   return res.redirect(`${base}/connect`);
+});
+
+// [Add to HUB] (Robin, 30-9): zet deze klonkt op de Klonkt Hub.
+//
+// De knop stuurt je naar het aanmeldformulier van de hub, vooraf ingevuld met
+// je eigen handle; aanmelden blijft daar een eigen klik. Hier gebeurt het
+// deel dat de hub niet kan: de eigenaar geeft alvast zijn ja voor de Follow
+// die daarop volgt, zodat hij straks niet zijn eigen aanmelding hoeft goed te
+// keuren (zie services/hub-invite.js).
+//
+// Staat er al een verzoek van de hub te wachten -- iemand meldde je eerder
+// aan -- dan is deze klik precies het ja waar dat verzoek op wacht, en hoef je
+// niet langs het formulier. Bij een WARD nooit: daar beslissen de guardians.
+router.post('/connect/add-to-hub', requireSiteManager, async (req, res) => {
+  const site = res.locals.site;
+  const base = res.locals.siteUrlBase || '';
+  if (!site) return res.redirect(`${base}/connect`);
+  if (ActivityPubService.movedLock(site).movedTo) {
+    return res.redirect(`${base}/connect?error=` + encodeURIComponent('Dit account is verhuisd'));
+  }
+  const pub = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, '');
+  const handle = ActivityPubService.deriveHandle(ActivityPubService.actorId(pub, site.slug)).replace(/^@/, '');
+  const hub = HubInvite.hubUrl();
+  const isWard = Guardianship.listGuardians(site.slug).length > 0;
+
+  if (!isWard) {
+    const wacht = Guardianship.follows.listForWard(site.slug)
+      .find((f) => f.status === 'pending' && HubInvite.isHubActor(f.follower_uri));
+    if (wacht) {
+      await ActivityPubService.acceptGatedFollow(wacht);
+      Guardianship.follows.remove(wacht.id);
+      return res.redirect(303, `${hub}/?klonkt=${encodeURIComponent(handle)}`);
+    }
+  }
+  HubInvite.invite(site.id);
+  return res.redirect(303, `${hub}/?add=${encodeURIComponent(handle)}`);
 });