@geekity/cms 0.31.0 → 0.32.1

package/admin/components/badge.njk

@@ -37,14 +37,18 @@
   accepted: 'badge-outline',
   described: 'badge-outline',
   decorative: 'badge-outline',
+  finished: 'badge-outline',
   active: 'badge-primary',
+  running: 'badge-primary',
   unread: 'badge-primary',
   connected: 'badge-success',
   scheduled: 'badge-info',
+  queued: 'badge-info',
   draft: 'badge-warning',
   pending: 'badge-warning',
   missing: 'badge-warning',
   unreachable: 'badge-warning',
+  interrupted: 'badge-warning',
   failed: 'badge-error',
   rejected: 'badge-error',
   spam: 'badge-error',

package/admin/components/fields.njk

@@ -36,12 +36,13 @@
    reads the explanation with the box rather than leaving it to be found. A
    textarea given no `name` only shows something and posts nothing.
 
-   `label` and `hint` are written into the page as markup, because the admin's
-   labels and hints carry `<code>`, `<em>` and links. They are template
-   literals, never anything a visitor typed; a hint that interpolates a value
-   should be captured with `{% set … %}…{% endset %}`, which escapes what it
-   interpolates before this ever sees it. `error` is a message from the server
-   and is escaped. #}
+   `label` and `hint` are plain text and always escaped, even a value marked
+   safe, so a plugin's or a user's words can go straight in. `labelHtml`,
+   `hintHtml` and `errorHtml` are markup the admin's own templates write, such
+   as a `<code>` or a link, and are printed as given; a hint that interpolates
+   a value is captured with `{% set … %}…{% endset %}`, which escapes what it
+   interpolates. Either one wins over its plain-text twin, and an empty hint
+   writes no paragraph. #}
 
 {% from "components/alert.njk" import alert %}
 
@@ -53,18 +54,24 @@
    already written as its own paragraph, and drawn in the error colour whether
    or not the form was refused. The hint is a `label` made `block` and
    `whitespace-normal`: DaisyUI's is `inline-flex` and `nowrap`. #}
-{% macro _below(id, hint, error, errorHtml, hintId='') %}
+{% macro _below(id, hint, hintHtml, error, errorHtml, hintId='') %}
 {% if error %}
   <p class="validator-hint" id="{{ id }}-error">{{ error }}</p>
 {% endif %}
 {% if errorHtml %}
   <div class="text-error">{{ errorHtml | safe }}</div>
 {% endif %}
-{% if hint %}
-  <p class="label block whitespace-normal"{% if hintId %} id="{{ hintId }}"{% endif %}>{{ hint | safe }}</p>
+{% if hintHtml | length %}
+  <p class="label block whitespace-normal"{% if hintId %} id="{{ hintId }}"{% endif %}>{{ hintHtml | safe }}</p>
+{% elif hint | length %}
+  <p class="label block whitespace-normal"{% if hintId %} id="{{ hintId }}"{% endif %}>{{ hint ~ '' }}</p>
 {% endif %}
 {% endmacro %}
 
+{% macro _label(label, labelHtml) -%}
+{{ labelHtml | safe if labelHtml | length else label | default('') ~ '' }}
+{%- endmacro %}
+
 {# What a control says about itself when the form refused it: that it is
    invalid, and which paragraph says why, so a screen reader reads the message
    with the field rather than leaving it to be found. `errorHtml` is not named
@@ -98,12 +105,14 @@
   required=false,
   autofocus=false,
   readonly=false,
-  disabled=false
+  disabled=false,
+  labelHtml='',
+  hintHtml=''
 ) %}
 <div class="fieldset">
-  <label class="fieldset-legend" for="{{ id }}">{{ label | safe }}</label>
+  <label class="fieldset-legend" for="{{ id }}">{{ _label(label, labelHtml) }}</label>
   <input id="{{ id }}" name="{{ name }}" type="{{ type }}"{% if min %} min="{{ min }}"{% endif %}{% if step %} step="{{ step }}"{% endif %}{% if inputmode %} inputmode="{{ inputmode }}"{% endif %}{% if autocomplete %} autocomplete="{{ autocomplete }}"{% endif %} value="{{ value }}"{% if list %} list="{{ list }}"{% endif %}{% if maxlength %} maxlength="{{ maxlength }}"{% endif %}{% if placeholder %} placeholder="{{ placeholder }}"{% endif %}{% if spellcheck %} spellcheck="{{ spellcheck }}"{% endif %}{% if required %} required{% endif %}{% if autofocus %} autofocus{% endif %}{% if readonly %} readonly{% endif %}{% if disabled %} disabled{% endif %}{{ _invalid(id, error, hintId) }} class="input input-sm w-full read-only:bg-base-200 read-only:border-dashed{% if error %} validator{% endif %}" />
-{{ _below(id, hint, error, errorHtml, hintId) }}
+{{ _below(id, hint, hintHtml, error, errorHtml, hintId) }}
 </div>
 {%- endmacro %}
 
@@ -122,12 +131,14 @@
   placeholder='',
   spellcheck='',
   required=false,
