@rmdes/indiekit-endpoint-webmention-io 1.0.2 → 1.0.3

package/lib/controllers/blocklist.js

@@ -5,26 +5,6 @@
 import { getBlocklist, unblockDomain } from "../storage/blocklist.js";
 import { unhideByDomain } from "../storage/webmentions.js";
 
-/**
- * Format a date for display. Returns a human-readable string or null.
- * NEVER pass raw Date objects to Nunjucks templates — the | date filter
- * crashes on both Date objects and undefined/null.
- * @param {*} value
- * @returns {string|null}
- */
-function formatDate(value) {
-  if (!value) return null;
-  const d = value instanceof Date ? value : new Date(value);
-  if (Number.isNaN(d.getTime())) return null;
-  return d.toLocaleDateString("en-GB", {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-    hour: "2-digit",
-    minute: "2-digit",
-  });
-}
-
 export const blocklistController = {
   /**
    * GET /blocklist - Blocklist management page
@@ -39,10 +19,7 @@ export const blocklistController = {
       if (db) {
         const collection = db.collection("webmentionBlocklist");
         const raw = await getBlocklist(collection);
-        entries = raw.map((entry) => ({
-          ...entry,
-          blockedAt: formatDate(entry.blockedAt),
-        }));
+        entries = raw;
       }
 
       response.render("webmentions-blocklist", {

package/lib/controllers/dashboard.js

@@ -15,40 +15,6 @@ import { blockDomain } from "../storage/blocklist.js";
 import { getSyncState } from "../sync.js";
 import { getMentionType, getMentionTitle, getAuthorName } from "../utils.js";
 
-/**
- * Format a date for direct display in templates (NOT through macros).
- * Returns a human-readable string or null.
- * @param {*} value
- * @returns {string|null}
- */
-function formatDate(value) {
-  if (!value) return null;
-  const d = value instanceof Date ? value : new Date(value);
-  if (Number.isNaN(d.getTime())) return null;
-  return d.toLocaleDateString("en-GB", {
-    year: "numeric",
-    month: "short",
-    day: "numeric",
-    hour: "2-digit",
-    minute: "2-digit",
-  });
-}
-
-/**
- * Convert any date value to an ISO 8601 string safe for the Nunjucks | date
- * filter (which calls date-fns parseISO — crashes on Date objects, null, and
- * undefined). Use this for values that pass through mention()/card() macros.
- * @param {*} value
- * @returns {string|null}
- */
-function toISO(value) {
-  if (!value) return null;
-  if (value instanceof Date) return value.toISOString();
-  const d = new Date(value);
-  if (Number.isNaN(d.getTime())) return null;
-  return d.toISOString();
-}
-
 export const dashboardController = {
   /**
    * GET / - Webmentions dashboard
@@ -63,10 +29,7 @@ export const dashboardController = {
           title: response.locals.__("webmention-io.title"),
           webmentions: [],
           counts: { total: 0, hidden: 0, visible: 0 },
-          syncState: {
-            ...getSyncState(),
-            lastSync: formatDate(getSyncState().lastSync),
-          },
+          syncState: getSyncState(),
           cursor: {},
           filter: "all",
           typeFilter: "all",
@@ -119,7 +82,7 @@ export const dashboardController = {
           locale: application.locale,
           title: getMentionTitle({ name: item.name, "wm-property": item.wmProperty }),
           description: html ? { html } : undefined,
-          published: toISO(item.published || item.wmReceived),
+          published: item.published || item.wmReceived,
           url: item.sourceUrl,
           user: {
             avatar: { src: item.authorPhoto },
@@ -148,10 +111,7 @@ export const dashboardController = {
         title: response.locals.__("webmention-io.title"),
         webmentions,
         counts,
-        syncState: {
-          ...getSyncState(),
-          lastSync: formatDate(getSyncState().lastSync),
-        },
+        syncState: getSyncState(),
         cursor,
         filter,
         typeFilter,

package/lib/storage/blocklist.js

@@ -23,7 +23,7 @@ export async function blockDomain(collection, domain, reason = "spam", mentionsH
     await collection.insertOne({
       domain,
       reason,
-      blockedAt: new Date(),
+      blockedAt: new Date().toISOString(),
       mentionsHidden,
     });
     return true;

package/lib/storage/webmentions.js

@@ -36,7 +36,7 @@ export function jf2ToDocument(item) {
 
   return {
     wmId: item["wm-id"],
-    wmReceived: item["wm-received"] ? new Date(item["wm-received"]) : new Date(),
+    wmReceived: item["wm-received"] || new Date().toISOString(),
     wmProperty: item["wm-property"],
     wmTarget: item["wm-target"],
     authorName: item.author?.name || null,
@@ -44,14 +44,14 @@ export function jf2ToDocument(item) {
     authorPhoto: item.author?.photo || null,
     sourceUrl: item.url || null,
     sourceDomain: extractDomain(item.author?.url || item.url || ""),
-    published: item.published ? new Date(item.published) : null,
+    published: item.published || null,
     contentHtml,
     contentText,
     name: item.name || null,
     hidden: false,
     hiddenAt: null,
     hiddenReason: null,
-    syncedAt: new Date(),
+    syncedAt: new Date().toISOString(),
     raw: item,
   };
 }
@@ -65,7 +65,7 @@ export function documentToJf2(doc) {
   const jf2 = {
     type: "entry",
     "wm-id": doc.wmId,
-    "wm-received": doc.wmReceived?.toISOString?.() || doc.wmReceived,
+    "wm-received": doc.wmReceived,
     "wm-property": doc.wmProperty,
     "wm-target": doc.wmTarget,
     author: {
@@ -75,7 +75,7 @@ export function documentToJf2(doc) {
       photo: doc.authorPhoto || "",
     },
     url: doc.sourceUrl || "",
-    published: doc.published?.toISOString?.() || doc.published || doc.wmReceived,
+    published: doc.published || doc.wmReceived,
   };
 
   if (doc.name) {
@@ -185,7 +185,7 @@ export async function getMaxWmId(collection) {
 export async function hideWebmention(collection, wmId, reason = "manual") {
   await collection.updateOne(
     { wmId },
-    { $set: { hidden: true, hiddenAt: new Date(), hiddenReason: reason } },
+    { $set: { hidden: true, hiddenAt: new Date().toISOString(), hiddenReason: reason } },
   );
 }
 
@@ -211,7 +211,7 @@ export async function unhideWebmention(collection, wmId) {
 export async function hideByDomain(collection, domain, reason = "blocklist") {
   const result = await collection.updateMany(
     { sourceDomain: domain, hidden: { $ne: true } },
-    { $set: { hidden: true, hiddenAt: new Date(), hiddenReason: reason } },
+    { $set: { hidden: true, hiddenAt: new Date().toISOString(), hiddenReason: reason } },
   );
   return result.modifiedCount;
 }

package/lib/sync.js

@@ -141,7 +141,7 @@ export async function runSync(dbOrIndiekit, options) {
       }
     }
 
-    syncState.lastSync = new Date();
+    syncState.lastSync = new Date().toISOString();
     syncState.syncing = false;
 
     console.log(
@@ -232,7 +232,7 @@ export async function runFullSync(dbOrIndiekit, options) {
       }
     }
 
-    syncState.lastSync = new Date();
+    syncState.lastSync = new Date().toISOString();
     syncState.syncing = false;
 
     console.log(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rmdes/indiekit-endpoint-webmention-io",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Webmention moderation endpoint for Indiekit. Syncs webmentions from webmention.io into MongoDB with delete, block, and privacy removal capabilities.",
   "keywords": [
     "indiekit",

package/views/webmentions-blocklist.njk

@@ -32,21 +32,6 @@
     min-width: 200px;
   }
 
-  .bl-form .field__label {
-    display: block;
-    font: var(--font-caption, 0.75rem/1.4 sans-serif);
-    font-weight: 600;
-    margin-block-end: 0.25rem;
-  }
-
-  .bl-form .field__input {
-    width: 100%;
-    padding: var(--space-2xs, 0.375rem) var(--space-xs, 0.5rem);
-    border: 1px solid var(--color-outline-variant, #ccc);
-    border-radius: var(--border-radius-small, 0.25rem);
-    font: var(--font-body, 0.875rem/1.5 sans-serif);
-  }
-
   .bl-table {
     width: 100%;
     border-collapse: collapse;
@@ -126,8 +111,8 @@
 
   <form method="post" action="{{ wmEndpoint }}/block" class="bl-form">
     <div class="field">
-      <label class="field__label">{{ __("webmention-io.blocklist.domainLabel") }}</label>
-      <input type="text" name="domain" class="field__input" placeholder="{{ __("webmention-io.blocklist.domainPlaceholder") }}" required>
+      <label class="label">{{ __("webmention-io.blocklist.domainLabel") }}</label>
+      <input type="text" name="domain" class="input" placeholder="{{ __("webmention-io.blocklist.domainPlaceholder") }}" required>
     </div>
     <button type="submit" class="button button--primary">{{ __("webmention-io.blocklist.blockButton") }}</button>
   </form>
@@ -141,8 +126,8 @@
   <form method="post" action="{{ wmEndpoint }}/privacy-remove" class="bl-form"
         onsubmit="return confirm('This will PERMANENTLY DELETE all webmentions from this domain and block it. This cannot be undone. Continue?')">
     <div class="field">
-      <label class="field__label">{{ __("webmention-io.blocklist.privacy.domainLabel") }}</label>
-      <input type="text" name="domain" class="field__input" placeholder="{{ __("webmention-io.blocklist.domainPlaceholder") }}" required>
+      <label class="label">{{ __("webmention-io.blocklist.privacy.domainLabel") }}</label>
+      <input type="text" name="domain" class="input" placeholder="{{ __("webmention-io.blocklist.domainPlaceholder") }}" required>
     </div>
     <button type="submit" class="button button--primary">{{ __("webmention-io.blocklist.privacy.removeButton") }}</button>
   </form>
@@ -173,7 +158,7 @@
           </span>
         </td>
         <td>{{ entry.mentionsHidden or 0 }}</td>
-        <td>{{ entry.blockedAt }}</td>
+        <td>{{ entry.blockedAt | date("PPp") }}</td>
         <td>
           <form method="post" action="{{ wmEndpoint }}/blocklist/{{ entry.domain | urlencode }}/delete" style="display:inline">
             <button type="submit" class="button button--small button--secondary"

package/views/webmentions.njk

@@ -139,7 +139,7 @@
   <div class="wm-actions-bar">
     <span class="wm-sync-info">
       {% if syncState.lastSync %}
-        {{ __("webmention-io.sync.lastSync") }}: {{ syncState.lastSync }}
+        {{ __("webmention-io.sync.lastSync") }}: {{ syncState.lastSync | date("PPp") }}
       {% else %}
         {{ __("webmention-io.sync.never") }}
       {% endif %}