Changeset a7bcf66 in Klonkt

Timestamp:

07/28/2026 06:30:43 PM (6 weeks ago)

Author:

Robin Genis <roboburr@…>

Branches:

main

Children:

70677e96

Parents:

d9ad6c5

Message:

De Guardian PWA liep twee uur achter

Op sound-fabrics staat de tijdzone op Europe/Amsterdam, maar een hulpvraag van
20:20 stond in de PWA als 18:20. Het dashboard bouwt zijn kaarten in de browser
en sneed de rauwe UTC-string af (slice(0,16)) in plaats van hem om te rekenen.
De server geeft de tijd nu geformatteerd mee, met dezelfde formatDateTime die de
Krant en Berichten gebruiken; het afsnijden blijft alleen als terugval staan.

In formatDateTime zat een tweede probleem, dat nog niet zichtbaar was. SQLite
schrijft CURRENT_TIMESTAMP als UTC zonder dat erbij te zeggen ("2026-07-28
18:20:33"), en new Date() leest een string in die vorm als LOKALE tijd. Dat gaat
goed zolang de machine op UTC staat, wat nu toevallig zo is. Zet de VPS ooit op
Amsterdam en elke opgeslagen datum in de hele app schuift twee uur op. De parser
zegt nu expliciet UTC.

Onderweg bleek Berichten en de PWA ook niet dezelfde tijd te tonen voor dezelfde
post: 20:12 tegenover 20:20. Berichten liet zien wanneer wij de post ontvingen,
de PWA en de Krant wanneer hij geschreven is. Berichten toont nu ook de
publicatietijd. Sorteren en de "nieuw sinds je laatste bezoek"-stip blijven op
de ontvangsttijd: een post die laat federeert is nog steeds nieuw voor jou.

Changed files:
src/middleware/render.js

• parseStamp leest een tijdstempel zonder zone als UTC
• formatDateTime geexporteerd voor oppervlakken buiten de EJS-pagina's

src/routes/guardian.js

• when_text bij hulpvragen en bij de tijdlijn van de wards

src/assets/js/guardian.js

• when() gebruikt dat veld, afsnijden alleen nog als terugval

src/services/ActivityPubService.js

• getNotifications geeft published mee naast created_at

src/views/partials/msg-item.ejs

• toont de publicatietijd, met created_at als terugval

New file:
test/timestamps.test.js

• de tijdzone-instelling wordt toegepast, en een SQLite-tijdstempel hangt niet af van de tijdzone van de machine

remarks: geverifieerd op de wegwerp-database met Europe/Amsterdam: Berichten en
de PWA tonen allebei 28 jul 2026, 20:20 voor dezelfde post.

-robo
Co-Authored-By: Claude Opus 4.8 <noreply@…>

Files:

• src/assets/js/guardian.js (modified) (3 diffs)
• src/middleware/render.js (modified) (1 diff)
• src/routes/guardian.js (modified) (3 diffs)
• src/services/ActivityPubService.js (modified) (3 diffs)
• src/views/partials/msg-item.ejs (modified) (1 diff)
• test/timestamps.test.js (added)

src/assets/js/guardian.js

@@ -32 +32 @@
     catch (e) { return uri; }
   }
-  function when(s) { return String(s || '').slice(0, 16).replace('T', ' '); }
+  // The server hands over a timestamp already formatted in the site's timezone
+  // (Beheer -> Instellingen), the same clock de Krant and Berichten show. The
+  // slice is only a fallback for a row that predates that field: it shows raw
+  // UTC, which is what made a 20:20 call for help read 18:20.
+  function when(item, raw) {
+    if (item && item.when_text) return item.when_text;
+    return String(raw || '').slice(0, 16).replace('T', ' ');
+  }
   function show(id, on) { document.getElementById(id).hidden = !on; }
 
@@ -49 +56 @@
       else who.textContent = h.actor_name || handleOf(h.actor_uri, h.actor_handle);
       row.appendChild(who);
-      row.appendChild(el('span', 'when', when(h.published || h.created_at)));
+      row.appendChild(el('span', 'when', when(h, h.published || h.created_at)));
       card.appendChild(row);
       var body = el('div', 'body g-note');
@@ -197 +204 @@
       var head = el('div', 'row');
       head.appendChild(el('span', 'who grow', p.author));
-      if (p.published) head.appendChild(el('span', 'g-when', when(p.published)));
+      if (p.published) head.appendChild(el('span', 'g-when', when(p, p.published)));
       card.appendChild(head);
       var body = el('div', 'feed-body');

src/middleware/render.js

@@ -85 +85 @@
 const siteTimezone = () => getSetting('timezone') || undefined;
 
+/**
+ * Read a stored timestamp as the moment it actually is.
+ *
+ * SQLite's CURRENT_TIMESTAMP writes UTC without saying so ("2026-07-28
+ * 18:20:33"), and new Date() reads a string in that shape as LOCAL time. That
+ * is right only as long as the server runs on UTC; set the machine to
+ * Europe/Amsterdam and every stored date silently shifts two hours. So say UTC
+ * out loud. Anything already carrying a zone (AP `published` ends in Z) is left
+ * to the normal parser.
+ */
+const parseStamp = (v) => {
+  if (!v) return null;
+  const s = String(v);
+  const d = /^\d{4}-\d{2}-\d{2}[ T]\d{2}:\d{2}(:\d{2})?$/.test(s)
+    ? new Date(`${s.replace(' ', 'T')}Z`)
+    : new Date(s);
+  return Number.isNaN(d.getTime()) ? null : d;
+};
+
 const formatDate = (iso) => {
-  if (!iso) return '';
-  return new Date(iso).toLocaleDateString('nl-NL', { timeZone: siteTimezone(), day: 'numeric', month: 'long', year: 'numeric' });
+  const d = parseStamp(iso);
+  return d ? d.toLocaleDateString('nl-NL', { timeZone: siteTimezone(), day: 'numeric', month: 'long', year: 'numeric' }) : '';
 };
 