-  autofocus=false
+  autofocus=false,
+  labelHtml='',
+  hintHtml=''
 ) %}
 <div class="fieldset">
-  <label class="fieldset-legend" for="{{ id }}">{{ label | safe }}</label>
+  <label class="fieldset-legend" for="{{ id }}">{{ _label(label, labelHtml) }}</label>
   <input id="{{ id }}" name="{{ name }}" type="password" value=""{% if autocomplete %} autocomplete="{{ autocomplete }}"{% endif %}{% if spellcheck %} spellcheck="{{ spellcheck }}"{% endif %}{% if placeholder %} placeholder="{{ placeholder }}"{% endif %}{% if required %} required{% endif %}{% if autofocus %} autofocus{% endif %}{{ _invalid(id, error) }} class="input input-sm w-full{% if error %} validator{% endif %}" />
-{{ _below(id, hint, error, errorHtml) }}
+{{ _below(id, hint, hintHtml, error, errorHtml) }}
 </div>
 {%- endmacro %}
 
@@ -146,12 +157,14 @@
   required=false,
   autofocus=false,
   readonly=false,
-  disabled=false
+  disabled=false,
+  labelHtml='',
+  hintHtml=''
 ) %}
 <div class="fieldset">
-  <label class="fieldset-legend" for="{{ id }}">{{ label | safe }}</label>
+  <label class="fieldset-legend" for="{{ id }}">{{ _label(label, labelHtml) }}</label>
   <textarea id="{{ id }}"{% if name %} name="{{ name }}"{% endif %}{% if rows %} rows="{{ rows }}"{% endif %}{% if spellcheck %} spellcheck="{{ spellcheck }}"{% endif %}{% if required %} required{% endif %}{% if autofocus %} autofocus{% endif %}{% if readonly %} readonly{% endif %}{% if disabled %} disabled{% endif %}{{ _invalid(id, error, hintId) }} class="textarea textarea-sm w-full read-only:bg-base-200 read-only:border-dashed{% if error %} validator{% endif %}">{{ value }}</textarea>
-{{ _below(id, hint, error, errorHtml, hintId) }}
+{{ _below(id, hint, hintHtml, error, errorHtml, hintId) }}
 </div>
 {%- endmacro %}
 
@@ -172,14 +185,16 @@
   hintId='',
   required=false,
   autofocus=false,
-  disabled=false
+  disabled=false,
+  labelHtml='',
+  hintHtml=''
 ) %}
 <div class="fieldset">
-  <label class="fieldset-legend" for="{{ id }}">{{ label | safe }}</label>
+  <label class="fieldset-legend" for="{{ id }}">{{ _label(label, labelHtml) }}</label>
   <select id="{{ id }}" name="{{ name }}"{% if required %} required{% endif %}{% if autofocus %} autofocus{% endif %}{% if disabled %} disabled{% endif %}{{ _invalid(id, error, hintId) }} class="select select-sm w-full{% if error %} validator{% endif %}">
 {{ caller() }}
   </select>
-{{ _below(id, hint, error, errorHtml, hintId) }}
+{{ _below(id, hint, hintHtml, error, errorHtml, hintId) }}
 </div>
 {%- endmacro %}
 
@@ -195,14 +210,16 @@
   error='',
   errorHtml='',
   hintId='',
-  disabled=false
+  disabled=false,
+  labelHtml='',
+  hintHtml=''
 ) %}
 <div class="fieldset">
   <label class="label whitespace-normal text-base-content{% if error %} validator{% endif %}" for="{{ id }}">
     <input id="{{ id }}" name="{{ name }}" type="checkbox" value="{{ value }}"{% if checked %} checked{% endif %}{% if disabled %} disabled{% endif %}{{ _invalid(id, error, hintId) }} class="checkbox checkbox-sm" />
-    {{ label | safe }}
+    {{ _label(label, labelHtml) }}
   </label>
-{{ _below(id, hint, error, errorHtml, hintId) }}
+{{ _below(id, hint, hintHtml, error, errorHtml, hintId) }}
 </div>
 {%- endmacro %}
 

package/admin/components/job-status.njk

