Index: src/routes/admin-media.js =================================================================== --- src/routes/admin-media.js (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) +++ src/routes/admin-media.js (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) @@ -0,0 +1,120 @@ +/** + * admin-media.js — Beheer → Media (image library + cleanup). + * + * Lists the uploaded images under storage/media/post-images, shows where each is used, and lets the + * owner copy a URL or delete unused files. An animated cover's WebP, its loop MP4 (-v.mp4) and + * poster (-v.jpg) are treated as one item; deleting removes the trio. The Audio half of "Media" + * stays at /admin/audio (linked as a tab) — this page is the new image side. + */ +import express from 'express'; +import path from 'path'; +import fs from 'fs'; +import { fileURLToPath } from 'url'; +import db from '../config/database.js'; +import { renderPage } from '../middleware/render.js'; +import { requireGod } from '../middleware/auth.js'; +import { audioEnabled } from '../config/features.js'; + +const __dirname = path.dirname(fileURLToPath(import.meta.url)); +const POST_IMAGES_DIR = path.resolve( + process.env.POST_IMAGES_PATH || path.join(__dirname, '..', '..', 'storage', 'media', 'post-images') +); + +const router = express.Router(); + +const IMG_EXT = /\.(jpe?g|png|webp|gif|avif)$/i; +const isSibling = (f) => /-v\.(mp4|jpg)$/i.test(f); // an animated cover's video/poster sibling + +// Basename of a /media/post-images/ URL (or null). +function baseOf(url) { + const m = String(url || '').match(/\/media\/post-images\/([^/?#"'\s)]+)/); + return m ? m[1] : null; +} + +// Map filename -> Set(postId) of posts that reference it (as cover or inline image). +function usageMap(siteId) { + const posts = db.prepare('SELECT id, content, cover_image_url, cover_video_url FROM posts WHERE site_id = ?').all(siteId); + const map = new Map(); + const add = (fn, id) => { if (!fn) return; if (!map.has(fn)) map.set(fn, new Set()); map.get(fn).add(id); }; + for (const p of posts) { + add(baseOf(p.cover_image_url), p.id); + add(baseOf(p.cover_video_url), p.id); + for (const m of String(p.content || '').matchAll(/\/media\/post-images\/([^/?#"'\s)]+)/g)) add(m[1], p.id); + } + return map; +} + +function statSize(name) { try { return fs.statSync(path.join(POST_IMAGES_DIR, name)).size; } catch { return 0; } } +function statMtime(name) { try { return fs.statSync(path.join(POST_IMAGES_DIR, name)).mtimeMs; } catch { return 0; } } + +router.get('/', requireGod, (req, res) => { + const site = res.locals.site; + if (!site) return res.status(404).send('Site required'); + const used = usageMap(site.id); + let all = []; + try { all = fs.readdirSync(POST_IMAGES_DIR).filter(f => !f.startsWith('.')); } catch { /* dir may not exist yet */ } + const present = new Set(all); + const items = all + .filter(f => IMG_EXT.test(f) && !isSibling(f)) + .map(f => { + const stem = f.replace(/\.[^.]+$/, ''); + const mp4 = `${stem}-v.mp4`; + const hasVideo = present.has(mp4); + const ids = new Set([...(used.get(f) || []), ...(hasVideo ? (used.get(mp4) || []) : [])]); + return { + file: f, + url: `/media/post-images/${f}`, + kb: Math.round((statSize(f) + (hasVideo ? statSize(mp4) : 0)) / 1024), + hasVideo, + usedCount: ids.size, + _mtime: statMtime(f), + }; + }) + .sort((a, b) => b._mtime - a._mtime); // newest first + renderPage(req, res, 'pages/admin-media', { + pageTitleKey: 'admin.t_media', + bodyClass: 'on-admin', + items, + unusedCount: items.filter(i => !i.usedCount).length, + audioOn: audioEnabled(), + success: req.query.success || null, + }); +}); + +// Delete one image + its loop-MP4 / poster siblings. Basename-only + within-dir → no traversal. +router.post('/delete', requireGod, (req, res) => { + if (!res.locals.site) return res.status(404).json({ ok: false, error: 'Site required' }); + const f = String(req.body.file || ''); + if (!f || path.basename(f) !== f || !IMG_EXT.test(f)) return res.status(400).json({ ok: false, error: 'Bad file' }); + const stem = f.replace(/\.[^.]+$/, ''); + let removed = 0; + for (const name of [f, `${stem}-v.mp4`, `${stem}-v.jpg`]) { + const full = path.join(POST_IMAGES_DIR, name); + if (path.dirname(full) !== POST_IMAGES_DIR) continue; + try { fs.unlinkSync(full); removed++; } catch { /* missing sibling */ } + } + res.json({ ok: true, removed }); +}); + +// Delete every unused image (orphan) + its siblings. +router.post('/cleanup', requireGod, (req, res) => { + const site = res.locals.site; + if (!site) return res.status(404).json({ ok: false, error: 'Site required' }); + const used = usageMap(site.id); + let all = []; + try { all = fs.readdirSync(POST_IMAGES_DIR).filter(f => !f.startsWith('.')); } catch { /* */ } + const present = new Set(all); + let removed = 0; + for (const f of all.filter(x => IMG_EXT.test(x) && !isSibling(x))) { + const stem = f.replace(/\.[^.]+$/, ''); + const mp4 = `${stem}-v.mp4`; + const ids = new Set([...(used.get(f) || []), ...(present.has(mp4) ? (used.get(mp4) || []) : [])]); + if (ids.size) continue; // still in use + for (const name of [f, mp4, `${stem}-v.jpg`]) { + try { fs.unlinkSync(path.join(POST_IMAGES_DIR, name)); removed++; } catch { /* */ } + } + } + res.json({ ok: true, removed }); +}); + +export default router; Index: src/server.js =================================================================== --- src/server.js (revision a95dbfd965659d13d04dc86de36f589ceaab62ed) +++ src/server.js (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) @@ -45,4 +45,5 @@ import adminPatreonRoutes from './routes/admin-patreon.js'; import adminStatsRoutes from './routes/admin-stats.js'; +import adminMediaRoutes from './routes/admin-media.js'; import circleRoutes from './routes/circle.js'; import epkRoutes from './routes/epk.js'; @@ -365,4 +366,5 @@ app.use('/admin/playlists', adminPlaylistsRoutes); } +app.use('/admin/media', adminMediaRoutes); // image library + cleanup (works in lite mode too) app.use('/admin/sites', adminSitesRoutes); app.use('/admin/users', adminUsersRoutes); Index: src/services/i18n.js =================================================================== --- src/services/i18n.js (revision a95dbfd965659d13d04dc86de36f589ceaab62ed) +++ src/services/i18n.js (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) @@ -66,4 +66,5 @@ 'admin.tagline_hub': 'Hub-modus — bedrijfssite met gebruikers, elk hun eigen Klonkt Hub.', 'admin.b_sites': '🌐 Sites', 'admin.b_users': '👥 Gebruikers', 'admin.b_audio': '🎵 Audio', + 'admin.b_media': '🎬 Media', 'admin.t_media': 'Media', 'admin.media_images': 'Afbeeldingen', 'admin.media_count': 'afbeeldingen', 'admin.media_unused': 'ongebruikt', 'admin.media_cleanup': 'Ongebruikt opruimen', 'admin.media_cleanup_confirm': 'Alle ongebruikte afbeeldingen verwijderen?', 'admin.media_empty': 'Nog geen afbeeldingen geüpload.', 'admin.media_copy': 'Kopieer URL', 'admin.media_del_confirm': 'Deze afbeelding verwijderen?', 'admin.b_playlists': '📃 Playlists', 'admin.b_comments': '💬 Reacties', 'admin.b_seo': '🔎 SEO', 'admin.b_settings': '⚙️ Instellingen', 'admin.b_newpost': '✍️ Nieuwe post', 'admin.b_look': '🎨 Uiterlijk', @@ -988,4 +989,5 @@ 'admin.tagline_hub': 'Hub mode — a company site with users, each their own Klonkt Hub.', 'admin.b_sites': '🌐 Sites', 'admin.b_users': '👥 Users', 'admin.b_audio': '🎵 Audio', + 'admin.b_media': '🎬 Media', 'admin.t_media': 'Media', 'admin.media_images': 'Images', 'admin.media_count': 'images', 'admin.media_unused': 'unused', 'admin.media_cleanup': 'Delete unused', 'admin.media_cleanup_confirm': 'Delete all unused images?', 'admin.media_empty': 'No images uploaded yet.', 'admin.media_copy': 'Copy URL', 'admin.media_del_confirm': 'Delete this image?', 'admin.b_playlists': '📃 Playlists', 'admin.b_comments': '💬 Comments', 'admin.b_seo': '🔎 SEO', 'admin.b_settings': '⚙️ Settings', 'admin.b_newpost': '✍️ New post', 'admin.b_look': '🎨 Appearance', @@ -1904,4 +1906,5 @@ 'admin.tagline_hub': 'Hub-Modus — eine Firmenseite mit Nutzern, je ein eigener Klonkt Hub.', 'admin.b_sites': '🌐 Seiten', 'admin.b_users': '👥 Nutzer', 'admin.b_audio': '🎵 Audio', + 'admin.b_media': '🎬 Medien', 'admin.t_media': 'Medien', 'admin.media_images': 'Bilder', 'admin.media_count': 'Bilder', 'admin.media_unused': 'ungenutzt', 'admin.media_cleanup': 'Ungenutzte löschen', 'admin.media_cleanup_confirm': 'Alle ungenutzten Bilder löschen?', 'admin.media_empty': 'Noch keine Bilder hochgeladen.', 'admin.media_copy': 'URL kopieren', 'admin.media_del_confirm': 'Dieses Bild löschen?', 'admin.b_playlists': '📃 Playlists', 'admin.b_comments': '💬 Kommentare', 'admin.b_seo': '🔎 SEO', 'admin.b_settings': '⚙️ Einstellungen', 'admin.b_newpost': '✍️ Neuer Beitrag', 'admin.b_look': '🎨 Aussehen', Index: src/views/pages/admin-media.ejs =================================================================== --- src/views/pages/admin-media.ejs (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) +++ src/views/pages/admin-media.ejs (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) @@ -0,0 +1,77 @@ +<%# Beheer → Media: image library + cleanup (the Audio half links out to /admin/audio). %> +
+ ← <%= t('nav.admin') %> +

