Changeset 1d1fdc9 in Klonkt

Timestamp:

09/04/2026 12:17:49 PM (4 days ago)

Author:

Robin <roboburr@…>

Branches:

main

Children:

6d7ea52

Parents:

9946a68

Message:

Tijdstempels: de posts-kant ook, en de tijdbom ontmanteld (shaer-a937)

Correctie op mijn eigen sluitreden bij 9946a68: ik schreef daar dat de
posts-sorteringen door isoSql lopen, en dat was niet zo -- ik had ze juist
overgeslagen omdat ze vandaag nog niet scheef staan.

Twee dingen alsnog:

De TIJDBOM uit de bead. Scheduler zette published_at op CURRENT_TIMESTAMP,
dus zodra iemand een post inplant en die vanzelf publiceert, staat er SQL-
notatie tussen de ISO's en sorteert het hele archief door elkaar. Die schrijft
nu ISO, net als de andere zes schrijfwegen.

En het VANGNET voor wat er al staat: de zeven posts-sorteringen (outbox,
backfill, featured tweemaal, muziek tweemaal, beheeroverzicht) lopen nu ook
door isoSql. Half normaliseren is de verwarrendste toestand -- dan hangt het
per scherm af of een gemengde kolom goed valt.

Onderweg gecontroleerd dat elke gebruiker van isoSql en NU_ISO ze ook
importeert: admin.js gebruikte hem zonder import, en dat was pas omgevallen
op het moment dat iemand het beheeroverzicht opende. Alle aangeraakte
bestanden door node --check.

Volle suite 1255 groen.

Location:

src

Files:

• routes/activitypub.js (modified) (2 diffs)
• routes/admin.js (modified) (2 diffs)
• services/ActivityPubService.js (modified) (4 diffs)
• services/Scheduler.js (modified) (2 diffs)
• services/music/index.js (modified) (2 diffs)

src/routes/activitypub.js

@@ -14 +14 @@
 import express from 'express';
 import { readFileSync } from 'fs';
-import db from '../config/database.js';
+import db, { isoSql } from '../config/database.js';
 import AP from '../services/ActivityPubService.js';
 import { apReadLimiter, apInboxLimiter } from '../middleware/rate-limit.js';
@@ -1176 +1176 @@
        AND IFNULL(ap_visibility, 'public') IN ('public', 'quiet')
        AND pinned IS NOT NULL AND pinned > 0
-     ORDER BY pinned DESC, COALESCE(published_at, created_at) ASC LIMIT 20`
+     ORDER BY pinned DESC, ${isoSql('COALESCE(published_at, created_at)')} ASC LIMIT 20`
   ).all(site.id);
   AP.sendAP(res, AP.buildFeatured(baseUrl(req), site, posts, { page: paginaNr(req) }));

src/routes/admin.js

@@ -6 +6 @@
 
 import express from 'express';
-import db from '../config/database.js';
+import db, { isoSql } from '../config/database.js';
 import { renderPage } from '../middleware/render.js';
 import { requireAuth } from '../middleware/auth.js';
@@ -22 +22 @@
     SELECT slug, title, status, published_at, created_at, updated_at
     FROM posts WHERE site_id = ?
-    ORDER BY (status != 'published') DESC, COALESCE(updated_at, published_at, created_at) DESC
+    ORDER BY (status != 'published') DESC, ${isoSql('COALESCE(updated_at, published_at, created_at)')} DESC
     LIMIT ?
   `).all(siteId, limit).map((p) => ({

src/services/ActivityPubService.js

@@ -19 +19 @@
 import fs from 'fs';
 import path from 'path';
-import db, { NU_ISO } from '../config/database.js';
+import db, { NU_ISO, isoSql } from '../config/database.js';
 import HtmlSanitizerService from './HtmlSanitizerService.js';
 import AudioEmbedService from './AudioEmbedService.js';
@@ -1143 +1143 @@
   const fanClause = fanOnly ? '' : 'AND (p.fan_only IS NULL OR p.fan_only = 0)';
   const unie = `
-    SELECT 'post' AS soort, p.id AS id, COALESCE(p.published_at, p.created_at) AS wanneer
+    SELECT 'post' AS soort, p.id AS id, ${isoSql('COALESCE(p.published_at, p.created_at)')} AS wanneer
       FROM posts p WHERE p.site_id = ? AND p.status = 'published' ${fanClause}
     UNION ALL
@@ -1927 +1927 @@
      FROM posts WHERE site_id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)
        AND IFNULL(ap_visibility, 'public') = 'public'
-     ORDER BY COALESCE(published_at, created_at) DESC LIMIT 20`
+     ORDER BY ${isoSql('COALESCE(published_at, created_at)')} DESC LIMIT 20`
   ).all(site.id).reverse();
   if (!recent.length) return;
@@ -2085 +2085 @@
     `SELECT id FROM posts WHERE site_id = ? AND status = 'published' AND (fan_only IS NULL OR fan_only = 0)
        AND pinned IS NOT NULL AND pinned > 0
-     ORDER BY pinned DESC, COALESCE(published_at, created_at) ASC LIMIT 20`
+     ORDER BY pinned DESC, ${isoSql('COALESCE(published_at, created_at)')} ASC LIMIT 20`
   ).all(site.id);
   const removeIds = [...new Set([...pinned.map((p) => p.id), ...alsoRemove])];

src/services/Scheduler.js

@@ -8 +8 @@
  */
 
-import db from '../config/database.js';
+import db, { NU_ISO } from '../config/database.js';
 import HtmlSanitizerService from './HtmlSanitizerService.js';
 import ActivityPubService from './ActivityPubService.js';
@@ -22 +22 @@
     if (!due.length) return 0;
     const upd = db.prepare(
-      "UPDATE posts SET status = 'published', published_at = COALESCE(published_at, publish_at, CURRENT_TIMESTAMP) WHERE id = ?"
+      `UPDATE posts SET status = 'published', published_at = COALESCE(published_at, publish_at, ${NU_ISO}) WHERE id = ?`
     );
     const ftsDel = db.prepare('DELETE FROM posts_fts WHERE post_id = ?');

src/services/music/index.js

@@ -13 +13 @@
  */
 
-import db from '../../config/database.js';
+import db, { isoSql } from '../../config/database.js';
 import { AP_CONTEXT, PUBLIC, actorId, noteId, safeUrl, guessMediaType, buildHashtagList, pagedCollection, isMbid } from '../ap-core.js';
 import { afleidenUitInsluitingen, ingeslotenPlaylists, SOORTEN } from '../../assets/js/shared/post-music-type.js';
@@ -681 +681 @@
     const rijen = db.prepare(`
       SELECT id, slug, title, excerpt, content, cover_image_url, tags,
-             COALESCE(published_at, created_at) AS uit_wanneer
+             ${isoSql('COALESCE(published_at, created_at)')} AS uit_wanneer
       FROM posts
       WHERE site_id = ? AND status = 'published'
         AND content LIKE '%[[playlist:' || ? || ']]%'
-      ORDER BY COALESCE(published_at, created_at) DESC
+      ORDER BY ${isoSql('COALESCE(published_at, created_at)')} DESC
     `).all(siteId, playlistId);
     for (const p of rijen) {