Index: src/config/database.js =================================================================== --- src/config/database.js (revision 0dba0925244c76ab297b7130179cfd7339182667) +++ src/config/database.js (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) @@ -356,4 +356,28 @@ `); ensureColumn('ap_interactions', 'parent_uri', 'TEXT'); // nesting (existing DBs) + + // Fediverse CLIENT: accounts WE follow (outbound) + the home timeline of their posts. + db.exec(` + CREATE TABLE IF NOT EXISTS ap_following ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + slug TEXT NOT NULL, -- our site that follows + actor_uri TEXT NOT NULL, -- the followed account's actor id + handle TEXT, name TEXT, icon TEXT, url TEXT, + inbox TEXT, -- their inbox (for Create delivery / Undo) + follow_id TEXT, -- the Follow activity id we sent (Accept matching) + status TEXT DEFAULT 'pending', -- pending | accepted + created_at DATETIME DEFAULT CURRENT_TIMESTAMP, + UNIQUE(slug, actor_uri) + ); + CREATE TABLE IF NOT EXISTS ap_timeline ( + id TEXT NOT NULL, -- the remote note's AP id + slug TEXT NOT NULL, -- whose home timeline (our site) + author_uri TEXT, author_name TEXT, author_handle TEXT, author_icon TEXT, author_url TEXT, + content TEXT, url TEXT, published TEXT, media_json TEXT, + created_at DATETIME DEFAULT CURRENT_TIMESTAMP, + UNIQUE(slug, id) + ); + CREATE INDEX IF NOT EXISTS idx_ap_timeline_slug ON ap_timeline(slug, published); + `); } Index: src/routes/posts.js =================================================================== --- src/routes/posts.js (revision 0dba0925244c76ab297b7130179cfd7339182667) +++ src/routes/posts.js (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) @@ -86,5 +86,5 @@ 'tag', 'type', 'user', 'users', 'artiesten', 'leden', 'favorieten', 'feed.xml', 'atom.xml', 'sitemap.xml', 'manifest.webmanifest', 'sw.js', 'favicon.ico', 'favicon.svg', 'assets', - 'authorize_interaction', 'fediverse', + 'authorize_interaction', 'fediverse', 'tijdlijn', ]); @@ -561,4 +561,37 @@ } res.redirect(req.get('Referer') || `${res.locals.siteUrlBase || ''}/fediverse`); +}); + +// ==================== FEDIVERSE CLIENT: home timeline + following ==================== +router.get('/tijdlijn', requireSiteManager, (req, res) => { + const site = res.locals.site; + const following = site ? ActivityPubService.listFollowing(site.slug) : []; + const timeline = site ? ActivityPubService.getTimeline(site.slug, 60) : []; + renderPage(req, res, 'pages/timeline', { + pageTitle: 'Tijdlijn', bodyClass: 'on-special', + following, timeline, + success: req.query.success || null, error: req.query.error || null, + }); +}); + +router.post('/tijdlijn/follow', requireSiteManager, async (req, res) => { + const site = res.locals.site; + const handle = (req.body.handle || '').toString(); + let q = 'success=' + encodeURIComponent('Volgverzoek verstuurd'); + if (site && handle.trim()) { + try { + const r = await ActivityPubService.followActor(site, handle); + if (r && r.error) q = 'error=' + encodeURIComponent(r.error === 'not_found' ? 'Account niet gevonden' : (r.error === 'unreachable' ? 'Server onbereikbaar' : 'Volgen mislukt')); + else q = 'success=' + encodeURIComponent('Je volgt nu ' + ((r && r.name) || handle)); + } catch (e) { q = 'error=' + encodeURIComponent('Volgen mislukt'); } + } + res.redirect('/tijdlijn?' + q); +}); + +router.post('/tijdlijn/unfollow', requireSiteManager, async (req, res) => { + const site = res.locals.site; + const actorUri = (req.body.actor_uri || '').toString(); + if (site && actorUri) { try { await ActivityPubService.unfollowActor(site, actorUri); } catch (e) { /* ignore */ } } + res.redirect('/tijdlijn?success=' + encodeURIComponent('Ontvolgd')); }); Index: src/services/ActivityPubService.js =================================================================== --- src/services/ActivityPubService.js (revision 0dba0925244c76ab297b7130179cfd7339182667) +++ src/services/ActivityPubService.js (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) @@ -406,4 +406,16 @@ 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); console.log('[AP] reply', actorUri, '→', tgt.post_id); + return 202; + } + // Home timeline (client): a top-level post from an account we follow. + if (actorUri && !isLocalActor && !o.inReplyTo && o.id) { + let subs = []; try { subs = db.prepare('SELECT slug FROM ap_following WHERE actor_uri = ?').all(actorUri); } catch { /* table may not exist yet */ } + if (subs.length) { + const ai = actorInfo(await resolveActor(actorUri), actorUri); + const html = HtmlSanitizerService.sanitize(o.content || ''); + const media = JSON.stringify((Array.isArray(o.attachment) ? o.attachment : []).filter((a) => a && a.url).map((a) => ({ url: a.url, type: a.mediaType || '' }))); + for (const s of subs) tlStmts().ins.run(o.id, s.slug, actorUri, ai.name, ai.handle, ai.icon, ai.url, html, o.url || null, o.published || null, media); + console.log('[AP] timeline +', actorUri, 'x' + subs.length); + } } return 202; @@ -420,7 +432,19 @@ } if (type === 'Delete') { - // A remote reply was deleted upstream → drop it if we stored it. + // A remote note was deleted upstream → drop it from replies AND the timeline. const oid = typeof act.object === 'string' ? act.object : (act.object && act.object.id); - if (oid) iStmts().delReply.run(oid); + if (oid) { iStmts().delReply.run(oid); try { tlStmts().del.run(oid); } catch { /* ignore */ } } + return 202; + } + // Accept/Reject of a Follow WE sent (client side). + if (type === 'Accept' && act.object) { + const fid = typeof act.object === 'string' ? act.object : (act.object && act.object.id); + if (fid) { try { fwStmts().acc.run(fid); } catch { /* ignore */ } } + console.log('[AP] follow accepted', actorUri); + return 202; + } + if (type === 'Reject' && act.object) { + const who = actorUri; + if (who && slugParam) { try { fwStmts().del.run(slugParam, who); } catch { /* ignore */ } } return 202; } @@ -616,4 +640,78 @@ } +// ── Fediverse CLIENT: follow accounts + home timeline ───────────── +// Resolve an @user@domain handle to its actor URL via WebFinger. +export async function webfingerResolve(handle) { + const h = String(handle || '').trim().replace(/^@/, ''); + const parts = h.split('@'); + if (parts.length !== 2 || !parts[0] || !parts[1]) return null; + const acct = `${parts[0]}@${parts[1]}`; + try { + const r = await fetch(`https://${parts[1]}/.well-known/webfinger?resource=acct:${encodeURIComponent(acct)}`, + { headers: { Accept: 'application/jrd+json, application/json' }, redirect: 'follow', signal: AbortSignal.timeout(8000) }); + if (!r.ok) return null; + const jrd = await r.json(); + const link = (jrd.links || []).find((l) => l.rel === 'self' && /activity\+json|ld\+json/.test(l.type || '')); + return link ? link.href : null; + } catch { return null; } +} + +let _insFw, _delFw, _listFw, _accFw, _oneFw; +function fwStmts() { + if (!_insFw) { + _insFw = db.prepare('INSERT OR REPLACE INTO ap_following (slug, actor_uri, handle, name, icon, url, inbox, follow_id, status, created_at) VALUES (?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)'); + _delFw = db.prepare('DELETE FROM ap_following WHERE slug = ? AND actor_uri = ?'); + _listFw = db.prepare('SELECT * FROM ap_following WHERE slug = ? ORDER BY created_at DESC'); + _accFw = db.prepare("UPDATE ap_following SET status = 'accepted' WHERE follow_id = ?"); + _oneFw = db.prepare('SELECT * FROM ap_following WHERE slug = ? AND actor_uri = ?'); + } + return { ins: _insFw, del: _delFw, list: _listFw, acc: _accFw, one: _oneFw }; +} +export function listFollowing(slug) { return fwStmts().list.all(slug); } + +let _insTl, _listTl, _delTl; +function tlStmts() { + if (!_insTl) { + _insTl = db.prepare('INSERT OR IGNORE INTO ap_timeline (id, slug, author_uri, author_name, author_handle, author_icon, author_url, content, url, published, media_json, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)'); + _listTl = db.prepare('SELECT * FROM ap_timeline WHERE slug = ? ORDER BY COALESCE(published, created_at) DESC LIMIT ?'); + _delTl = db.prepare('DELETE FROM ap_timeline WHERE id = ?'); + } + return { ins: _insTl, list: _listTl, del: _delTl }; +} +export function getTimeline(slug, limit) { return tlStmts().list.all(slug, limit || 50); } + +// Follow a fediverse account by @handle (WebFinger → actor → signed Follow). +export async function followActor(site, handle) { + const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, ''); + if (!base || !site || !site.slug) return { error: 'config' }; + const actorUrl = await webfingerResolve(handle); + if (!actorUrl) return { error: 'not_found' }; + const actor = await fetchActor(actorUrl).catch(() => null); + if (!actor || !actor.id || !actor.inbox) return { error: 'unreachable' }; + const ai = actorInfo(actor, actor.id); + const me = actorId(base, site.slug); + const keys = getOrCreateKeys(site.slug); + const followId = `${me}#follow-${Date.now()}`; + fwStmts().ins.run(site.slug, actor.id, ai.handle, ai.name, ai.icon, ai.url, actor.inbox, followId, 'pending'); + const follow = { '@context': 'https://www.w3.org/ns/activitystreams', id: followId, type: 'Follow', actor: me, object: actor.id }; + try { await deliver(actor.inbox, follow, `${me}#main-key`, keys.private_pem); } + catch (e) { console.warn('[AP] follow deliver failed:', e.message); } + console.log('[AP] follow', site.slug, '→', actor.id); + return { ok: true, name: ai.name, handle: ai.handle }; +} + +export async function unfollowActor(site, actorUri) { + const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, ''); + const me = actorId(base, site.slug); + const keys = getOrCreateKeys(site.slug); + const row = fwStmts().one.get(site.slug, actorUri); + if (row && row.inbox) { + const undo = { '@context': 'https://www.w3.org/ns/activitystreams', id: `${me}#unfollow-${Date.now()}`, type: 'Undo', actor: me, object: { id: row.follow_id || `${me}#follow`, type: 'Follow', actor: me, object: actorUri } }; + try { await deliver(row.inbox, undo, `${me}#main-key`, keys.private_pem); } catch { /* best-effort */ } + } + fwStmts().del.run(site.slug, actorUri); + return { ok: true }; +} + export default { getOrCreateKeys, apWants, sendAP, actorId, noteId, @@ -622,3 +720,4 @@ getInteractions, getInteractionById, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote, listOutbox, deliverOutboxDelete, + webfingerResolve, followActor, unfollowActor, listFollowing, getTimeline, }; Index: src/services/i18n.js =================================================================== --- src/services/i18n.js (revision 0dba0925244c76ab297b7130179cfd7339182667) +++ src/services/i18n.js (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) @@ -109,5 +109,5 @@ 'fedi.heading': 'Vanuit de fediverse', 'fedi.likes': 'sterren', 'fedi.boosts': 'boosts', 'fedi.replies': 'Reacties uit de fediverse', 'fedi.reply': 'Reageer', 'fedi.reply_ph': 'Je antwoord aan de fediverse…', 'fedi.send': 'Versturen', 'fedi.you': 'Jij', - 'fedi.remote_title': 'Reageer via de fediverse', 'fedi.remote_reply': 'Reageer via de fediverse', 'fedi.remote_prompt': 'Je fediverse-adres (bv. @jij@mastodon.social):', 'fedi.remote_notfound': 'Kon die post niet ophalen. Plak de volledige post-URL:', 'fedi.remote_load': 'Ophalen', 'fedi.remote_replying_to': 'Je reageert op', 'fedi.remote_as': 'Wordt verzonden als {site}.', 'fedi.remote_view_original': 'Bekijk de hele post + reacties op de bron →', 'fedi.remote_reply_short': 'via de fediverse', 'fedi.remote_ph': '@naam@server.social', 'fedi.remote_sent_title': 'Verzonden ✅', 'fedi.remote_sent': 'Je reactie is onderweg naar de fediverse en verschijnt zo bij de ontvanger.', 'fedi.remote_back': '← Terug naar je site', 'fedi.delete_confirm': 'Deze reactie verwijderen?', 'fedi.manage_title': 'Mijn fediverse-reacties', 'fedi.manage_empty': 'Je hebt nog geen reacties verstuurd.', + 'fedi.remote_title': 'Reageer via de fediverse', 'fedi.remote_reply': 'Reageer via de fediverse', 'fedi.remote_prompt': 'Je fediverse-adres (bv. @jij@mastodon.social):', 'fedi.remote_notfound': 'Kon die post niet ophalen. Plak de volledige post-URL:', 'fedi.remote_load': 'Ophalen', 'fedi.remote_replying_to': 'Je reageert op', 'fedi.remote_as': 'Wordt verzonden als {site}.', 'fedi.remote_view_original': 'Bekijk de hele post + reacties op de bron →', 'fedi.remote_reply_short': 'via de fediverse', 'fedi.remote_ph': '@naam@server.social', 'fedi.remote_sent_title': 'Verzonden ✅', 'fedi.remote_sent': 'Je reactie is onderweg naar de fediverse en verschijnt zo bij de ontvanger.', 'fedi.remote_back': '← Terug naar je site', 'fedi.delete_confirm': 'Deze reactie verwijderen?', 'fedi.manage_title': 'Mijn fediverse-reacties', 'fedi.manage_empty': 'Je hebt nog geen reacties verstuurd.', 'tl.title': 'Tijdlijn', 'tl.lead': 'Volg accounts in de fediverse en zie hun berichten hier.', 'tl.follow_btn': 'Volgen', 'tl.following': 'Je volgt', 'tl.unfollow': 'Ontvolgen', 'tl.pending': 'in afwachting', 'tl.feed': 'Berichten', 'tl.empty': 'Nog niks — volg iemand om hun berichten hier te zien.', 'tl.view_original': 'Bekijk origineel →', 'comments.to_start': 'om de conversatie te starten.', 'comments.reply': 'Reageer', 'comments.delete': 'Verwijder', 'comments.cancel': 'Annuleren', @@ -1105,5 +1105,5 @@ 'fedi.heading': 'From the fediverse', 'fedi.likes': 'favourites', 'fedi.boosts': 'boosts', 'fedi.replies': 'Replies from the fediverse', 'fedi.reply': 'Reply', 'fedi.reply_ph': 'Your reply to the fediverse…', 'fedi.send': 'Send', 'fedi.you': 'You', - 'fedi.remote_title': 'Reply via the fediverse', 'fedi.remote_reply': 'Reply via the fediverse', 'fedi.remote_prompt': 'Your fediverse address (e.g. @you@mastodon.social):', 'fedi.remote_notfound': 'Could not fetch that post. Paste the full post URL:', 'fedi.remote_load': 'Fetch', 'fedi.remote_replying_to': 'Replying to', 'fedi.remote_as': 'Sent as {site}.', 'fedi.remote_view_original': 'View the full post + comments on the source →', 'fedi.remote_reply_short': 'via the fediverse', 'fedi.remote_ph': '@name@server.social', 'fedi.remote_sent_title': 'Sent ✅', 'fedi.remote_sent': 'Your reply is on its way to the fediverse and will appear for the recipient shortly.', 'fedi.remote_back': '← Back to your site', 'fedi.delete_confirm': 'Delete this reply?', 'fedi.manage_title': 'My fediverse replies', 'fedi.manage_empty': 'You have not sent any replies yet.', + 'fedi.remote_title': 'Reply via the fediverse', 'fedi.remote_reply': 'Reply via the fediverse', 'fedi.remote_prompt': 'Your fediverse address (e.g. @you@mastodon.social):', 'fedi.remote_notfound': 'Could not fetch that post. Paste the full post URL:', 'fedi.remote_load': 'Fetch', 'fedi.remote_replying_to': 'Replying to', 'fedi.remote_as': 'Sent as {site}.', 'fedi.remote_view_original': 'View the full post + comments on the source →', 'fedi.remote_reply_short': 'via the fediverse', 'fedi.remote_ph': '@name@server.social', 'fedi.remote_sent_title': 'Sent ✅', 'fedi.remote_sent': 'Your reply is on its way to the fediverse and will appear for the recipient shortly.', 'fedi.remote_back': '← Back to your site', 'fedi.delete_confirm': 'Delete this reply?', 'fedi.manage_title': 'My fediverse replies', 'fedi.manage_empty': 'You have not sent any replies yet.', 'tl.title': 'Timeline', 'tl.lead': 'Follow accounts on the fediverse and see their posts here.', 'tl.follow_btn': 'Follow', 'tl.following': 'Following', 'tl.unfollow': 'Unfollow', 'tl.pending': 'pending', 'tl.feed': 'Posts', 'tl.empty': 'Nothing yet — follow someone to see their posts here.', 'tl.view_original': 'View original →', 'comments.to_start': 'to start the conversation.', 'comments.reply': 'Reply', 'comments.delete': 'Delete', 'comments.cancel': 'Cancel', @@ -2099,5 +2099,5 @@ 'fedi.heading': 'Aus dem Fediverse', 'fedi.likes': 'Favoriten', 'fedi.boosts': 'Boosts', 'fedi.replies': 'Antworten aus dem Fediverse', 'fedi.reply': 'Antworten', 'fedi.reply_ph': 'Deine Antwort an das Fediverse…', 'fedi.send': 'Senden', 'fedi.you': 'Du', - 'fedi.remote_title': 'Über das Fediverse antworten', 'fedi.remote_reply': 'Über das Fediverse antworten', 'fedi.remote_prompt': 'Deine Fediverse-Adresse (z.B. @du@mastodon.social):', 'fedi.remote_notfound': 'Beitrag konnte nicht geladen werden. Füge die vollständige Beitrags-URL ein:', 'fedi.remote_load': 'Laden', 'fedi.remote_replying_to': 'Antwort an', 'fedi.remote_as': 'Wird als {site} gesendet.', 'fedi.remote_view_original': 'Ganzen Beitrag + Kommentare an der Quelle ansehen →', 'fedi.remote_reply_short': 'übers Fediverse', 'fedi.remote_ph': '@name@server.social', 'fedi.remote_sent_title': 'Gesendet ✅', 'fedi.remote_sent': 'Deine Antwort ist auf dem Weg ins Fediverse und erscheint gleich beim Empfänger.', 'fedi.remote_back': '← Zurück zu deiner Seite', 'fedi.delete_confirm': 'Diese Antwort löschen?', 'fedi.manage_title': 'Meine Fediverse-Antworten', 'fedi.manage_empty': 'Du hast noch keine Antworten gesendet.', + 'fedi.remote_title': 'Über das Fediverse antworten', 'fedi.remote_reply': 'Über das Fediverse antworten', 'fedi.remote_prompt': 'Deine Fediverse-Adresse (z.B. @du@mastodon.social):', 'fedi.remote_notfound': 'Beitrag konnte nicht geladen werden. Füge die vollständige Beitrags-URL ein:', 'fedi.remote_load': 'Laden', 'fedi.remote_replying_to': 'Antwort an', 'fedi.remote_as': 'Wird als {site} gesendet.', 'fedi.remote_view_original': 'Ganzen Beitrag + Kommentare an der Quelle ansehen →', 'fedi.remote_reply_short': 'übers Fediverse', 'fedi.remote_ph': '@name@server.social', 'fedi.remote_sent_title': 'Gesendet ✅', 'fedi.remote_sent': 'Deine Antwort ist auf dem Weg ins Fediverse und erscheint gleich beim Empfänger.', 'fedi.remote_back': '← Zurück zu deiner Seite', 'fedi.delete_confirm': 'Diese Antwort löschen?', 'fedi.manage_title': 'Meine Fediverse-Antworten', 'fedi.manage_empty': 'Du hast noch keine Antworten gesendet.', 'tl.title': 'Timeline', 'tl.lead': 'Folge Konten im Fediverse und sieh ihre Beiträge hier.', 'tl.follow_btn': 'Folgen', 'tl.following': 'Du folgst', 'tl.unfollow': 'Entfolgen', 'tl.pending': 'ausstehend', 'tl.feed': 'Beiträge', 'tl.empty': 'Noch nichts — folge jemandem, um Beiträge hier zu sehen.', 'tl.view_original': 'Original ansehen →', 'comments.to_start': 'um das Gespräch zu starten.', 'comments.reply': 'Antworten', 'comments.delete': 'Löschen', 'comments.cancel': 'Abbrechen', Index: src/views/pages/admin.ejs =================================================================== --- src/views/pages/admin.ejs (revision 0dba0925244c76ab297b7130179cfd7339182667) +++ src/views/pages/admin.ejs (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) @@ -57,4 +57,5 @@ <%= t('admin.b_agenda') %> <% } %> + 🌐 <%= t('tl.title') %> <%= t('admin.b_updates') %> <%= t('admin.b_help') %> Index: src/views/pages/timeline.ejs =================================================================== --- src/views/pages/timeline.ejs (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) +++ src/views/pages/timeline.ejs (revision 914eb9fede1ff8c7deceec392018ef477d88dc47) @@ -0,0 +1,84 @@ +
+

