Index: src/config/database.js =================================================================== --- src/config/database.js (revision cc24fa1a1c54af244bb602d55eaf9fe37c7e9565) +++ src/config/database.js (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -328,4 +328,5 @@ content TEXT, -- sanitized HTML (reply) published TEXT, + parent_uri TEXT, -- the note this reply replies to (for nesting) created_at DATETIME DEFAULT CURRENT_TIMESTAMP, UNIQUE(kind, post_id, actor_uri, object_uri) @@ -345,4 +346,5 @@ CREATE INDEX IF NOT EXISTS idx_ap_outbox_post ON ap_outbox(post_id); `); + ensureColumn('ap_interactions', 'parent_uri', 'TEXT'); // nesting (existing DBs) } Index: src/routes/posts.js =================================================================== --- src/routes/posts.js (revision cc24fa1a1c54af244bb602d55eaf9fe37c7e9565) +++ src/routes/posts.js (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -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', + 'authorize_interaction', 'fediverse', ]); @@ -542,4 +542,23 @@ } res.redirect('/authorize_interaction?sent=1&uri=' + encodeURIComponent(uri)); +}); + +// Manage / delete your own outbound fediverse replies (site owner only). +router.get('/fediverse', requireSiteManager, (req, res) => { + const site = res.locals.site; + const items = site ? ActivityPubService.listOutbox(site.slug) : []; + renderPage(req, res, 'pages/authorize-interaction', { + pageTitle: 'Mijn fediverse-reacties', bodyClass: 'on-special', + manage: items, uri: '', target: null, sent: false, siteTitle: site ? site.title : '', + }); +}); + +router.post('/fediverse/:id/delete', requireSiteManager, async (req, res) => { + const site = res.locals.site; + if (site) { + try { await ActivityPubService.deliverOutboxDelete(site, req.params.id); } + catch (e) { console.warn('[AP] outbox delete failed:', e.message); } + } + res.redirect(req.get('Referer') || `${res.locals.siteUrlBase || ''}/fediverse`); }); @@ -783,7 +802,10 @@ db.prepare('SELECT 1 FROM post_likes WHERE post_id = ? AND user_id = ?').get(post.id, req.session.user.id)); - // Inbound fediverse activity (replies/likes/boosts) for this post. - let fediverse = { replies: [], outReplies: [], likeCount: 0, announceCount: 0, total: 0 }; - try { fediverse = ActivityPubService.getInteractions(post.id); } catch { /* non-fatal */ } + // Inbound fediverse activity (threaded) for this post. + let fediverse = { thread: [], likeCount: 0, announceCount: 0, total: 0 }; + try { + const _apBase = (process.env.PUBLIC_BASE_URL || `${req.protocol}://${req.get('host')}`).replace(/\/+$/, ''); + fediverse = ActivityPubService.getInteractions(post.id, _apBase); + } catch { /* non-fatal */ } // Owner/admin of this site may reply back to a fediverse interaction. const canManageSite = !!(req.session?.user && PermissionsService.canAdminSite(req.session.user, site)); Index: src/services/ActivityPubService.js =================================================================== --- src/services/ActivityPubService.js (revision cc24fa1a1c54af244bb602d55eaf9fe37c7e9565) +++ src/services/ActivityPubService.js (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -198,8 +198,8 @@ function iStmts() { if (!_insI) { - _insI = db.prepare('INSERT OR IGNORE INTO ap_interactions (kind, post_id, object_uri, actor_uri, actor_name, actor_handle, actor_url, actor_icon, content, published, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)'); + _insI = db.prepare('INSERT OR IGNORE INTO ap_interactions (kind, post_id, object_uri, actor_uri, actor_name, actor_handle, actor_url, actor_icon, content, published, parent_uri, created_at) VALUES (?,?,?,?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)'); _delLA = db.prepare('DELETE FROM ap_interactions WHERE kind = ? AND post_id = ? AND actor_uri = ?'); _delReply = db.prepare("DELETE FROM ap_interactions WHERE kind = 'reply' AND object_uri = ?"); - _listI = db.prepare('SELECT id, kind, object_uri, actor_uri, actor_name, actor_handle, actor_url, actor_icon, content, published, created_at FROM ap_interactions WHERE post_id = ? ORDER BY created_at ASC'); + _listI = db.prepare('SELECT id, kind, object_uri, parent_uri, actor_uri, actor_name, actor_handle, actor_url, actor_icon, content, published, created_at FROM ap_interactions WHERE post_id = ? ORDER BY created_at ASC'); _getI = db.prepare('SELECT * FROM ap_interactions WHERE id = ?'); _insO = db.prepare('INSERT INTO ap_outbox (id, site_slug, post_id, post_slug, in_reply_to, to_actor, to_handle, content, created_at) VALUES (?,?,?,?,?,?,?,?,CURRENT_TIMESTAMP)'); @@ -235,18 +235,59 @@ } -// Stored, view-ready summary of a post's inbound fediverse activity + our replies. -export function getInteractions(postId) { +// Given an inReplyTo note URL, find which local post the thread belongs to + the +// note being replied to (parent), so a reply-to-a-comment can be nested. +function findThreadTarget(inReplyTo, base) { + if (!inReplyTo) return null; + const seg = postIdFromNoteUrl(inReplyTo, base); // our /ap/notes/ segment (if ours) + if (seg && localPostExists(seg)) return { post_id: seg, parent_uri: inReplyTo }; + if (seg) { + try { const o = db.prepare('SELECT post_id FROM ap_outbox WHERE id = ?').get(seg); if (o && o.post_id) return { post_id: o.post_id, parent_uri: inReplyTo }; } catch { /* ignore */ } + } + try { const row = db.prepare("SELECT post_id FROM ap_interactions WHERE object_uri = ? AND kind = 'reply' LIMIT 1").get(inReplyTo); if (row && row.post_id) return { post_id: row.post_id, parent_uri: inReplyTo }; } catch { /* ignore */ } + return null; +} + +// View-ready threaded view of a post's fediverse activity (inbound replies + +// our outbound replies, nested), plus like/boost counts. +export function getInteractions(postId, base) { const s = iStmts(); const rows = s.list.all(postId); - const outReplies = s.listO.all(postId).map((o) => ({ - id: o.id, content: o.content, in_reply_to: o.in_reply_to, to_handle: o.to_handle, - created_at: o.created_at, mine: true, - })); + const baseClean = (base || process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, ''); + const postNoteId = baseClean ? `${baseClean}/ap/notes/${postId}` : null; + + const nodes = []; + for (const r of rows) { + if (r.kind !== 'reply') continue; + nodes.push({ + noteId: r.object_uri, parent: r.parent_uri || null, mine: false, + actor_name: r.actor_name, actor_handle: r.actor_handle, actor_url: r.actor_url, + actor_icon: r.actor_icon, content: r.content, created_at: r.published || r.created_at, + children: [], + }); + } + for (const o of s.listO.all(postId)) { + nodes.push({ + noteId: baseClean ? `${baseClean}/ap/notes/${o.id}` : o.id, parent: o.in_reply_to || null, + mine: true, outboxId: o.id, content: o.content, created_at: o.created_at, children: [], + }); + } + + const byId = new Map(nodes.map((n) => [n.noteId, n])); + const isTop = (n) => !n.parent || n.parent === postNoteId || !byId.has(n.parent); + const tops = []; + for (const n of nodes) { + if (isTop(n)) { tops.push(n); continue; } + let anc = n, guard = 0; + while (!isTop(anc) && guard++ < 12) anc = byId.get(anc.parent); + anc.children.push(n); + } + const byTime = (a, b) => new Date(a.created_at) - new Date(b.created_at); + tops.sort(byTime).forEach((t) => t.children.sort(byTime)); + return { - replies: rows.filter((r) => r.kind === 'reply'), - outReplies, + thread: tops, likeCount: rows.filter((r) => r.kind === 'like').length, announceCount: rows.filter((r) => r.kind === 'announce').length, - total: rows.length + outReplies.length, + total: nodes.length, }; } @@ -346,13 +387,13 @@ const resolveActor = async (uri) => ((verified && verified.id === uri) ? verified : await fetchActor(uri).catch(() => null)); - // Inbound reply: a Create whose object replies to one of our notes. + // Inbound reply: a Create whose object replies to one of our notes (post OR comment). if (type === 'Create' && act.object && (act.object.type === 'Note' || act.object.type === 'Article')) { const o = act.object; - const pid = postIdFromNoteUrl(o.inReplyTo, base); - if (pid && actorUri && localPostExists(pid)) { + const tgt = findThreadTarget(o.inReplyTo, base); + if (tgt && actorUri) { const ai = actorInfo(await resolveActor(actorUri), actorUri); const html = HtmlSanitizerService.sanitize(o.content || ''); - iStmts().ins.run('reply', pid, o.id || '', actorUri, ai.name, ai.handle, ai.url, ai.icon, html, o.published || null); - console.log('[AP] reply', actorUri, '→', pid); + 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; @@ -363,5 +404,5 @@ if (pid && actorUri && 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); + iStmts().ins.run(type.toLowerCase(), pid, '', actorUri, ai.name, ai.handle, ai.url, ai.icon, null, null, null); console.log('[AP]', type === 'Like' ? 'like' : 'boost', actorUri, '→', pid); } @@ -475,4 +516,5 @@ if (a) inboxes.add((a.endpoints && a.endpoints.sharedInbox) || a.inbox); } + 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); let delivered = 0; @@ -495,4 +537,16 @@ const actor = await fetchActor(actorUri).catch(() => null); const ai = actorInfo(actor, actorUri); + // If this note is itself a reply (a comment), also reach the original post's + // author so THEIR server threads our reply under the comment. + let threadInbox = null; + if (note.inReplyTo) { + const parentUrl = typeof note.inReplyTo === 'string' ? note.inReplyTo : (note.inReplyTo && note.inReplyTo.id); + const parentNote = parentUrl ? await fetchActor(parentUrl).catch(() => null) : null; + const pAtt = parentNote && (typeof parentNote.attributedTo === 'string' ? parentNote.attributedTo : (parentNote.attributedTo && parentNote.attributedTo.id)); + if (pAtt && pAtt !== actorUri) { + const pa = await fetchActor(pAtt).catch(() => null); + threadInbox = pa && ((pa.endpoints && pa.endpoints.sharedInbox) || pa.inbox); + } + } const rawHtml = String(note.content || '').replace(/\[\[(track|album|playlist):[^\]]+\]\]/gi, ''); const images = (Array.isArray(note.attachment) ? note.attachment : []) @@ -509,6 +563,31 @@ content: HtmlSanitizerService.sanitize(rawHtml), // full, sanitized images, + threadInbox, // post author's inbox (if a comment) preview: HtmlSanitizerService.toPlainText(note.content || '').slice(0, 240), }; +} + +// List a site's own outbound fediverse replies (for the manage/delete view). +export function listOutbox(siteSlug) { + return db.prepare('SELECT id, content, to_handle, in_reply_to, created_at FROM ap_outbox WHERE site_slug = ? ORDER BY created_at DESC').all(siteSlug); +} + +// Delete one of our outbound replies: send Delete(Tombstone) to recipients + remove it. +export async function deliverOutboxDelete(site, outboxId) { + const row = iStmts().getO.get(outboxId); + if (!row || row.site_slug !== site.slug) return false; + const base = (process.env.PUBLIC_BASE_URL || '').replace(/\/+$/, ''); + if (base) { + const me = actorId(base, site.slug); + const nid = noteId(base, row.id); + const del = { '@context': 'https://www.w3.org/ns/activitystreams', id: `${nid}#delete-${Date.now()}`, type: 'Delete', actor: me, to: [PUBLIC], object: { id: nid, type: 'Tombstone' } }; + const keys = getOrCreateKeys(site.slug); + const inboxes = new Set(); + if (row.to_actor) { const a = await fetchActor(row.to_actor).catch(() => null); if (a) inboxes.add((a.endpoints && a.endpoints.sharedInbox) || a.inbox); } + for (const f of fStmts().list.all(site.slug)) inboxes.add(f.shared_inbox || f.inbox); + for (const inbox of [...inboxes].filter(Boolean)) { try { await deliver(inbox, del, `${me}#main-key`, keys.private_pem); } catch { /* best-effort */ } } + } + db.prepare('DELETE FROM ap_outbox WHERE id = ?').run(outboxId); + return true; } @@ -518,3 +597,4 @@ followerCount, deliver, fetchActor, verifyRequest, handleInbox, deliverCreate, deliverDelete, getInteractions, getInteractionById, buildReplyNote, getOutboxNote, deliverReply, resolveRemoteNote, + listOutbox, deliverOutboxDelete, }; Index: src/services/i18n.js =================================================================== --- src/services/i18n.js (revision cc24fa1a1c54af244bb602d55eaf9fe37c7e9565) +++ src/services/i18n.js (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -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_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.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_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.', 'comments.to_start': 'om de conversatie te starten.', 'comments.reply': 'Reageer', 'comments.delete': 'Verwijder', 'comments.cancel': 'Annuleren', @@ -1104,5 +1104,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_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.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_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.', 'comments.to_start': 'to start the conversation.', 'comments.reply': 'Reply', 'comments.delete': 'Delete', 'comments.cancel': 'Cancel', @@ -2097,5 +2097,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_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.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_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.', 'comments.to_start': 'um das Gespräch zu starten.', 'comments.reply': 'Antworten', 'comments.delete': 'Löschen', 'comments.cancel': 'Abbrechen', Index: src/views/pages/authorize-interaction.ejs =================================================================== --- src/views/pages/authorize-interaction.ejs (revision cc24fa1a1c54af244bb602d55eaf9fe37c7e9565) +++ src/views/pages/authorize-interaction.ejs (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -1,4 +1,22 @@
- <% if (typeof sent !== 'undefined' && sent) { %> + <% if (typeof manage !== 'undefined' && manage) { %> +

<%= t('fedi.manage_title') %>

+ <% if (!manage.length) { %>

<%= t('fedi.manage_empty') %>

<% } %> +
    + <% manage.forEach(function(m){ %> +
  1. +
    +
    <%- m.content %>
    +
    + <% if (m.to_handle) { %>→ <%= m.to_handle %><% } %> +
    + +
    +
    +
    +
    2. + <% }); %> +
+ <% } else if (typeof sent !== 'undefined' && sent) { %>

<%= t('fedi.remote_sent_title') %>

<%= t('fedi.remote_sent') %>

Index: src/views/pages/post.ejs =================================================================== --- src/views/pages/post.ejs (revision cc24fa1a1c54af244bb602d55eaf9fe37c7e9565) +++ src/views/pages/post.ejs (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -72,6 +72,5 @@ <% } %> - - + <% if (typeof fediverse !== 'undefined' && fediverse && fediverse.total > 0) { %>
@@ -80,61 +79,10 @@ ⭐ <%= fediverse.likeCount %> 🔁 <%= fediverse.announceCount %> - 💬 <%= fediverse.replies.length %> + 💬 <%= (fediverse.thread || []).length %>

- <% if (fediverse.replies.length) { %> + <% if (fediverse.thread && fediverse.thread.length) { %>
    - <% fediverse.replies.forEach(function(r) { %> -
  1. -
    - <% if (r.actor_icon) { %> - <% } else { %><%= (r.actor_name || '?').charAt(0).toUpperCase() %><% } %> -
    -
    -
    - <%= r.actor_name %> - <%= r.actor_handle %> - <% if (r.published || r.created_at) { %><%= formatDateTime(r.published || r.created_at) %><% } %> -
    -
    <%- r.content %>
    - - <% if (typeof canManageSite !== 'undefined' && canManageSite) { %> -
    - <%= t('fedi.reply') %> -
    - - -
    - -
    -
    -
    - <% } else if (r.object_uri) { %> -
    - -
    - <% } %> - - <% var mine = (typeof fediverse.outReplies !== 'undefined' ? fediverse.outReplies : []).filter(function(o){ return o.in_reply_to && o.in_reply_to === r.object_uri; }); %> - <% if (mine.length) { %> -
      - <% mine.forEach(function(o){ %> -
    1. -
      - <% if (typeof siteAvatar !== 'undefined' && siteAvatar) { %> - <% } else { %><%= t('fedi.you').charAt(0).toUpperCase() %><% } %> -
      -
      -
      <%= t('fedi.you') %>
      -
      <%- o.content %>
      -
      -
      2. - <% }); %> -
    - <% } %> -
    -
    2. + <% fediverse.thread.forEach(function(n){ %> +
  2. <%- include('../partials/fedi-node', { n: n }) %>
    3. <% }); %>
Index: src/views/partials/fedi-node.ejs =================================================================== --- src/views/partials/fedi-node.ejs (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) +++ src/views/partials/fedi-node.ejs (revision 7d932ce99c5c723eafe823cbe34b8bf8d5bf884a) @@ -0,0 +1,39 @@ +<%# Renders one fediverse thread node (n). Expects: n, t, canManageSite, _base, siteAvatar, formatDateTime %> +
+ <% if (n.mine) { %> + <% if (typeof siteAvatar !== 'undefined' && siteAvatar) { %> + <% } else { %><%= t('fedi.you').charAt(0).toUpperCase() %><% } %> + <% } else if (n.actor_icon) { %> + <% } else { %><%= (n.actor_name || '?').charAt(0).toUpperCase() %><% } %> +
+
+
+ <% if (n.mine) { %> + <%= t('fedi.you') %> + <% } else { %> + <%= n.actor_name %> + <%= n.actor_handle %> + <% } %> + <% if (n.created_at) { %><%= formatDateTime(n.created_at) %><% } %> +
+
<%- n.content %>
+
+ <% if (n.mine && typeof canManageSite !== 'undefined' && canManageSite && n.outboxId) { %> +
+ +
+ <% } else if (!n.mine && n.noteId) { %> + + <% } %> +
+ <% if (n.children && n.children.length) { %> +
    + <% n.children.forEach(function(c){ %> +
  1. <%- include('../partials/fedi-node', { n: c }) %>
    2. + <% }); %> +
+ <% } %> +