@@ -0,0 +1,45 @@
+{# The latest run of a queued job, from `jobStatusView` in
+   src/admin/job-status.ts. `{% call jobStatus(job, …) %}result{% endcall %}`
+   emits its state as a badge and when it got there, then:
+
+     queued       that it waits for the worker, and whether a restart sent it back
+     running      a progress bar and "<verb> <done> of <total> <unit>"
+     finished     the caller's body, which draws the job's own result
+     failed       the error, in an alert
+     interrupted  that restarts or crashes cut it off and it will not run again
+
+   While it is queued or running, `refreshUrl` is offered as a link to look
+   again: the page does not reload itself. `verb` and `unit` word the
+   progress. The error and every word passed in are escaped. #}
+{% from "components/alert.njk" import alert %}
+{% from "components/badge.njk" import status %}
+{% from "components/button.njk" import buttonLink %}
+
+{% macro jobStatus(job, refreshUrl, verb='Done', unit='items') -%}
+<div class="flex flex-col gap-3">
+  <p class="flex flex-wrap items-center gap-2">
+    {{ status(job.state, job.label) }}
+    <span class="text-sm"><time datetime="{{ job.at }}">{{ job.at | date('readable') }}</time></span>
+  </p>
+  {% if job.state == 'queued' %}
+    <p>Waiting for the worker to start it.{% if job.requeued %} A restart cut off the last try, so it is queued again as try {{ job.attempt }}.{% endif %}</p>
+  {% elif job.state == 'running' %}
+    {% if job.progress and job.progress.total %}
+      <progress class="progress progress-primary w-full max-w-md" value="{{ job.progress.done }}" max="{{ job.progress.total }}" aria-label="{{ verb }} {{ job.progress.done }} of {{ job.progress.total }} {{ unit }}"></progress>
+      <p>{{ verb }} {{ job.progress.done }} of {{ job.progress.total }} {{ unit }}.{% if job.progress.note %} {{ job.progress.note }}{% endif %}</p>
+    {% else %}
+      <progress class="progress progress-primary w-full max-w-md" aria-label="Starting"></progress>
+      <p>Starting.</p>
+    {% endif %}
+  {% elif job.state == 'finished' %}
+    {% if caller %}{{ caller() }}{% endif %}
+  {% elif job.state == 'failed' %}
+    {% call alert(color='error', style='soft') %}<span>{{ job.error }}</span>{% endcall %}
+  {% elif job.state == 'interrupted' %}
+    <p>Restarts or crashes cut it off {{ job.attempt }} times, so it is not run again on its own.</p>
+  {% endif %}
+  {% if job.active %}
+    <div>{{ buttonLink('Check again', refreshUrl, style='outline') }}</div>
+  {% endif %}
+</div>
+{%- endmacro %}

package/admin/components/setting-fields.njk

@@ -0,0 +1,38 @@
+{% import "components/fields.njk" as field %}
+{% from "components/badge.njk" import status %}
+
+{% macro settingFields(settings, secretsFile) %}
+  {% for setting in settings %}
+    {% set error = setting.error or setting.stored %}
+    {% if setting.setBy %}
+      <div class="fieldset">
+        <p class="fieldset-legend">{{ setting.label }}{% if setting.widget == 'secret' %} {{ status('connected', 'Set') }}{% endif %}</p>
+        {% if setting.widget != 'secret' %}<p><code>{{ setting.value if setting.widget != 'checkbox' else ('on' if setting.checked else 'off') }}</code></p>{% endif %}
+        <p class="label block whitespace-normal">{% if setting.hint %}{{ setting.hint }} {% endif %}Set by {% if setting.setBy == setting.variable %}the environment variable {% endif %}<code>{{ setting.setBy }}</code>. Change it there.</p>
+      </div>
+    {% elif setting.widget == 'secret' %}
+      {% set hint %}{% if setting.hint %}{{ setting.hint }} {% endif %}{% if setting.storedSet %}Set in <code>{{ secretsFile }}</code>. Leave the box blank to keep it.{% if setting.variable %} The environment variable <code>{{ setting.variable }}</code> would win over it.{% endif %}{% else %}Not set.{% if setting.variable %} Or set the environment variable <code>{{ setting.variable }}</code>.{% endif %}{% endif %}{% endset %}
+      {% set label %}{{ setting.label }} {{ status('connected', 'Set') if setting.storedSet else status('missing', 'Not set') }}{% endset %}
+      {{ field.password(setting.id, setting.name, labelHtml=label,
+           hintHtml=hint, error=error, autocomplete='off', spellcheck='false',
+           placeholder=('Leave blank to keep it' if setting.storedSet else '')) }}
+      {% if setting.storedSet %}
+        {{ field.checkbox(setting.id ~ '-forget', setting.forgetName, 'Forget the stored ' ~ setting.label) }}
+      {% endif %}
+    {% else %}
+      {% set hint %}{% if setting.hint %}{{ setting.hint }} {% endif %}{% if setting.variable %}The environment variable <code>{{ setting.variable }}</code> would win over this.{% endif %}{% endset %}
+      {% if setting.widget == 'checkbox' %}
+        {{ field.checkbox(setting.id, setting.name, setting.label, checked=setting.checked, hintHtml=hint, error=error) }}
+      {% elif setting.widget == 'select' %}
+        {% call field.select(setting.id, setting.name, setting.label, hintHtml=hint, error=error) %}
+          {% for option in setting.options %}
+            <option value="{{ option.value }}"{% if option.selected %} selected{% endif %}>{{ option.label }}</option>
+          {% endfor %}
+        {% endcall %}
+      {% else %}
+        {{ field.text(setting.id, setting.name, setting.label, setting.value, hintHtml=hint, error=error,
+             inputmode=('url' if setting.widget == 'url' else ''), spellcheck='false') }}
+      {% endif %}
+    {% endif %}
+  {% endfor %}
+{% endmacro %}

package/admin/layouts/settings-page.njk

@@ -6,6 +6,7 @@
 {% extends "layouts/shell.njk" %}
 {% import "components/fields.njk" as field %}
 {% from "components/button.njk" import button %}
+{% from "components/alert.njk" import alert %}
 
 {% block title %}{{ settingsLabel }} settings{% endblock %}
 
@@ -20,6 +21,21 @@
     </div>
   {% endif %}
 
+  {% if setElsewhere.length %}
+    <div class="mb-6 max-w-2xl">
+      {% call alert(color='info', style='soft', polite=true) %}
+        <div>
+          <p>Set outside this page, so the form shows the value in effect and a save leaves it as it is:</p>
+          <ul class="list-disc ps-5">
+            {% for each in setElsewhere %}
+              <li><code>{{ each.setting }}</code> is set by <code>{{ each.source }}</code>.</li>
+            {% endfor %}
+          </ul>
+        </div>
+      {% endcall %}
+    </div>
+  {% endif %}
+
   <form class="flex max-w-2xl flex-col gap-2" method="post" action="{{ settingsUrl }}">
     <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
 

package/admin/pages/comments/all.njk

@@ -93,8 +93,7 @@
             {% call collapse('Reply') %}
               <form method="post" action="{{ replyUrl }}">
                 {{ rowFields(row, fields, status, csrfToken) }}
-                {% set replyLabel %}Reply to {{ row.author }}{% endset %}
-                {{ field.textarea('reply-' + loop.index, fields.body, replyLabel, rows='4', required=true,
+                {{ field.textarea('reply-' + loop.index, fields.body, 'Reply to ' ~ row.author, rows='4', required=true,
                      hint='Markdown. It is saved as a reply post of yours and shown under this one.') }}
                 {{ field.checkbox('reply-listed-' + loop.index, fields.listed, 'Include in posts and feeds',
                      hint='Left unticked, the reply is Unlisted: its own page, and no listing or feed.') }}

package/admin/pages/documents/editor.njk

@@ -114,7 +114,7 @@
       {% call card() %}
         {% set titleHint %}{% if kind.type == "post" %}Leave it empty to write a note: the post is then its words, and takes its slug from the first of them.{% endif %}{% endset %}
         {#- A post may go without one, and is then a note; a page is always named. -#}
-        {{ field.text('editor-title', 'title', 'Title', value=form.title, required=(kind.type == "page"), autofocus=true, error=(error if errorField == 'editor-title' else ''), hint=titleHint) }}
+        {{ field.text('editor-title', 'title', 'Title', value=form.title, required=(kind.type == "page"), autofocus=true, error=(error if errorField == 'editor-title' else ''), hintHtml=titleHint) }}
         {{ pluginActions('editor-title', editorActions['editor-title']) }}
 
         {{ field.textarea('editor-body', 'body', 'Body', value=form.body, rows=24) }}
@@ -139,7 +139,7 @@
       {% if kind.type == "post" %}
         {% call collapse('Photos', open.photos, fields=true) %}
           <p class="label block whitespace-normal text-xs">
-            Each is an image in the media library or an address starting https://. Leave the alt text
+            Each is an image in the media library or a web address. Leave the alt text
             empty to use the media library’s. Empty an address to remove that photo.
           </p>
           {% for row in photoRows %}
@@ -165,7 +165,7 @@
             {{ button('Use my location', id='editor-location-here', style='soft', hidden=true) }}
           </div>
           <p id="editor-location-status" class="label block whitespace-normal text-xs" role="status"></p>
-          {{ field.text('editor-location-geo', locationFields.geo, 'Coordinates', value=form.location.geo, placeholder='48.85837, 2.29448', autocomplete='off', spellcheck='false', error=(error if errorField == 'editor-location-geo' else ''), hint='Latitude, longitude, as decimal degrees. A <code>geo:</code> URI works too.', hintId='editor-location-geo-hint') }}
+          {{ field.text('editor-location-geo', locationFields.geo, 'Coordinates', value=form.location.geo, placeholder='48.85837, 2.29448', autocomplete='off', spellcheck='false', error=(error if errorField == 'editor-location-geo' else ''), hintHtml='Latitude, longitude, as decimal degrees. A <code>geo:</code> URI works too.', hintId='editor-location-geo-hint') }}
           {{ field.text('editor-location-accuracy', locationFields.accuracy, 'Accuracy', value=form.location.accuracy, inputmode='numeric', autocomplete='off', error=(error if errorField == 'editor-location-accuracy' else ''), hint='Metres. Leave it empty if you do not know.', hintId='editor-location-accuracy-hint') }}
           {{ field.text('editor-location-name', locationFields.name, 'Place', value=form.location.name) }}
           {{ field.text('editor-location-locality', locationFields.locality, 'Locality', value=form.location.locality) }}
@@ -190,7 +190,7 @@
               <option value="{{ url }}"></option>
             {% endfor %}
           </datalist>
-          {% call field.select('editor-enclosure-transcript-type', enclosureFields.transcriptType, 'Transcript type', error=(error if errorField == 'editor-enclosure-transcript-type' else ''), hint='A .vtt, .srt or .txt file in the media library, or an address starting https://. A linked transcript needs its type.', hintId='editor-enclosure-transcript-hint') %}
+          {% call field.select('editor-enclosure-transcript-type', enclosureFields.transcriptType, 'Transcript type', error=(error if errorField == 'editor-enclosure-transcript-type' else ''), hint='A .vtt, .srt or .txt file in the media library, or a web address. A linked transcript needs its type.', hintId='editor-enclosure-transcript-hint') %}
             <option value=""{% if form.enclosure.transcriptType == "" %} selected{% endif %}>From the file</option>
             {% for type in transcriptTypes %}
               <option value="{{ type }}"{% if type == form.enclosure.transcriptType %} selected{% endif %}>{{ type }}</option>
@@ -200,7 +200,7 @@
           {% call collapse('Other versions', open.versions, fields=true) %}
             <p class="label block whitespace-normal text-xs">
               A video of an audio episode, a smaller file, another language. Each is a file in the media
-              library or an address starting https://, which needs its type. Empty an address to remove
+              library or a web address, which needs its type. Empty an address to remove
               that version.
             </p>
             {% for row in alternateRows %}
@@ -242,7 +242,7 @@
           {# The file holds a UTC instant; this field is that instant as the
              site's own clock reads it, so the zone has to be on the screen. #}
           {% set dateHint %}Wall-clock time in {{ dateZone }}. Stored as UTC.{% endset %}
-          {{ field.text('editor-date', 'date', 'Date', value=form.date, error=(error if errorField == 'editor-date' else ''), hint=dateHint) }}
+          {{ field.text('editor-date', 'date', 'Date', value=form.date, error=(error if errorField == 'editor-date' else ''), hintHtml=dateHint) }}
         {% endif %}
 
         {% set visibilityHint %}
@@ -255,7 +255,7 @@
           keeps its page and still goes to your followers, but is left off the home page, archives,
           feeds, the sitemap, search and llms.txt, and asks search engines not to index it.
         {% endset %}
-        {% call field.select('editor-visibility', 'visibility', 'Visibility', hint=visibilityHint, hintId='editor-visibility-hint') %}
+        {% call field.select('editor-visibility', 'visibility', 'Visibility', hintHtml=visibilityHint, hintId='editor-visibility-hint') %}
           {% if form.visibility.unrecognized is defined %}
             <option value="{{ form.visibility.unrecognized }}" selected>{{ form.visibility.unrecognized }} (not recognized)</option>
           {% endif %}
@@ -266,7 +266,7 @@
         {% if kind.type == "post" %}
           {# TASK-207: shown at the top of the author's fediverse profile, from
              the featured collection their actor links. #}
-          {{ field.checkbox('editor-pinned', 'pinned', 'Pinned', checked=form.pinned, error=(error if errorField == 'editor-pinned' else ''), hint='Writes <code>pinned:</code> and the moment you pinned it into the front matter. Pinned posts show first on your fediverse profile, newest pin first, up to five.') }}
+          {{ field.checkbox('editor-pinned', 'pinned', 'Pinned', checked=form.pinned, error=(error if errorField == 'editor-pinned' else ''), hintHtml='Writes <code>pinned:</code> and the moment you pinned it into the front matter. Pinned posts show first on your fediverse profile, newest pin first, up to five.') }}
         {% endif %}
 
         {# Who the front matter says wrote this (TASK-67). A select of the site's
@@ -297,7 +297,7 @@
       {% call collapse('Address', open.address, fields=true) %}
         {{ field.text('editor-slug', 'slug', 'Slug', value=form.slug, error=(error if errorField == 'editor-slug' else '')) }}
         {% set permalinkHint %}Leave it empty to let the {{ kind.singular }} take the URL its slug implies.{% endset %}
-        {{ field.text('editor-permalink', 'permalink', 'Permalink', value=form.permalink, hint=permalinkHint) }}
+        {{ field.text('editor-permalink', 'permalink', 'Permalink', value=form.permalink, hintHtml=permalinkHint) }}
       {% endcall %}
 
       {% if kind.type == "post" %}
@@ -337,7 +337,7 @@
 
         {% call collapse('Event', open.event, fields=true) %}
           {% set eventTimeHint %}Wall-clock time in {{ dateZone }}. Stored as UTC.{% endset %}
-          {{ field.text('editor-event-start', eventFields.start, 'Starts', value=form.event.start, placeholder='2026-10-10 09:00', autocomplete='off', error=(error if errorField == 'editor-event-start' else ''), hint=eventTimeHint, hintId='editor-event-time-hint') }}
+          {{ field.text('editor-event-start', eventFields.start, 'Starts', value=form.event.start, placeholder='2026-10-10 09:00', autocomplete='off', error=(error if errorField == 'editor-event-start' else ''), hintHtml=eventTimeHint, hintId='editor-event-time-hint') }}
           {{ field.text('editor-event-end', eventFields.end, 'Ends', value=form.event.end, placeholder='2026-10-10 17:00', autocomplete='off', error=(error if errorField == 'editor-event-end' else ''), hintId='editor-event-time-hint') }}
           {{ field.text('editor-event-location', eventFields.location, 'Where', value=form.event.location, error=(error if errorField == 'editor-event-location' else ''), hint='The place, or the address to join an online event at.', hintId='editor-event-location-hint') }}
           <p class="label block whitespace-normal text-xs">A post with a start is an event, named by its Title and described by its Body. Empty every box to make it a post again.</p>
@@ -357,6 +357,8 @@
           {{ field.text('editor-read-of-author', readFields.author, 'Author', value=form.readOf.author) }}
           {{ field.text('editor-read-of-uid', readFields.uid, 'Identifier', value=form.readOf.uid, placeholder='isbn:9780441478125', autocomplete='off', spellcheck='false') }}
           {{ field.text('editor-read-of-url', readFields.url, 'Address', value=form.readOf.url, type='url', error=(error if errorField == 'editor-read-of-url' else '')) }}
+          {{ field.text('editor-read-of-photo', readFields.photo, 'Cover', value=form.readOf.photo, list='editor-photo-uploads', autocomplete='off', error=(error if errorField == 'editor-read-of-photo' else ''), hint='An image in the media library or a web address. Empty it to remove the cover.', hintId='editor-read-of-photo-hint') }}
+          {{ field.text('editor-read-of-photo-alt', readFields.photoAlt, 'Cover alt text', value=form.readOf.photoAlt) }}
           <p class="label block whitespace-normal text-xs">A book or paper this post says its author read. An identifier is an ISBN or a DOI, written isbn:… or doi:…. Choose Not a read post and empty every box to remove it. A read is described by what it says, so leave its Description empty.</p>
         {% endcall %}
       {% endif %}
@@ -369,7 +371,7 @@
             language than the site's says so, for screen readers, translation
             and fediverse language filters. -#}
         {% set langHint %}A language tag, such as fr or pt-BR. Leave it empty for the site’s language, {{ siteLanguage }}.{% endset %}
-        {{ field.text('editor-lang', 'lang', 'Language', value=form.lang, autocomplete='off', spellcheck='false', error=(error if errorField == 'editor-lang' else ''), hint=langHint, hintId='editor-lang-hint') }}
+        {{ field.text('editor-lang', 'lang', 'Language', value=form.lang, autocomplete='off', spellcheck='false', error=(error if errorField == 'editor-lang' else ''), hintHtml=langHint, hintId='editor-lang-hint') }}
       {% endcall %}
 
       {% if kind.type == "post" and syndicationTargets.length %}
@@ -390,8 +392,8 @@
       {% call collapse('Display and discussion', open.display, fields=true) %}
         {# What this document says about comments, if anything. Three answers
            rather than two: the site's own rules, always open, always closed. #}
-        {% call field.select('editor-comments', 'comments', 'Comments', hint='Writes <code>comments: true</code> or <code>comments: false</code> into the front matter, which beats the site’s switch and its closing window in both directions. Fediverse replies are shown either way.') %}
-          <option value="{{ commentSettings.site }}"{% if form.comments == commentSettings.site %} selected{% endif %}>Follow the site settings</option>
+        {% call field.select('editor-comments', 'comments', 'Comments', hintHtml='Open or Closed writes <code>comments: true</code> or <code>comments: false</code> into the front matter, which beats Settings › Discussion’s choice for this type and its closing window in both directions. Comments switched off for the whole site stay off. What was already said, and fediverse replies, are shown either way.') %}
+          <option value="{{ commentSettings.site }}"{% if form.comments == commentSettings.site %} selected{% endif %}>Follow the site settings ({{ commentsSiteDefault }})</option>
           <option value="{{ commentSettings.open }}"{% if form.comments == commentSettings.open %} selected{% endif %}>Open</option>
           <option value="{{ commentSettings.closed }}"{% if form.comments == commentSettings.closed %} selected{% endif %}>Closed</option>
         {% endcall %}
@@ -400,7 +402,7 @@
           {# doc-2's eleventyExcludeFromCollections: still published and still at
              its URL, but out of every collection a template lists from. #}
           {% set excludeHint %}Keeps the {{ kind.singular }} out of listings that gather content, without unpublishing it.{% endset %}
-          {{ field.checkbox('editor-exclude', 'exclude', 'Hide from collections', checked=form.exclude, hint=excludeHint) }}
+          {{ field.checkbox('editor-exclude', 'exclude', 'Hide from collections', checked=form.exclude, hintHtml=excludeHint) }}
         {% endif %}
 
         {% if kind.contactable %}
@@ -408,7 +410,7 @@
              message goes is the contact address on the Settings screen; it is
              never on this page or in its HTML. #}
           {% set contactHint %}Writes <code>contact: true</code> into the front matter and puts a name, email, subject and message form under this {{ kind.singular }}. Messages arrive on the Messages screen and are emailed to the contact address on Settings.{% endset %}
-          {{ field.checkbox('editor-contact', 'contact', 'Contact form', checked=form.contact, hint=contactHint) }}
+          {{ field.checkbox('editor-contact', 'contact', 'Contact form', checked=form.contact, hintHtml=contactHint) }}
         {% endif %}
       {% endcall %}
     </div>

package/admin/pages/documents/syndication.njk

@@ -21,18 +21,18 @@
 {% macro boxes(panel, fields) %}
   {{ field.text(panel.key + '-id', fields.id, 'Id', panel.form.id, error=panel.problems.id,
        spellcheck='false', required=true,
-       hint='What a post&rsquo;s <code>syndicate-to</code> lists and what Micropub offers as the uid. Letters, digits, <code>.</code>, <code>-</code> and <code>_</code>.') }}
+       hintHtml='What a post&rsquo;s <code>syndicate-to</code> lists and what Micropub offers as the uid. Letters, digits, <code>.</code>, <code>-</code> and <code>_</code>.') }}
   {{ field.text(panel.key + '-name', fields.name, 'Name', panel.form.name, error=panel.problems.name,
-       required=true, hint='What the editor&rsquo;s checkbox and the post&rsquo;s link say.') }}
+       required=true, hintHtml='What the editor&rsquo;s checkbox and the post&rsquo;s link say.') }}
   {{ field.text(panel.key + '-url', fields.url, 'URL', panel.form.url, error=panel.problems.url,
        inputmode='url', spellcheck='false', required=true,
-       hint='The page the post links to and sends its webmention to. Put <code>{lang}</code> where the post&rsquo;s language goes, as in <code>https://news.indieweb.org/{lang}</code>.') }}
+       hintHtml='The page the post links to and sends its webmention to. Put <code>{lang}</code> where the post&rsquo;s language goes, as in <code>https://news.indieweb.org/{lang}</code>.') }}
   {{ field.text(panel.key + '-tag', fields.tag, 'Tag', panel.form.tag, error=panel.problems.tag,
        spellcheck='false',
        hint='Optional. A post carrying this tag is sent here without listing the target.') }}
   {{ field.text(panel.key + '-languages', fields.languages, 'Languages', panel.form.languages,
        error=panel.problems.languages, spellcheck='false',
-       hint='Optional. The language tags this target takes posts in, separated by commas, such as <code>en, de</code>. Empty takes every language.') }}
+       hintHtml='Optional. The language tags this target takes posts in, separated by commas, such as <code>en, de</code>. Empty takes every language.') }}
 {% endmacro %}
 
 {% block content %}