<%= t('admin.t_media') %>

+ +
+ <%= t('admin.media_images') %> + <% if (audioOn) { %><%= t('admin.b_audio') %> →<% } %> +
+ + <% if (success) { %>

<%= success %>

<% } %> + +
+

+ <%= items.length %> <%= t('admin.media_count') %><% if (unusedCount) { %> · <%= unusedCount %> <%= t('admin.media_unused') %><% } %> +

+ <% if (unusedCount) { %> + + <% } %> +
+ + <% if (!items.length) { %> +

<%= t('admin.media_empty') %>

+ <% } else { %> +
+ <% items.forEach(function(it){ %> +
+
+ + <% if (it.hasVideo) { %>🎬<% } %> + <% if (!it.usedCount) { %><%= t('admin.media_unused') %><% } %> +
+
+
<%= it.kb %> KB · <%= it.usedCount %>×
+
+ + +
+
+
+ <% }) %> +
+ <% } %> +
+ + Index: src/views/pages/admin.ejs =================================================================== --- src/views/pages/admin.ejs (revision a95dbfd965659d13d04dc86de36f589ceaab62ed) +++ src/views/pages/admin.ejs (revision f24b795df9de0065a2a1d1f073c8852baf612bc4) @@ -27,6 +27,6 @@ <%= t('admin.b_sites') %> <%= t('admin.b_users') %> + <%= t('admin.b_media') %> <% if (typeof audioEnabled === 'undefined' || audioEnabled) { %> - <%= t('admin.b_audio') %> <%= t('admin.b_playlists') %> <% } %> @@ -35,7 +35,5 @@ <% } else { %> <%= t('admin.b_newpost') %> - <% if (typeof audioEnabled === 'undefined' || audioEnabled) { %> - <%= t('admin.b_audio') %> - <% } %> + <%= t('admin.b_media') %> <% if (primarySite) { %> <%= t('admin.b_look') %>