From bdf2daa5f32daa892947d8b23e7d37d4be79a108 Mon Sep 17 00:00:00 2001 From: Gitea Actions <-2+gitea-actions@noreply.localhost> Date: Mon, 19 Oct 2026 13:57:16 +0000 Subject: [PATCH] fix(trash): delete on-disk thumbnails when purging files (#13) PR automatique de fix/trash-purge-thumbnails vers main. --------- Co-authored-by: xEsiah Reviewed-on: https://git.cohaise.dev/Esiah/CoHaiSe-CLOUD/pulls/13 Reviewed-by: Esiah Co-authored-by: Gitea Actions <-2+gitea-actions@noreply.localhost> --- backend/src/routes/folders.ts | 9 +++------ backend/src/routes/trash.ts | 12 ++++++++++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/backend/src/routes/folders.ts b/backend/src/routes/folders.ts index ff6e46f..24165fe 100644 --- a/backend/src/routes/folders.ts +++ b/backend/src/routes/folders.ts @@ -129,14 +129,11 @@ export const registerFolderRoutes = (app: App, db: Db, config: Config): void => [parentId], ); - // Un enfant est visible s'il est lisible directement ou s'il mene a un partage. + // Un enfant est visible s'il est lisible directement ou s'il mene a un + // partage. Le role admin ne donne aucun droit special ici (voir access.ts). const visible: FolderRow[] = []; for (const row of rows) { - if ( - user.role_slug === "admin" || - row.owner_id === user.id || - (await canTraverse(db, user, row.id)) - ) { + if (row.owner_id === user.id || (await canTraverse(db, user, row.id))) { visible.push(row); } } diff --git a/backend/src/routes/trash.ts b/backend/src/routes/trash.ts index 08ca04b..adfb4eb 100644 --- a/backend/src/routes/trash.ts +++ b/backend/src/routes/trash.ts @@ -70,10 +70,18 @@ const purgeFiles = async (db: Db, config: Config, fileIds: string[]): Promise discard(absolutePath(config.MEDIA_DIR, row.relative_path))), + // Les vignettes vivent dans VARIANT_DIR : sans cette etape, chaque purge + // laisse un .webp orphelin sur le disque (les lignes partent en cascade). + const variants = await db.query<{ path: string }>( + `SELECT path FROM file_variants WHERE file_id IN (${placeholders})`, + fileIds, ); + await Promise.all([ + ...rows.map((row) => discard(absolutePath(config.MEDIA_DIR, row.relative_path))), + ...variants.map((variant) => discard(absolutePath(config.VARIANT_DIR, variant.path))), + ]); + await db.transaction(async (connection) => { for (const row of rows) { if (row.owner_id) {