<%= t('tl.title') %>

+

<%= t('tl.lead') %>

+ <% if (typeof success !== 'undefined' && success) { %>
<%= success %>
<% } %> + <% if (typeof error !== 'undefined' && error) { %>
<%= error %>
<% } %> + +
+ + +
+ + <% if (following && following.length) { %> +

<%= t('tl.following') %> (<%= following.length %>)

+ + <% } %> + +

<%= t('tl.feed') %>

+ <% if (!timeline || !timeline.length) { %> +

<%= t('tl.empty') %>

+ <% } else { %> +
    + <% timeline.forEach(function(p){ %> +
  1. + <% if (p.author_icon) { %><% } else { %><%= (p.author_name || '?').charAt(0).toUpperCase() %><% } %> +
    +
    + <%= p.author_name %> + <%= p.author_handle %> + <% if (p.published || p.created_at) { %><%= formatDateTime(p.published || p.created_at) %><% } %> +
    +
    <%- p.content %>
    + <% var media = []; try { media = JSON.parse(p.media_json || '[]'); } catch (e) { media = []; } %> + <% media.filter(function(m){ return !m.type || /^image\//.test(m.type); }).forEach(function(m){ %><% }); %> + <% if (p.url) { %>

    <%= t('tl.view_original') %>

    <% } %> +
    +
    2. + <% }); %> +
+ <% } %> +
+ +