package/admin/pages/federation/followers.njk

@@ -1,9 +1,11 @@
 {# /admin/federation: who this site's people are to the fediverse, who follows
-   each of them, what arrived in the inbox, and how what went out landed. #}
+   each of them, what arrived in the inbox, how what went out landed, and the
+   latest resend job (TASK-393). #}
 {% extends "layouts/shell.njk" %}
 {% from "components/badge.njk" import badge, status %}
 {% from "components/button.njk" import button %}
-{% from "components/card.njk" import card %}
+{% from "components/card.njk" import card, cardActions %}
+{% from "components/job-status.njk" import jobStatus %}
 {% from "components/table.njk" import table %}
 
 {% block title %}Federation{% endblock %}
@@ -173,6 +175,57 @@
     {% endif %}
   </section>
 
+  <section id="resend" class="mb-10 max-w-2xl" aria-labelledby="resend-heading">
+    {% call card() %}
+      <h2 id="resend-heading" class="card-title">Resend</h2>
+      <p class="max-w-prose">
+        A resend builds each post again from its file and sends it to every one of its
+        author's followers and every accepted relay: an update for a published post, a
+        withdrawal for one in the trash. It runs in the background. The Resend button on
+        a post's row below also tells every page the post links to.
+      </p>
+      {% if resend %}
+        {% call jobStatus(resend, federationUrl + '#resend', verb='Sent', unit='posts') %}
+          {% if resendResult %}
+            <p>Resent {{ resendResult.sent.length }} {% if resendResult.sent.length == 1 %}post{% else %}posts{% endif %}.</p>
+            {% if resendResult.sent.length %}
+              <ul class="list-disc pl-6">
+                {% for post in resendResult.sent %}
+                  <li>
+                  <code class="break-all">{{ post.slug }}</code>:
+                  {% if post.activity and post.activity.heldByDevMode %}
+                    dev mode held the {{ post.activity.activityType }}, nothing was sent.
+                  {% elif post.activity and post.activity.inboxes == 0 %}
+                    the {{ post.activity.activityType }} had no follower or relay to go to.
+                  {% elif post.activity %}
+                    {{ post.activity.activityType }} reached {{ post.activity.reached }} of {{ post.activity.inboxes }} {% if post.activity.inboxes == 1 %}inbox{% else %}inboxes{% endif %}{% if post.activity.queued %}, {{ post.activity.queued }} queued{% endif %}{% if post.activity.failed %}, {{ status('failed', post.activity.failed + ' failed') }}{% endif %}.
+                  {% else %}
+                    not announced to the fediverse.
+                  {% endif %}
+                  {% if post.webmentions %}
+                    Webmentions to {{ post.webmentions.pages }} linked {% if post.webmentions.pages == 1 %}page{% else %}pages{% endif %}: {{ post.webmentions.told }} told{% if post.webmentions["none"] %}, {{ post.webmentions["none"] }} take none{% endif %}, {{ post.webmentions.failed }} failed.
+                  {% endif %}
+                  </li>
+                {% endfor %}
+              </ul>
+            {% endif %}
+            {% if resendResult.nothing.length %}
+              <p>Nothing to resend: {% for slug in resendResult.nothing %}<code class="break-all">{{ slug }}</code>{% if not loop.last %}, {% endif %}{% endfor %}. No announced post has that slug.</p>
+            {% endif %}
+          {% endif %}
+        {% endcall %}
+      {% endif %}
+      {% if not resend or not resend.active %}
+        <form method="post" action="{{ resendAllUrl }}">
+          <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+          {% call cardActions() %}
+            {{ button('Resend every announced post', type='submit', color='primary') }}
+          {% endcall %}
+        </form>
+      {% endif %}
+    {% endcall %}
+  </section>
+
   <section>
     <h2 class="mb-3 text-lg font-semibold">Delivery</h2>
     {% if posts.length %}
@@ -234,10 +287,7 @@
         </tbody>
       {% endcall %}
       <p class="mt-4 max-w-prose text-sm">
-        Resending builds the post again from its file and sends it to every one
-        of its author's followers and every accepted relay the site has now, and tells every
-        page the post links to at the same time: an update for a
-        published post, a withdrawal for one in the trash. The outcomes are a
+        Resend queues a resend of that one post, described above. The outcomes are a
         cache, so a database deleted since leaves the posts listed with nothing
         recorded against them.
       </p>

package/admin/pages/federation/settings.njk

@@ -19,5 +19,5 @@
     Followers screen says where each subscription stands.
   {% endset %}
   {{ field.textarea('settings-relays', fields.relays, 'Relays', form.relays,
-       error=problems.relays, hint=relaysHint, rows='3', spellcheck='false', autofocus=true) }}
+       error=problems.relays, hintHtml=relaysHint, rows='3', spellcheck='false', autofocus=true) }}
 {% endblock %}

