@geekity/cms 0.18.0 → 0.19.0

package/dist/webmention/reply-contexts.d.ts

@@ -3,9 +3,9 @@ import type { DocumentChange } from '../content/sync.ts';
 import type { HostLookup } from './public-address.ts';
 import type { ReplyContext } from './reply-context.ts';
 /**
- * Where the fetched reply contexts are kept, relative to the content directory:
- * one JSON object keyed by the URL replied to (decision-19). Eleventy reads it
- * as the `replyContexts` global.
+ * Where the fetched contexts are kept, relative to the content directory: one
+ * JSON object keyed by the URL a post replies to, likes, reposts or bookmarks
+ * (decision-19). Eleventy reads it as the `replyContexts` global.
  */
 export declare const REPLY_CONTEXTS_FILE = "_data/replyContexts.json";
 /** Where the service reports a target it could not read. */
@@ -14,7 +14,7 @@ export interface ReplyContextLogger {
 }
 /** What {@link createReplyContextService} needs. */
 export interface CreateReplyContextServiceOptions {
-    /** The index, asked which targets are still replied to. */
+    /** The index, asked which targets are still cited. */
     readonly store: ContentStore;
     /** Where the file lives. */
     readonly contentDir: string;
@@ -23,21 +23,24 @@ export interface CreateReplyContextServiceOptions {
     /** Defaults to `console`. */
     readonly logger?: ReplyContextLogger | undefined;
 }
-/** Keeps the stored reply contexts in step with the posts that reply. */
+/**
+ * Keeps the stored contexts in step with the posts that cite: a reply's
+ * `in-reply-to`, and a like's, repost's or bookmark's target (TASK-244).
+ */
 export interface ReplyContextService {
     /**
-     * Consider one index change. A reply whose target is new, or has nothing
-     * stored, has its target fetched; a target no post replies to any more is
-     * forgotten. Returns at once: the work is queued, so a save never waits on
-     * a stranger's server.
+     * Consider one index change. A target that is new to the post, or has
+     * nothing stored, is fetched; a target no post cites any more is forgotten.
+     * Returns at once: the work is queued, so a save never waits on a
+     * stranger's server.
      */
     handle(change: DocumentChange): void;
     /**
-     * Fetch every target a live post replies to that the file holds nothing
-     * for. Run when the site starts serving, because a scan of an index that is
-     * already up to date reports no change: a site upgraded to reply contexts,
-     * or one whose file was removed, would otherwise wait for each reply to be
-     * edited. Queued like {@link ReplyContextService.handle}.
+     * Fetch every target a live post cites that the file holds nothing for. Run
+     * when the site starts serving, because a scan of an index that is already
+     * up to date reports no change: a site upgraded to reply contexts, or one
+     * whose file was removed, would otherwise wait for each reply to be edited.
+     * Queued like {@link ReplyContextService.handle}.
      */
     catchUp(): void;
     /** The stored context for a target, from the file. Never touches the network. */

package/dist/webmention/reply-contexts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reply-contexts.d.ts","sourceRoot":"","sources":["../../src/webmention/reply-contexts.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAE9D,4DAA4D;AAC5D,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,oDAAoD;AACpD,MAAM,WAAW,gCAAgC;IAC/C,2DAA2D;IAC3D,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,4BAA4B;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,8DAA8D;IAC9D,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CAClD;AAED,yEAAyE;AACzE,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IACrC;;;;;;OAMG;IACH,OAAO,IAAI,IAAI,CAAC;IAChB,iFAAiF;IACjF,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IAC/C,wEAAwE;IACxE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,oDAAoD;AACpD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gCAAgC,GACxC,mBAAmB,CA8FrB"}
+{"version":3,"file":"reply-contexts.d.ts","sourceRoot":"","sources":["../../src/webmention/reply-contexts.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,6BAA6B,CAAC;AAE9D,4DAA4D;AAC5D,MAAM,WAAW,kBAAkB;IACjC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,oDAAoD;AACpD,MAAM,WAAW,gCAAgC;IAC/C,sDAAsD;IACtD,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,4BAA4B;IAC5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,8DAA8D;IAC9D,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC;IAC5B,6BAA6B;IAC7B,QAAQ,CAAC,MAAM,CAAC,EAAE,kBAAkB,GAAG,SAAS,CAAC;CAClD;AAED;;;GAGG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;;;OAKG;IACH,MAAM,CAAC,MAAM,EAAE,cAAc,GAAG,IAAI,CAAC;IACrC;;;;;;OAMG;IACH,OAAO,IAAI,IAAI,CAAC;IAChB,iFAAiF;IACjF,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAAC;IAC/C,wEAAwE;IACxE,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1B;AAED,oDAAoD;AACpD,wBAAgB,yBAAyB,CACvC,OAAO,EAAE,gCAAgC,GACxC,mBAAmB,CAiGrB"}

package/dist/webmention/reply-contexts.js

@@ -1,12 +1,13 @@
 import { readFileSync } from 'node:fs';
 import path from 'node:path';
+import { citationsOf } from '../content/citation.js';
 import { replyTarget } from '../content/post-type.js';
 import { updateFileAtomically } from '../files/atomic.js';
 import { fetchReplyContext } from './reply-context.js';
 /**
- * Where the fetched reply contexts are kept, relative to the content directory:
- * one JSON object keyed by the URL replied to (decision-19). Eleventy reads it
- * as the `replyContexts` global.
+ * Where the fetched contexts are kept, relative to the content directory: one
+ * JSON object keyed by the URL a post replies to, likes, reposts or bookmarks
+ * (decision-19). Eleventy reads it as the `replyContexts` global.
  */
 export const REPLY_CONTEXTS_FILE = '_data/replyContexts.json';
 /** Build the reply context service for one site. */
@@ -47,17 +48,17 @@ export function createReplyContextService(options) {
     async function refresh(target) {
         const fetched = await fetchReplyContext(target, { lookup });
         if (!fetched.ok) {
-            logger.warn(`Could not read ${target} for a reply's context: ${fetched.reason}`);
+            logger.warn(`Could not read ${target} for a citation's context: ${fetched.reason}`);
             return;
         }
         await write(target, fetched.context);
     }
-    /** Forget a target, unless a post still replies to it. */
+    /** Forget a target, unless a post still cites it. */
     async function forget(target) {
         if (!(target in readAll()))
             return;
-        const stillAnswered = store.listAll().some((document) => replyTarget(document) === target);
-        if (!stillAnswered)
+        const stillCited = store.listAll().some((document) => targetsOf(document).includes(target));
+        if (!stillCited)
             await write(target, undefined);
     }
     let chain = Promise.resolve();
@@ -68,27 +69,30 @@ export function createReplyContextService(options) {
     }
     return {
         handle(change) {
-            const before = targetOf(change.previous);
-            const after = targetOf(change.next);
+            const before = targetsOf(change.previous);
+            const after = targetsOf(change.next);
+            const held = readAll();
             // A scan rebuilds the index from files the contexts file sits beside, so
             // it only fetches what that file has never held; an edit fetches a
             // target that changed as well.
-            if (after !== undefined) {
-                const stored = after in readAll();
-                const changed = after !== before && change.origin !== 'scan';
-                if (!stored || changed)
-                    enqueue(() => refresh(after));
+            for (const target of after) {
+                const changed = !before.includes(target) && change.origin !== 'scan';
+                if (!(target in held) || changed)
+                    enqueue(() => refresh(target));
+            }
+            for (const target of before) {
+                if (!after.includes(target))
+                    enqueue(() => forget(target));
             }
-            if (before !== undefined && before !== after)
-                enqueue(() => forget(before));
         },
         catchUp() {
             const held = readAll();
             const missing = new Set();
             for (const document of store.listAll()) {
-                const target = replyTarget(document);
-                if (target !== undefined && !(target in held))
-                    missing.add(target);
+                for (const target of targetsOf(document)) {
+                    if (!(target in held))
+                        missing.add(target);
+                }
             }
             for (const target of missing)
                 enqueue(() => refresh(target));
@@ -101,8 +105,15 @@ export function createReplyContextService(options) {
         },
     };
 }
-function targetOf(document) {
-    return document === undefined ? undefined : replyTarget(document);
+function targetsOf(document) {
+    if (document === undefined)
+        return [];
+    const answered = replyTarget(document);
+    const targets = [
+        ...(answered === undefined ? [] : [answered]),
+        ...citationsOf(document.extra).map((citation) => citation.url),
+    ];
+    return [...new Set(targets)];
 }
 /**
  * The file's entries, each checked, since a person may have edited it by hand.

package/dist/webmention/reply-contexts.js.map

@@ -1 +1 @@
-{"version":3,"file":"reply-contexts.js","sourceRoot":"","sources":["../../src/webmention/reply-contexts.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"reply-contexts.js","sourceRoot":"","sources":["../../src/webmention/reply-contexts.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geekity/cms",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "type": "module",
   "description": "A file-first CMS: Markdown content, a SQLite index, a Hono server that is both the editor and the public site.",
   "license": "MIT",
@@ -28,25 +28,25 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@fedify/fedify": "^2.3.8",
-    "@fedify/hono": "^2.3.8",
-    "@fedify/vocab": "^2.3.8",
-    "@hono/node-server": "^2.1.1",
+    "@fedify/fedify": "^2.4.0",
+    "@fedify/hono": "^2.4.0",
+    "@fedify/vocab": "^2.4.0",
+    "@hono/node-server": "^2.1.3",
     "@js-temporal/polyfill": "^0.5.1",
     "chokidar": "^5.0.0",
     "gray-matter": "^4.0.3",
-    "hono": "^4.13.9",
+    "hono": "^4.13.12",
     "js-yaml": "^5.4.2",
     "markdown-it": "^15.0.2",
     "markdown-it-footnote": "^4.0.0",
-    "nodemailer": "^10.0.11",
+    "nodemailer": "^10.0.13",
     "nunjucks": "^3.2.4",
-    "sharp": "^0.35.4"
+    "sharp": "^0.35.5"
   },
   "devDependencies": {
     "@11ty/eleventy": "^3.1.6",
     "@codemirror/lang-markdown": "^6.5.2",
-    "@fedify/cli": "2.3.8",
+    "@fedify/cli": "2.4.0",
     "@tailwindcss/cli": "^4.3.3",
     "@types/markdown-it-footnote": "^3.0.4",
     "@types/node": "^26.6.3",

package/themes/default/README.md

@@ -26,6 +26,7 @@ themes/default/
     kicker.njk        the line above an entry naming its kind and date
     reply-context.njk the citation of what a reply answers
     citations.njk     the citation of what a like, repost or bookmark cites
+    cited-page.njk    the name and author both citations print
     read.njk          what a read post read, and how far
     bio.njk           who an entry is by, as an h-card
     menu.njk          one named menu, as a nav of links
@@ -405,16 +406,37 @@ is an `h3` inside the form's section.
 `div.reply-context.cite.u-in-reply-to.h-cite`: a rule on the start side, a
 `p.cite-line` saying "In reply to" and the target's name, author and date as
 far as they are known, and its excerpt as a `blockquote.cite-quote.p-content`.
-An untitled reply prints it under the kicker; a titled reply prints it above
-its header. The same partial cites a reply in a feed.
+Where it goes depends on whether the post shows a title. An untitled reply
+opens on it, under the kicker and before its words. A titled reply prints its
+`header.post-header` first and the citation after it, before the `e-content`,
+so the page opens on its title rather than on a link. A listing follows the
+same rule: an untitled entry cites under its kicker, a titled one after its
+title and summary. The same partial cites a reply in a feed. The layouts own
+the placement; the partial owns only what the citation says, and it stays
+inside the `h-entry` wherever it is printed.
 
 **A like, a repost or a bookmark cites what it cites** (TASK-169) with
 `partials/citations.njk`, beside the reply context and drawn the same way: one
 `div.reply-context.cite.h-cite` per entry of `citations`, classed
 `u-repost-of`, `u-like-of` or `u-bookmark-of`, whose `p.cite-line` says
-Reposted, Liked or Bookmarked and links the target as its `u-url`. Its kicker
-and its hidden `h1` say Repost, Like or Bookmark. A listing cites each entry's
-from the same partial.
+Reposted, Liked or Bookmarked and links the target as its `u-url`. The link
+says the target's name, as the reply context does, with its author after it as
+a `p-author h-card`, when the target was read when the post was saved
+(TASK-244): its `h-entry` name, its oEmbed title, or its `<title>`. With only
+an author it says "a post", and with neither the bare URL. Its kicker
+and its hidden `h1` say Repost, Like or Bookmark. It is placed as the reply
+context is: at the top of an untitled post, after the header of a titled one.
+A listing cites each entry's from the same partial, by the same rule.
+
+**Both citations name the cited page** through `partials/cited-page.njk`, so
+they print its name and author by one rule. A name that already ends in " by "
+and the author's name, in any case, does not print the author again
+(TASK-247): SoundCloud titles a track "Flickermood by Forss" and names Forss
+as its author. The title link stops before " by ", and the words after it
+become the `p-author h-card`, so the line reads "Liked Flickermood by Forss"
+and a parser still reads the whole title as the `p-name`. A name that mentions
+its author anywhere else, such as "Rick Astley - Never Gonna Give You Up" by
+Rick Astley, keeps the author after it.
 
 **A read says what was read** (TASK-229) with `partials/read.njk`, a
 `p.read-line` at the top of the `e-content` that reads like indiebookclub's
@@ -602,7 +624,8 @@ its kicker:
 **Only an article has a headline.** A note, which has no title, is printed
 whole as its `e-content`, and the date in its kicker is its `u-url`. A reply is
 a note that first cites what it answers with `partials/reply-context.njk`, and
-a reply with a title is an article that does. An article's categories are in
+a reply with a title is an article that cites it after its title and summary.
+A like, a repost and a bookmark place `partials/citations.njk` the same way. An article's categories are in
 its kicker; a note's are on its own page.
 
 The excerpt is the entry's `summary`, the very line the feeds publish, so a
@@ -1179,7 +1202,7 @@ A document — one post, one page, or one entry of a listing — adds:
 | `lang`                                      | The `lang` front matter as a canonical tag, such as `fr-CA`. Absent when it names none or no tag.                 |
 | `enclosure`                                 | The post's recording, parsed, with `player` (`audio` or `video`) and `transcript.captions`. Absent with none.     |
 | `photos`                                    | The post's photos, each `{ url, alt, html }`; `html` is the `img.u-photo`, responsive. Empty with none.           |
-| `citations`                                 | What it reposts, likes or bookmarks, each `{ property, url }` with `property` the mf2 name. Empty with none.      |
+| `citations`                                 | What it reposts, likes or bookmarks, each `{ property, url, context }`; `context` as `replyContext`, when known.  |
 | `read`                                      | A read post's `{ status, statusLabel, of, line }`; `of` is `{ name, author, uid, uidLabel, url }`.                |
 | `syndicateTo`                               | On a post's page, the syndication targets it selects, each `{ id, name, url }`. Empty with none.                  |
 | `syndication`                               | Its copies elsewhere, each `{ url, label }`: front matter `syndication`, and on its page the copies targets made. |
@@ -1191,7 +1214,7 @@ A document — one post, one page, or one entry of a listing — adds:
 | `postsPage`                                 | The page carrying the listing, as `{ title, url }`, on the front page only. Absent when the site names none.      |
 | `archiveMonths`                             | Every published post as `{ month, posts }`, newest month first. Only on a page that says `archive: true`.         |
 | `webmention`                                | Where a webmention about this page is sent. Only on a rendered document, and only while the site takes them.      |
-| `noindex`                                   | `true` on the page of an unlisted document, which the base layout prints as a robots `noindex` meta. Else absent. |
+| `noindex`                                   | `true` on an unlisted or unpublished page, which the base layout prints as a robots `noindex` meta. Else absent.  |
 | `conversation`                              | The replies, likes and boosts under the post. Only when there are any. See [The conversation](#the-conversation). |
 | everything else                             | Any front matter key the CMS does not model is on the context under its own name.                                 |
 

package/themes/default/layouts/post.njk

@@ -5,8 +5,9 @@
 
   An article, and a reply with a title, has the only headline: the title as its
   `p-name` and the author's `description` under it as the deck, a
-  `p-summary`. A post with no title opens on its words, set larger. A reply
-  cites what it answers above its words, or above its header when it has one.
+  `p-summary`. A post with no title opens on its words, set larger. What a
+  reply answers, and what a like, repost or bookmark cites, opens a post with
+  no title and follows the header of one with a title, before its words.
   Then the Published line, the tags, a rule and the bio. The neighbouring posts,
   the conversation and the comment form follow the entry.
 
@@ -36,10 +37,6 @@
       hidden from sight. It is no `p-name`: a parser would take that as a
       title and read the note as an article. -#}
   {% if named %}
-  {#- A reply cites the post it answers, whose URL is also the link its
-      webmention points a receiver at. -#}
-  {% include "partials/reply-context.njk" %}
-  {% include "partials/citations.njk" %}
   <header class="post-header">
     {{ kicker.line(postType | capitalize, false, false, categories) }}
     <h1 class="p-name">{{ title }}</h1>
@@ -47,6 +44,8 @@
     <p class="post-deck p-summary">{{ description }}</p>
     {% endif %}
   </header>
+  {% include "partials/reply-context.njk" %}
+  {% include "partials/citations.njk" %}
   {% else %}
   <h1 class="screen-reader-text">
     {{- postType | capitalize if postType in ["reply", "like", "repost", "bookmark", "read"] else "Note" }}

package/themes/default/partials/citations.njk

@@ -6,12 +6,21 @@
   webmention names links to it.
 
   Drawn as the same citation block as `reply-context.njk` (doc-9). An entry
-  includes it with `citations` on the context, a list of `{ property, url }`;
-  a feed sets it from the entry it is printing.
+  includes it with `citations` on the context, a list of `{ property, url,
+  context }`; a feed sets it from the entry it is printing.
+
+  `context` is what the target said about itself when the post was saved or
+  synced (TASK-244), only when it said something: its `name` and `author`,
+  printed through autoescaping like a reply's context. With a name, the name
+  is the link; with only an author, "a post" is; with neither, the bare URL.
 #}
+{% import "partials/cited-page.njk" as cited %}
 {% set citationVerbs = { "repost-of": "Reposted", "like-of": "Liked", "bookmark-of": "Bookmarked" } %}
 {% for citation in citations %}
+{% set citedPage = citation.context %}
 <div class="reply-context cite u-{{ citation.property }} h-cite">
-  <p class="cite-line small">{{ citationVerbs[citation.property] }} <a class="u-url" href="{{ citation.url }}">{{ citation.url }}</a></p>
+  <p class="cite-line small">{{ citationVerbs[citation.property] }}
+    {{- cited.page(citation.url, citedPage) -}}
+  </p>
 </div>
 {% endfor %}

package/themes/default/partials/cited-page.njk

@@ -0,0 +1,41 @@
+{#
+  What a citation says of the page it cites: its name and its author, the part
+  of the line after "In reply to", "Liked" and the rest. Shared by
+  `reply-context.njk` and `citations.njk` (TASK-247).
+
+    {% import "partials/cited-page.njk" as cited %}
+    {{ cited.page(inReplyTo, replyContext) }}
+
+  `url` is the cited page, always its `u-url`. `context` is what the page said
+  about itself, from the reply contexts file. With a name, the name is the
+  link; with only an author, "a post" is; with neither, the bare URL. The
+  author follows as an `h-card`.
+
+  A name that already ends in " by " and the author's name, matched without
+  regard to case (SoundCloud's oEmbed gives "Flickermood by Forss" by Forss),
+  is not followed by the author again. Its last words become the `h-card`,
+  printed as the title wrote them, and the whole name stays the `p-name`, so a
+  parser reads the same name and author either way.
+#}
+{% macro page(url, context) %}
+{%- set title = (context.name or "") | trim -%}
+{%- set author = (context.author.name or "") | trim if context.author else "" -%}
+{%- set cut = title.length - author.length - 4 -%}
+{%- set byline = title.slice(cut) if (author and cut > 0) else "" -%}
+{%- set named = byline and byline.slice(0, 4).toLowerCase() == " by " and byline.slice(4).toLowerCase() == author.toLowerCase() -%}
+{%- if named %} <span class="p-name"><a class="u-url" href="{{ url }}">{{ title.slice(0, cut) }}</a>{{ byline.slice(0, 4) }}{{ card(context.author, byline.slice(4)) }}</span>
+{%- else %}
+  {%- if context.name %} <a class="u-url p-name" href="{{ url }}">{{ context.name }}</a>
+  {%- elif context.author %} <a class="u-url" href="{{ url }}">a post</a>
+  {%- else %} <a class="u-url" href="{{ url }}">{{ url }}</a>
+  {%- endif %}
+  {%- if context.author %} by {{ card(context.author, context.author.name) }}{% endif %}
+{%- endif %}
+{%- endmacro %}
+
+{% macro card(author, name) -%}
+<span class="p-author h-card">
+  {%- if author.url %}<a class="u-url p-name" href="{{ author.url }}">{{ name }}</a>
+  {%- else %}<span class="p-name">{{ name }}</span>{% endif -%}
+</span>
+{%- endmacro %}

package/themes/default/partials/post-list.njk

@@ -8,9 +8,10 @@
   categories it is filed under in its kicker. A note, which has no title, is
   printed whole as its `e-content`, and its date in the kicker is the link to
   it. A reply is a note that first cites what it answers, and a reply with a
-  title is an article that does. Tags are deliberately not here: an entry's
-  tags belong under the entry, and a feed of twenty posts listing everyone's
-  would be a wall of links rather than a list of writing.
+  title is an article that cites it after its title and summary; a like, a
+  repost and a bookmark cite theirs the same way. Tags are deliberately not
+  here: an entry's tags belong under the entry, and a feed of twenty posts
+  listing everyone's would be a wall of links rather than a list of writing.
 
   `feedHeading` is the heading level, which belongs to the layout rather than
   to the list: a listing is a page of entries and heads each one at 2, and a
@@ -32,16 +33,17 @@
     {% else %}
     {{ kicker.line(post.postType | capitalize, post.date, post.url, [], post.label, lang=post.lang) }}
     {% endif %}
-    {#- What a reply answers, from the same partial an entry cites it with. -#}
+    {% set cited %}
     {% if post.inReplyTo %}
     {% set inReplyTo = post.inReplyTo %}
     {% set replyContext = post.replyContext %}
     {% set lang = post.lang %}
     {% include "partials/reply-context.njk" %}
     {% endif %}
-    {#- What it reposts, likes or bookmarks, from the partial an entry uses. -#}
     {% set citations = post.citations %}
     {% include "partials/citations.njk" %}
+    {% endset %}
+    {% if not post.named %}{{ cited | safe }}{% endif %}
     {% set read = post.read %}
     {% include "partials/read.njk" %}
     {% if post.photos.length %}
@@ -62,6 +64,7 @@
       <p>{{ post.summary | truncate(280) }}</p>
     </div>
     {% endif %}
+    {{ cited | safe }}
     <p class="feed-more">
       <a href="{{ post.url | url }}" aria-label="Continue reading: {{ post.title }}">Continue reading<span aria-hidden="true"> &rarr;</span></a>
     </p>

package/themes/default/partials/reply-context.njk

@@ -16,18 +16,11 @@
   written in `lang`, the language of the entry it sits in (TASK-189), so a
   listing sets `lang` from each entry as it sets `replyContext`.
 #}
+{% import "partials/cited-page.njk" as cited %}
 {% if inReplyTo %}
 <div class="reply-context cite u-in-reply-to h-cite">
   <p class="cite-line small">In reply to
-    {%- if replyContext.name %} <a class="u-url p-name" href="{{ inReplyTo }}">{{ replyContext.name }}</a>
-    {%- elif replyContext.author %} <a class="u-url" href="{{ inReplyTo }}">a post</a>
-    {%- else %} <a class="u-url" href="{{ inReplyTo }}">{{ inReplyTo }}</a>
-    {%- endif %}
-    {%- if replyContext.author %} by <span class="p-author h-card">
-      {%- if replyContext.author.url %}<a class="u-url p-name" href="{{ replyContext.author.url }}">{{ replyContext.author.name }}</a>
-      {%- else %}<span class="p-name">{{ replyContext.author.name }}</span>{% endif -%}
-    </span>
-    {%- endif %}
+    {{- cited.page(inReplyTo, replyContext) }}
     {%- if replyContext.published %}, <time class="dt-published" datetime="{{ replyContext.published | date("iso") }}">{{ replyContext.published | date("readable", none, lang) }}</time>
     {%- endif -%}
   </p>