-const formatDateTime = (iso) => {
-  if (!iso) return '';
-  return new Date(iso).toLocaleString('nl-NL', { timeZone: siteTimezone(), dateStyle: 'medium', timeStyle: 'short' });
+/** A timestamp in the site's own timezone (Beheer → Instellingen). Exported so
+ *  surfaces outside the EJS pages (the Guardian PWA) read the same clock. */
+export const formatDateTime = (iso) => {
+  const d = parseStamp(iso);
+  return d ? d.toLocaleString('nl-NL', { timeZone: siteTimezone(), dateStyle: 'medium', timeStyle: 'short' }) : '';
 };
 

src/routes/guardian.js

@@ -19 +19 @@
 import * as Guardianship from '../services/guardianship/index.js';
 import { t as i18nT, resolveLang } from '../services/i18n.js';
-import { injectCspNonce, renderNoteBody } from '../middleware/render.js';
+import { injectCspNonce, renderNoteBody, formatDateTime } from '../middleware/render.js';
 import { emojiName } from '../services/NoteRender.js';
 
@@ -62 +62 @@
     body_html: renderNoteBody(h, L),
     name_html: emojiName(h.actor_name || '', h.actor_emoji_json),
+    // In the site's own timezone, the same as everywhere else in Klonkt. The
+    // PWA used to slice the raw UTC string, so a 20:20 call for help read 18:20.
+    when_text: formatDateTime(h.published || h.created_at),
   }));
   return {
@@ -141 +144 @@
       url: p.url,
       published: p.published || p.created_at,
+      when_text: formatDateTime(p.published || p.created_at),
       cw: p.cw || null,
       media: p.media_json ? JSON.parse(p.media_json) : [],

src/services/ActivityPubService.js

@@ -3521 +3521 @@
   try {
     const rows = db.prepare(`
-      SELECT i.kind, i.actor_name, i.actor_handle, i.actor_url, i.actor_icon, i.content, i.created_at, i.visibility,
+      SELECT i.kind, i.actor_name, i.actor_handle, i.actor_url, i.actor_icon, i.content, i.created_at, i.published, i.visibility,
              i.emoji_json, i.actor_emoji_json, i.media_json, i.quote_json, i.embed_json,
              p.slug AS post_slug, p.title AS post_title
@@ -3531 +3531 @@
       type: r.kind, name: r.actor_name, handle: r.actor_handle, url: r.actor_url, icon: r.actor_icon,
       content: stripLeadingMentions(r.content), post_slug: r.post_slug, post_title: r.post_title, created_at: r.created_at,
+      // When the post was written, for display. created_at (when it reached us)
+      // stays the sort key and the unread watermark: a note that federated late
+      // is still new to you.
+      published: r.published,
       emoji_json: r.emoji_json, actor_emoji_json: r.actor_emoji_json,   // FEP-9098 (messages render)
       media_json: r.media_json, quote_json: r.quote_json, embed_json: r.embed_json,   // rendered like a Krant post
@@ -3555 +3559 @@
   } catch { /* ignore */ }
   try {
-    for (const r of db.prepare(`SELECT object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, wave, help_request, created_at,
+    for (const r of db.prepare(`SELECT object_uri, note_url, actor_uri, actor_name, actor_handle, actor_icon, actor_url, content, wave, help_request, created_at, published,
                                        emoji_json, actor_emoji_json, media_json, quote_json, embed_json
                                 FROM ap_mentions WHERE slug = ? ORDER BY created_at DESC LIMIT ?`).all(slug, L)) {
-      out.push({ type: 'mention', name: r.actor_name, handle: r.actor_handle, url: r.actor_url || r.actor_uri, icon: r.actor_icon, content: stripLeadingMentions(r.content), note_url: r.note_url || r.object_uri, wave: r.wave ? 1 : 0, help_request: r.help_request ? 1 : 0, actorUri: r.actor_uri, created_at: r.created_at,
+      out.push({ type: 'mention', name: r.actor_name, handle: r.actor_handle, url: r.actor_url || r.actor_uri, icon: r.actor_icon, content: stripLeadingMentions(r.content), note_url: r.note_url || r.object_uri, wave: r.wave ? 1 : 0, help_request: r.help_request ? 1 : 0, actorUri: r.actor_uri, created_at: r.created_at, published: r.published,
         // Same trimmings a Krant row has, so Berichten renders the post identically.
         emoji_json: r.emoji_json, actor_emoji_json: r.actor_emoji_json, media_json: r.media_json, quote_json: r.quote_json, embed_json: r.embed_json });

src/views/partials/msg-item.ejs

@@ -44 +44 @@
               <% } %>
               <% if (_new) { %><span class="msg-new" title="<%= t('msg.new') %>"></span><% } %>
-              <% if (n.created_at) { %><span class="msg-time"><%= formatDateTime(n.created_at) %></span><% } %>
+              <% /* When the post was written, like de Krant and de Guardian PWA
+                    show it. created_at (when it reached us) stays the sort key
+                    and drives the "new since your last visit" dot above. */ %>
+              <% if (n.published || n.created_at) { %><span class="msg-time"><%= formatDateTime(n.published || n.created_at) %></span><% } %>
             </div>