package/admin/pages/media/library.njk

@@ -1,6 +1,7 @@
-{# /admin/media: everything under content/uploads, what links to it, and the
-   two things that can be done to it. The directory is walked on every request,
-   so a file copied in by hand is here without a restart.
+{# /admin/media: everything under content/uploads, what links to it, the
+   things that can be done to it, and the latest metadata sweep (TASK-392).
+   The directory is walked on every request, so a file copied in by hand is
+   here without a restart.
 
    Everything works with JavaScript switched off. The URL and the Markdown are
    readonly fields, which select and copy like any other text; copy.js adds a
@@ -10,6 +11,7 @@
 {% from "components/button.njk" import button, buttonLink %}
 {% from "components/card.njk" import card, cardActions %}
 {% from "components/copy.njk" import copyField %}
+{% from "components/job-status.njk" import jobStatus %}
 {% from "components/pagination.njk" import pagination %}
 {% from "components/table.njk" import table %}
 
@@ -60,6 +62,53 @@
     <div class="mt-2">{{ button('Upload', type='submit', color='primary') }}</div>
   </form>
 
+  <section id="strip-metadata" class="mb-8 max-w-2xl" aria-labelledby="strip-metadata-heading">
+    {% call card() %}
+      <h2 id="strip-metadata-heading" class="card-title">Location and camera metadata</h2>
+      <p class="max-w-prose">
+        Location and camera metadata is removed from pictures and videos as they are
+        uploaded. Files uploaded before that keep theirs until this sweep runs over
+        <code>content/uploads/</code>. It runs in the background, leaves a clean file
+        as it is, and keeps each file's modification time.
+      </p>
+      {% if sweep %}
+        {% call jobStatus(sweep, listUrl + '#strip-metadata', verb='Checked', unit='files') %}
+          {% if sweepReport %}
+            <p>
+              Checked {{ sweepReport.checked }} {% if sweepReport.checked == 1 %}file{% else %}files{% endif %}:
+              {{ sweepReport.stripped.length }} stripped, {{ sweepReport.clean }} already clean,
+              {{ sweepReport.unreadable.length }} unreadable.
+            </p>
+            {% if sweepReport.stripped.length %}
+              <h3 class="font-semibold">Stripped</h3>
+              <ul class="list-disc pl-6">
+                {% for file in sweepReport.stripped %}
+                  <li><code class="break-all">{{ file.path }}</code>: removed {{ file.removed | join(', ') }}</li>
+                {% endfor %}
+              </ul>
+            {% endif %}
+            {% if sweepReport.unreadable.length %}
+              <h3 class="font-semibold">Left as they were</h3>
+              <ul class="list-disc pl-6">
+                {% for file in sweepReport.unreadable %}
+                  <li><code class="break-all">{{ file.path }}</code>: {{ file.problem }}</li>
+                {% endfor %}
+              </ul>
+            {% endif %}
+          {% endif %}
+        {% endcall %}
+      {% endif %}
+      {% if not sweep or not sweep.active %}
+        <form method="post" action="{{ stripMetadataUrl }}">
+          <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+          {% call cardActions() %}
+            {{ button('Run the sweep again' if sweep else 'Strip metadata from every upload', type='submit', color='primary') }}
+          {% endcall %}
+        </form>
+      {% endif %}
+    {% endcall %}
+  </section>
+
   {% if total == 0 %}
     <p>Nothing has been uploaded yet.</p>
   {% else %}